aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2024-05-24 23:53:46 +0200
committerSimon Zeni <simon@bl4ckb0ne.ca>2024-05-27 09:27:45 -0400
commitdf69367d927e6d4fde70d61611c9317b70537261 (patch)
tree7e1ce1fd17a8f3f2e08815c61ec07084004b9b4e
parent700f4805bc3ca86b3c2a46aa96bcee9d8e20f599 (diff)
input/text_input: ensure keyboard is set before sending modifiers
Clients get confused when modifier events are sent before the keymap.
-rw-r--r--sway/input/text_input.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index c38a3bb2..ba8c0b99 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -66,11 +66,13 @@ static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *
struct sway_input_method_relay *relay = wl_container_of(listener, relay,
input_method_keyboard_grab_destroy);
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+ struct wlr_seat *wlr_seat = keyboard_grab->input_method->seat;
wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
if (keyboard_grab->keyboard) {
// send modifier state to original client
- wlr_seat_keyboard_notify_modifiers(keyboard_grab->input_method->seat,
+ wlr_seat_set_keyboard(wlr_seat, keyboard_grab->keyboard);
+ wlr_seat_keyboard_notify_modifiers(wlr_seat,
&keyboard_grab->keyboard->modifiers);
}
}