aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorllyyr <llyyr.public@gmail.com>2024-05-27 15:43:56 +0530
committerAlexander Orzechowski <alex@ozal.ski>2024-07-02 15:13:29 -0400
commitdfbcd1fbaa5148e537a1c29dc3cbe8ea21ee5eac (patch)
treeebd5b586de63f92c2018f68290e06bc5c2200b79
parent4e38f93f367dfb7f1ec66060e6262b806cecf3a7 (diff)
input/keyboard: don't send key release if we don't have focused surface
"The compositor must not send this event if the wl_keyboard did not have an active surface immediately before this event. The compositor must not send this event if state is pressed (resp. released) and the key was already logically down (resp. was not logically down) immediately before this event." From https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/382
-rw-r--r--sway/input/keyboard.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 9ac21664..e33dbe0b 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -509,12 +509,13 @@ static void handle_key_event(struct sway_keyboard *keyboard,
}
if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
- // If the pressed event was sent to a client, also send the released
+ // If the pressed event was sent to a client and we have a focused
+ // surface immediately before this event, also send the released
// event. In particular, don't send the released event to the IM grab.
bool pressed_sent = update_shortcut_state(
&keyboard->state_pressed_sent, event->keycode,
event->state, keyinfo.keycode, 0);
- if (pressed_sent) {
+ if (pressed_sent && seat->wlr_seat->keyboard_state.focused_surface) {
wlr_seat_set_keyboard(wlr_seat, keyboard->wlr);
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
event->keycode, event->state);