From acd3db4fe1f8bfabc2e9edb8ac6cff706fdfaaf3 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 12 Aug 2019 22:03:50 -0400 Subject: [PATCH] workspace: do not destroy if any seat is focusing Since each seat has its own focus, do not destroy a workspace until it is no longer focused by any seat. This prevents seats from being forced to evacuate the workspace just because another seat switched focus away from it --- sway/tree/workspace.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 30cf3ebe..3ad5de06 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -155,9 +155,19 @@ void workspace_consider_destroy(struct sway_workspace *ws) { if (ws->tiling->length || ws->floating->length) { return; } + if (ws->output && output_get_active_workspace(ws->output) == ws) { return; } + + struct sway_seat *seat; + wl_list_for_each(seat, &server.input->seats, link) { + struct sway_node *node = seat_get_focus_inactive(seat, &root->node); + if (node == &ws->node) { + return; + } + } + workspace_begin_destroy(ws); }