aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Kenny Levinsen <kl@kl.wtf>2022-12-04 01:20:06 +0100
committerLibravatar Ronan Pigott <rpigott@berkeley.edu>2022-12-04 13:01:41 -0700
commite1b268af98edeb09e570e8855ef64f0719cbafe2 (patch)
treed0cdfc81540dcdb2603e57b8f5acbd9433a2249d /sway/input/keyboard.c
parentsway/lock: handle mode in output commit handler (diff)
downloadsway-e1b268af98edeb09e570e8855ef64f0719cbafe2.tar.gz
sway-e1b268af98edeb09e570e8855ef64f0719cbafe2.tar.zst
sway-e1b268af98edeb09e570e8855ef64f0719cbafe2.zip
seat: Avoid sending redundant keymaps on reload
When we reload the config, we reset every input device and re-apply configuration from the config file. This means that the keyboard keymap is updated at least once during config reload, more if the config file contains keyboard configuration. When they keyboard keymap changes and is updated through wlr_seat, the keymap ends up sent to every keyboard bound in every client, seemingly multiple times. On an x230 of mine with a keyboard layout set in the config file, I see 42 keymap events sent to foot on config reload. Reduce events from keyboard configurations by skipping all but the currently active keyboard for the seat, and by clearing the active keyboard during input manager device reset. After this change, I only see a single just-in-time keymap event. Fixes: https://github.com/swaywm/sway/issues/6654
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 2ac02b22..96d5b72d 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -1070,9 +1070,6 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
1070 } 1070 }
1071 } 1071 }
1072 1072
1073 struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
1074 wlr_seat_set_keyboard(seat, keyboard->wlr);
1075
1076 wl_list_remove(&keyboard->keyboard_key.link); 1073 wl_list_remove(&keyboard->keyboard_key.link);
1077 wl_signal_add(&keyboard->wlr->events.key, &keyboard->keyboard_key); 1074 wl_signal_add(&keyboard->wlr->events.key, &keyboard->keyboard_key);
1078 keyboard->keyboard_key.notify = handle_keyboard_key; 1075 keyboard->keyboard_key.notify = handle_keyboard_key;