sway

commit 1206a6097711556b22418db5043dc7c22d8b9a3e
parent bcdb676abb34de49c57a11059658427f675ccec4
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Mon,  4 Jun 2018 13:31:09 +1000

Don't restore focus if unmapping surface wasn't focused

Diffstat:
M
sway/desktop/xwayland.c
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
@@ -79,14 +79,17 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
 	wl_list_remove(&surface->commit.link);
 
 	if (!wlr_xwayland_surface_is_unmanaged(xsurface)) {
-		// Restore focus
 		struct sway_seat *seat = input_manager_current_seat(input_manager);
-		struct sway_container *previous =
-			seat_get_focus_inactive(seat, &root_container);
-		if (previous) {
-			// Hack to get seat to re-focus the return value of get_focus
-			seat_set_focus(seat, previous->parent);
-			seat_set_focus(seat, previous);
+		if (seat->wlr_seat->keyboard_state.focused_surface ==
+				xsurface->surface) {
+			// Restore focus
+			struct sway_container *previous =
+				seat_get_focus_inactive(seat, &root_container);
+			if (previous) {
+				// Hack to get seat to re-focus the return value of get_focus
+				seat_set_focus(seat, previous->parent);
+				seat_set_focus(seat, previous);
+			}
 		}
 	}
 }