diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-11-11 18:09:04 +1300 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-11-11 18:11:56 +1300 |
| commit | bbce92a9238951bfecb6d337f34c9a0153aa9c0f (patch) | |
| tree | 4eb6ec0ad49963c003bb6ad2831943dafba5e816 /include | |
| parent | 47545cf5508467901e8ea78e219e8ec9b0c0ee53 (diff) | |
backend/wayland: Move initilisation code earlier
The renderer redesign is going to need the render fd before the backend
is fully started, so we have to move the wl registry code to when the
backend is created instead of when it is started.
We also need to stash the wl_keyboard and emit it to library users
later, once they've added their listeners and started the backend.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/wayland.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 54b791b1..7c92cf84 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -32,6 +32,7 @@ struct wlr_wl_backend { struct wl_shm *shm; struct wl_seat *seat; struct wl_pointer *pointer; + struct wl_keyboard *keyboard; struct wlr_wl_pointer *current_pointer; char *seat_name; }; @@ -78,12 +79,11 @@ struct wlr_wl_pointer { struct wl_listener output_destroy; }; -struct wlr_wl_backend *get_wl_backend_from_backend( - struct wlr_backend *wlr_backend); +struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend); void update_wl_output_cursor(struct wlr_wl_output *output); struct wlr_wl_pointer *pointer_get_wl(struct wlr_pointer *wlr_pointer); -void create_wl_pointer(struct wl_pointer *wl_pointer, - struct wlr_wl_output *output); +void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *output); +void create_wl_keyboard(struct wl_keyboard *wl_keyboard, struct wlr_wl_backend *wl); extern const struct wl_seat_listener seat_listener; |