aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Leonardo Hernández Hernández <leohdz172@protonmail.com>2022-03-23 09:13:52 -0600
committerLibravatar Simon Ser <contact@emersion.fr>2022-03-23 18:09:54 +0100
commit6c4c0387a24b145b86aa6c8e89db06429c7114fd (patch)
tree255526b57a423a5de9884763a00b2ac8fd16332d /sway/input/keyboard.c
parentsway/input: fix bad position of wlr_drag (diff)
downloadsway-6c4c0387a24b145b86aa6c8e89db06429c7114fd.tar.gz
sway-6c4c0387a24b145b86aa6c8e89db06429c7114fd.tar.zst
sway-6c4c0387a24b145b86aa6c8e89db06429c7114fd.zip
sway/input: wlr_seat_keyboard() now takes wlr_keyboard
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 29a5f8ea..1aa30655 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -517,7 +517,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
517 &keyboard->state_pressed_sent, event->keycode, 517 &keyboard->state_pressed_sent, event->keycode,
518 event->state, keyinfo.keycode, 0); 518 event->state, keyinfo.keycode, 0);
519 if (pressed_sent) { 519 if (pressed_sent) {
520 wlr_seat_set_keyboard(wlr_seat, wlr_device); 520 wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
521 wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, 521 wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
522 event->keycode, event->state); 522 event->keycode, event->state);
523 handled = true; 523 handled = true;
@@ -542,7 +542,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
542 update_shortcut_state( 542 update_shortcut_state(
543 &keyboard->state_pressed_sent, event->keycode, event->state, 543 &keyboard->state_pressed_sent, event->keycode, event->state,
544 keyinfo.keycode, 0); 544 keyinfo.keycode, 0);
545 wlr_seat_set_keyboard(wlr_seat, wlr_device); 545 wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
546 wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, 546 wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
547 event->keycode, event->state); 547 event->keycode, event->state);
548 } 548 }
@@ -670,7 +670,7 @@ static void handle_modifier_event(struct sway_keyboard *keyboard) {
670 &wlr_device->keyboard->modifiers); 670 &wlr_device->keyboard->modifiers);
671 } else { 671 } else {
672 struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat; 672 struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
673 wlr_seat_set_keyboard(wlr_seat, wlr_device); 673 wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
674 wlr_seat_keyboard_notify_modifiers(wlr_seat, 674 wlr_seat_keyboard_notify_modifiers(wlr_seat,
675 &wlr_device->keyboard->modifiers); 675 &wlr_device->keyboard->modifiers);
676 } 676 }
@@ -1086,7 +1086,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
1086 } 1086 }
1087 1087
1088 struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat; 1088 struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
1089 wlr_seat_set_keyboard(seat, wlr_device); 1089 wlr_seat_set_keyboard(seat, wlr_device->keyboard);
1090 1090
1091 wl_list_remove(&keyboard->keyboard_key.link); 1091 wl_list_remove(&keyboard->keyboard_key.link);
1092 wl_signal_add(&wlr_device->keyboard->events.key, &keyboard->keyboard_key); 1092 wl_signal_add(&wlr_device->keyboard->events.key, &keyboard->keyboard_key);