diff options
-rw-r--r-- | sway/input/keyboard.c | 8 | ||||
-rw-r--r-- | sway/input/seat.c | 2 |
2 files changed, 5 insertions, 5 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); |
diff --git a/sway/input/seat.c b/sway/input/seat.c index 3ae5ed6c..85179dc7 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -813,7 +813,7 @@ static void seat_configure_keyboard(struct sway_seat *seat, | |||
813 | } | 813 | } |
814 | sway_keyboard_configure(seat_device->keyboard); | 814 | sway_keyboard_configure(seat_device->keyboard); |
815 | wlr_seat_set_keyboard(seat->wlr_seat, | 815 | wlr_seat_set_keyboard(seat->wlr_seat, |
816 | seat_device->input_device->wlr_device); | 816 | seat_device->input_device->wlr_device->keyboard); |
817 | struct sway_node *focus = seat_get_focus(seat); | 817 | struct sway_node *focus = seat_get_focus(seat); |
818 | if (focus && node_is_view(focus)) { | 818 | if (focus && node_is_view(focus)) { |
819 | // force notify reenter to pick up the new configuration | 819 | // force notify reenter to pick up the new configuration |