diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-06 09:38:12 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-06 09:38:12 +1000 |
commit | b0393ae34bf161d769b0761a505cce324d37a2e9 (patch) | |
tree | 190b4d83e65459e1958bce8b725667b45c68a8b4 | |
parent | Merge pull request #2768 from RyanDwyer/fix-flatten-crash (diff) | |
download | sway-b0393ae34bf161d769b0761a505cce324d37a2e9.tar.gz sway-b0393ae34bf161d769b0761a505cce324d37a2e9.tar.zst sway-b0393ae34bf161d769b0761a505cce324d37a2e9.zip |
swaylock: Support keyboard and pointer disconnects and reconnects
-rw-r--r-- | include/swaylock/swaylock.h | 2 | ||||
-rw-r--r-- | swaylock/main.c | 2 | ||||
-rw-r--r-- | swaylock/seat.c | 16 |
3 files changed, 15 insertions, 5 deletions
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 970e3cc9..fbdd42a8 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -58,6 +58,8 @@ struct swaylock_state { | |||
58 | struct wl_compositor *compositor; | 58 | struct wl_compositor *compositor; |
59 | struct zwlr_layer_shell_v1 *layer_shell; | 59 | struct zwlr_layer_shell_v1 *layer_shell; |
60 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; | 60 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; |
61 | struct wl_pointer *pointer; | ||
62 | struct wl_keyboard *keyboard; | ||
61 | struct wl_shm *shm; | 63 | struct wl_shm *shm; |
62 | struct wl_list surfaces; | 64 | struct wl_list surfaces; |
63 | struct wl_list images; | 65 | struct wl_list images; |
diff --git a/swaylock/main.c b/swaylock/main.c index ed8c5607..d1384c6f 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -277,7 +277,7 @@ static void handle_global(void *data, struct wl_registry *registry, | |||
277 | &wl_shm_interface, 1); | 277 | &wl_shm_interface, 1); |
278 | } else if (strcmp(interface, wl_seat_interface.name) == 0) { | 278 | } else if (strcmp(interface, wl_seat_interface.name) == 0) { |
279 | struct wl_seat *seat = wl_registry_bind( | 279 | struct wl_seat *seat = wl_registry_bind( |
280 | registry, name, &wl_seat_interface, 1); | 280 | registry, name, &wl_seat_interface, 3); |
281 | wl_seat_add_listener(seat, &seat_listener, state); | 281 | wl_seat_add_listener(seat, &seat_listener, state); |
282 | } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { | 282 | } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { |
283 | state->layer_shell = wl_registry_bind( | 283 | state->layer_shell = wl_registry_bind( |
diff --git a/swaylock/seat.c b/swaylock/seat.c index c2630d87..22dd9360 100644 --- a/swaylock/seat.c +++ b/swaylock/seat.c | |||
@@ -145,13 +145,21 @@ static const struct wl_pointer_listener pointer_listener = { | |||
145 | static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, | 145 | static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, |
146 | enum wl_seat_capability caps) { | 146 | enum wl_seat_capability caps) { |
147 | struct swaylock_state *state = data; | 147 | struct swaylock_state *state = data; |
148 | if (state->pointer) { | ||
149 | wl_pointer_release(state->pointer); | ||
150 | state->pointer = NULL; | ||
151 | } | ||
152 | if (state->keyboard) { | ||
153 | wl_keyboard_release(state->keyboard); | ||
154 | state->keyboard = NULL; | ||
155 | } | ||
148 | if ((caps & WL_SEAT_CAPABILITY_POINTER)) { | 156 | if ((caps & WL_SEAT_CAPABILITY_POINTER)) { |
149 | struct wl_pointer *pointer = wl_seat_get_pointer(wl_seat); | 157 | state->pointer = wl_seat_get_pointer(wl_seat); |
150 | wl_pointer_add_listener(pointer, &pointer_listener, NULL); | 158 | wl_pointer_add_listener(state->pointer, &pointer_listener, NULL); |
151 | } | 159 | } |
152 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { | 160 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { |
153 | struct wl_keyboard *keyboard = wl_seat_get_keyboard(wl_seat); | 161 | state->keyboard = wl_seat_get_keyboard(wl_seat); |
154 | wl_keyboard_add_listener(keyboard, &keyboard_listener, state); | 162 | wl_keyboard_add_listener(state->keyboard, &keyboard_listener, state); |
155 | } | 163 | } |
156 | } | 164 | } |
157 | 165 | ||