Add multiseat support to swaylock

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,
         } else if (strcmp(interface, wl_seat_interface.name) == 0) {
                 struct wl_seat *seat = wl_registry_bind(
                                 registry, name, &wl_seat_interface, 3);
-                wl_seat_add_listener(seat, &seat_listener, state);
+                struct swaylock_seat *swaylock_seat =
+                        calloc(1, sizeof(struct swaylock_seat));
+                swaylock_seat->state = state;
+                wl_seat_add_listener(seat, &seat_listener, swaylock_seat);
         } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
                 state->layer_shell = wl_registry_bind(
                                 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 = {
 
 static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
                 enum wl_seat_capability caps) {
-        struct swaylock_state *state = data;
-        if (state->pointer) {
-                wl_pointer_release(state->pointer);
-                state->pointer = NULL;
+        struct swaylock_seat *seat = data;
+        if (seat->pointer) {
+                wl_pointer_release(seat->pointer);
+                seat->pointer = NULL;
         }
-        if (state->keyboard) {
-                wl_keyboard_release(state->keyboard);
-                state->keyboard = NULL;
+        if (seat->keyboard) {
+                wl_keyboard_release(seat->keyboard);
+                seat->keyboard = NULL;
         }
         if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
-                state->pointer = wl_seat_get_pointer(wl_seat);
-                wl_pointer_add_listener(state->pointer, &pointer_listener, NULL);
+                seat->pointer = wl_seat_get_pointer(wl_seat);
+                wl_pointer_add_listener(seat->pointer, &pointer_listener, NULL);
         }
         if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
-                state->keyboard = wl_seat_get_keyboard(wl_seat);
-                wl_keyboard_add_listener(state->keyboard, &keyboard_listener, state);
+                seat->keyboard = wl_seat_get_keyboard(wl_seat);
+                wl_keyboard_add_listener(seat->keyboard, &keyboard_listener, seat->state);
         }
 }