wlr_seat: send keyboard modifiers to the right client on enter

We were previously sending modifiers to the leaving client instead.
Fixes #476.

1 files changed, 6 insertions, 1 deletions

diff --git a/types/wlr_seat.c b/types/wlr_seat.c
index ab3e990d..05ea4745 100644
--- a/types/wlr_seat.c
+++ b/types/wlr_seat.c
@@ -860,7 +860,6 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
 			surface->resource, &keys);
 		wl_array_release(&keys);
 
-		wlr_seat_keyboard_send_modifiers(seat);
 		wlr_seat_client_send_selection(client);
 	}
 
@@ -882,6 +881,12 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
 
 	seat->keyboard_state.focused_client = client;
 	seat->keyboard_state.focused_surface = surface;
+
+	if (client && client->keyboard && seat->keyboard_state.keyboard) {
+		// tell new client about any modifier change last,
+		// as it targets seat->keyboard_state.focused_client
+		wlr_seat_keyboard_send_modifiers(seat);
+	}
 }
 
 void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat, struct