3 files changed, 16 insertions, 6 deletions

diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 26eefc8a..39f4b795 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -575,6 +575,13 @@ void input_manager_reset_input(struct sway_input_device *input_device) {
 }
 
 void input_manager_reset_all_inputs(void) {
+        // Set the active keyboard to NULL to avoid spamming configuration updates
+        // for all keyboard devices.
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                wlr_seat_set_keyboard(seat->wlr_seat, NULL);
+        }
+
         struct sway_input_device *input_device = NULL;
         wl_list_for_each(input_device, &server.input->devices, link) {
                 input_manager_reset_input(input_device);
@@ -583,7 +590,6 @@ void input_manager_reset_all_inputs(void) {
         // If there is at least one keyboard using the default keymap, repeat delay,
         // and repeat rate, then it is possible that there is a keyboard group that
         // need their keyboard disarmed.
-        struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
                 struct sway_keyboard_group *group;
                 wl_list_for_each(group, &seat->keyboard_groups, link) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 5e5692f1..aedf3ae6 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -1068,9 +1068,6 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
                 }
         }
 
-        struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
-        wlr_seat_set_keyboard(seat, keyboard->wlr);
-
         wl_list_remove(&keyboard->keyboard_key.link);
         wl_signal_add(&keyboard->wlr->events.key, &keyboard->keyboard_key);
         keyboard->keyboard_key.notify = handle_keyboard_key;
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,
                 sway_keyboard_create(seat, seat_device);
         }
         sway_keyboard_configure(seat_device->keyboard);
-        wlr_seat_set_keyboard(seat->wlr_seat,
-                wlr_keyboard_from_input_device(seat_device->input_device->wlr_device));
+
+        // We only need to update the current keyboard, as the rest will be updated
+        // as they are activated.
+        struct wlr_keyboard *wlr_keyboard =
+                wlr_keyboard_from_input_device(seat_device->input_device->wlr_device);
+        struct wlr_keyboard *current_keyboard = seat->wlr_seat->keyboard_state.keyboard;
+        if (wlr_keyboard != current_keyboard) {
+                return;
+        }
 
         // force notify reenter to pick up the new configuration.  This reuses
         // the current focused surface to avoid breaking input grabs.