sway

commit b08f7e5183d25ce0d4ae89796893a6d25d4a1b93
parent 3499cc6c8702ed1959ead391f4bb54f7a69fe18a
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri,  6 Apr 2018 09:26:28 -0400

Fix deletion of still-visible workspaces on unfocus

Diffstat:
M
sway/input/seat.c
 | 
4
+++-
M
sway/tree/container.c
 | 
1
+

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -6,6 +6,7 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "sway/tree/container.h"
+#include "sway/tree/workspace.h"
 #include "sway/input/seat.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
@@ -398,7 +399,8 @@ void seat_set_focus_warp(struct sway_seat *seat,
 		}
 		if (last_ws) {
 			ipc_event_workspace(last_ws, container, "focus");
-			if (last_ws->children->length == 0) {
+			if (!workspace_is_visible(last_ws)
+					&& last_ws->children->length == 0) {
 				container_destroy(last_ws);
 			}
 		}
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -216,6 +216,7 @@ static bool container_reap_empty(struct sway_container *con) {
 		break;
 	case C_WORKSPACE:
 		if (!workspace_is_visible(con) && con->children->length == 0) {
+			wlr_log(L_DEBUG, "Destroying workspace via reaper");
 			container_workspace_destroy(con);
 			return true;
 		}