mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-16 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent bogus repeated keypresses when reloading config

Browse source 
When reloading the configuration, each time that a configuration applies
to a keyboard, an additional bogus keypress is sent to clients.

This seems to happen due to handle_keyboard_group_leave updating the
pressed keys, but handle_keyboard_group_enter not doing the reverse, so
the state of pressed keys is inconsistent.

Extend handle_keyboard_group_enter to mirror
handle_keyboard_group_leave, ensure state is consistent and no spurious
key events are sent.

Fixes: https://github.com/swaywm/sway/issues/8852
This commit is contained in:
Hugo Osvaldo Barrera 2026-04-09 12:50:18 +02:00
parent 909a2ddb5f
commit d83cc3c4cc
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
sway/input/keyboard.c
View file

@ -598,6 +598,25 @@ static void handle_keyboard_group_key(struct wl_listener *listener,
handle_key_event(sway_group->seat_device->keyboard, data); handle_key_event(sway_group->seat_device->keyboard, data);
} }
static void keyboard_group_refocus(struct sway_keyboard *keyboard) {
// Refocus the focused node, layer surface, or unmanaged surface so that
// it picks up the current keyboard state.
struct sway_seat *seat = keyboard->seat_device->sway_seat;
struct sway_node *focus = seat_get_focus(seat);
if (focus) {
seat_set_focus(seat, NULL);
seat_set_focus(seat, focus);
} else if (seat->focused_layer) {
struct wlr_layer_surface_v1 *layer = seat->focused_layer;
seat_set_focus_layer(seat, NULL);
seat_set_focus_layer(seat, layer);
} else {
struct wlr_surface *unmanaged = seat->wlr_seat->keyboard_state.focused_surface;
seat_set_focus_surface(seat, NULL, false);
seat_set_focus_surface(seat, unmanaged, false);
}
}
static void handle_keyboard_group_enter(struct wl_listener *listener, static void handle_keyboard_group_enter(struct wl_listener *listener,
void *data) { void *data) {
struct sway_keyboard_group *sway_group = struct sway_keyboard_group *sway_group =
@ -605,10 +624,19 @@ static void handle_keyboard_group_enter(struct wl_listener *listener,
struct sway_keyboard *keyboard = sway_group->seat_device->keyboard; struct sway_keyboard *keyboard = sway_group->seat_device->keyboard;
struct wl_array *keycodes = data; struct wl_array *keycodes = data;
bool pressed_sent = false;
uint32_t *keycode; uint32_t *keycode;
wl_array_for_each(keycode, keycodes) { wl_array_for_each(keycode, keycodes) {
struct key_info keyinfo; struct key_info keyinfo;
update_keyboard_state(keyboard, *keycode, WL_KEYBOARD_KEY_STATE_PRESSED, &keyinfo); update_keyboard_state(keyboard, *keycode, WL_KEYBOARD_KEY_STATE_PRESSED, &keyinfo);
pressed_sent |= update_shortcut_state(&keyboard->state_pressed_sent,
*keycode, WL_KEYBOARD_KEY_STATE_PRESSED, keyinfo.keycode, 0);
}
if (pressed_sent) {
keyboard_group_refocus(keyboard);
} }
} }
@ -630,25 +658,8 @@ static void handle_keyboard_group_leave(struct wl_listener *listener,
*keycode, WL_KEYBOARD_KEY_STATE_RELEASED, keyinfo.keycode, 0); *keycode, WL_KEYBOARD_KEY_STATE_RELEASED, keyinfo.keycode, 0);
} }
if (!pressed_sent) { if (pressed_sent) {
return; keyboard_group_refocus(keyboard);
}
// Refocus the focused node, layer surface, or unmanaged surface so that
// it picks up the current keyboard state.
struct sway_seat *seat = keyboard->seat_device->sway_seat;
struct sway_node *focus = seat_get_focus(seat);
if (focus) {
seat_set_focus(seat, NULL);
seat_set_focus(seat, focus);
} else if (seat->focused_layer) {
struct wlr_layer_surface_v1 *layer = seat->focused_layer;
seat_set_focus_layer(seat, NULL);
seat_set_focus_layer(seat, layer);
} else {
struct wlr_surface *unmanaged = seat->wlr_seat->keyboard_state.focused_surface;
seat_set_focus_surface(seat, NULL, false);
seat_set_focus_surface(seat, unmanaged, false);
} }
} }