Chase wlroots wlr_seat_keyboard() refactoring

wlr_seat_keyboard() now takes wlr_keyboard

diff --git a/src/keyboard.c b/src/keyboard.c
index 77cb0330a357afb42019af6865936e71b0e24b10..643dac27c82eb4cde96e635583c89147d9921b90 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -198,7 +198,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data)
        }
 
        if (!handled) {
-               wlr_seat_set_keyboard(wlr_seat, &keyboard->base);
+               wlr_seat_set_keyboard(wlr_seat, keyboard);
                wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
                                             event->keycode, event->state);
        }

diff --git a/src/seat.c b/src/seat.c
index ead27b10e91d76d1884f0129724a10e4a89eea78..e1714c811f239d2d0de534110d7f5ef604ec97eb 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -166,7 +166,7 @@ new_keyboard(struct seat *seat, struct input *input)
        struct wlr_keyboard *kb = input->wlr_input_device->keyboard;
        wlr_keyboard_set_keymap(kb, seat->keyboard_group->keyboard.keymap);
        wlr_keyboard_group_add_keyboard(seat->keyboard_group, kb);
-       wlr_seat_set_keyboard(seat->seat, input->wlr_input_device);
+       wlr_seat_set_keyboard(seat->seat, kb);
 }
 
 void