From 74799937cf95205c2ff16da9dc7dcaea47ce7116 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 4 Jun 2018 11:30:26 +1000
Subject: [PATCH] Restore focus when unmapping unmanaged xwayland surfaces

---
 sway/desktop/xwayland.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 75bfb7b2..55c42227 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -77,6 +77,18 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
 	desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true);
 	wl_list_remove(&surface->link);
 	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);
+		}
+	}
 }
 
 static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {