diff options
author | 2018-10-06 01:51:35 +0200 | |
---|---|---|
committer | 2018-10-06 01:51:35 +0200 | |
commit | 5d21c33f13f34ed592388512cc092986324c8f35 (patch) | |
tree | 190b4d83e65459e1958bce8b725667b45c68a8b4 /swaylock | |
parent | Merge pull request #2768 from RyanDwyer/fix-flatten-crash (diff) | |
parent | swaylock: Support keyboard and pointer disconnects and reconnects (diff) | |
download | sway-5d21c33f13f34ed592388512cc092986324c8f35.tar.gz sway-5d21c33f13f34ed592388512cc092986324c8f35.tar.zst sway-5d21c33f13f34ed592388512cc092986324c8f35.zip |
Merge pull request #2771 from RyanDwyer/swaylock-seat-capabilities
swaylock: Support keyboard and pointer disconnects and reconnects
Diffstat (limited to 'swaylock')
-rw-r--r-- | swaylock/main.c | 2 | ||||
-rw-r--r-- | swaylock/seat.c | 16 |
2 files changed, 13 insertions, 5 deletions
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 | ||