aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorLibravatar Kenny Levinsen <kl@kl.wtf>2022-12-04 01:20:06 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2022-12-12 11:26:11 +0100
commit817f1bbec3cec1657d0e92714f883faa45a6fef7 (patch)
tree2209393661635bb54462db782ed1a8a4e0dd407c /sway/input/seat.c
parentbuild: bump version to 1.8-rc2 (diff)
downloadsway-817f1bbec3cec1657d0e92714f883faa45a6fef7.tar.gz
sway-817f1bbec3cec1657d0e92714f883faa45a6fef7.tar.zst
sway-817f1bbec3cec1657d0e92714f883faa45a6fef7.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/seat.c')
-rw-r--r--sway/input/seat.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 43b20779..646f3866 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -814,8 +814,15 @@ static void seat_configure_keyboard(struct sway_seat *seat,
814 sway_keyboard_create(seat, seat_device); 814 sway_keyboard_create(seat, seat_device);
815 } 815 }
816 sway_keyboard_configure(seat_device->keyboard); 816 sway_keyboard_configure(seat_device->keyboard);
817 wlr_seat_set_keyboard(seat->wlr_seat, 817
818 wlr_keyboard_from_input_device(seat_device->input_device->wlr_device)); 818 // We only need to update the current keyboard, as the rest will be updated
819 // as they are activated.
820 struct wlr_keyboard *wlr_keyboard =
821 wlr_keyboard_from_input_device(seat_device->input_device->wlr_device);
822 struct wlr_keyboard *current_keyboard = seat->wlr_seat->keyboard_state.keyboard;
823 if (wlr_keyboard != current_keyboard) {
824 return;
825 }
819 826
820 // force notify reenter to pick up the new configuration. This reuses 827 // force notify reenter to pick up the new configuration. This reuses
821 // the current focused surface to avoid breaking input grabs. 828 // the current focused surface to avoid breaking input grabs.