diff options
Diffstat (limited to 'swaylock')
-rw-r--r-- | swaylock/main.c | 5 | ||||
-rw-r--r-- | swaylock/seat.c | 22 |
2 files changed, 15 insertions, 12 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index f2bb5c3e..f88663c2 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -279,7 +279,10 @@ static void handle_global(void *data, struct wl_registry *registry, | |||
279 | } else if (strcmp(interface, wl_seat_interface.name) == 0) { | 279 | } else if (strcmp(interface, wl_seat_interface.name) == 0) { |
280 | struct wl_seat *seat = wl_registry_bind( | 280 | struct wl_seat *seat = wl_registry_bind( |
281 | registry, name, &wl_seat_interface, 3); | 281 | registry, name, &wl_seat_interface, 3); |
282 | wl_seat_add_listener(seat, &seat_listener, state); | 282 | struct swaylock_seat *swaylock_seat = |
283 | calloc(1, sizeof(struct swaylock_seat)); | ||
284 | swaylock_seat->state = state; | ||
285 | wl_seat_add_listener(seat, &seat_listener, swaylock_seat); | ||
283 | } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { | 286 | } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { |
284 | state->layer_shell = wl_registry_bind( | 287 | state->layer_shell = wl_registry_bind( |
285 | registry, name, &zwlr_layer_shell_v1_interface, 1); | 288 | registry, name, &zwlr_layer_shell_v1_interface, 1); |
diff --git a/swaylock/seat.c b/swaylock/seat.c index 22dd9360..7b72114f 100644 --- a/swaylock/seat.c +++ b/swaylock/seat.c | |||
@@ -144,22 +144,22 @@ static const struct wl_pointer_listener pointer_listener = { | |||
144 | 144 | ||
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_seat *seat = data; |
148 | if (state->pointer) { | 148 | if (seat->pointer) { |
149 | wl_pointer_release(state->pointer); | 149 | wl_pointer_release(seat->pointer); |
150 | state->pointer = NULL; | 150 | seat->pointer = NULL; |
151 | } | 151 | } |
152 | if (state->keyboard) { | 152 | if (seat->keyboard) { |
153 | wl_keyboard_release(state->keyboard); | 153 | wl_keyboard_release(seat->keyboard); |
154 | state->keyboard = NULL; | 154 | seat->keyboard = NULL; |
155 | } | 155 | } |
156 | if ((caps & WL_SEAT_CAPABILITY_POINTER)) { | 156 | if ((caps & WL_SEAT_CAPABILITY_POINTER)) { |
157 | state->pointer = wl_seat_get_pointer(wl_seat); | 157 | seat->pointer = wl_seat_get_pointer(wl_seat); |
158 | wl_pointer_add_listener(state->pointer, &pointer_listener, NULL); | 158 | wl_pointer_add_listener(seat->pointer, &pointer_listener, NULL); |
159 | } | 159 | } |
160 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { | 160 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { |
161 | state->keyboard = wl_seat_get_keyboard(wl_seat); | 161 | seat->keyboard = wl_seat_get_keyboard(wl_seat); |
162 | wl_keyboard_add_listener(state->keyboard, &keyboard_listener, state); | 162 | wl_keyboard_add_listener(seat->keyboard, &keyboard_listener, seat->state); |
163 | } | 163 | } |
164 | } | 164 | } |
165 | 165 | ||