Merge pull request #3423 from RyanDwyer/fullscreen-global

Implement fullscreen global

1 files changed, 12 insertions, 0 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index b6ccd830..8cb1d8e9 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -752,6 +752,18 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
 			return;
 		}
 	}
+	// Deny setting focus to a workspace node when using fullscreen global
+	if (root->fullscreen_global && !container && new_workspace) {
+		return;
+	}
+	// Deny setting focus to a view which is hidden by a fullscreen global
+	if (root->fullscreen_global && container != root->fullscreen_global &&
+				!container_has_ancestor(container, root->fullscreen_global)) {
+		// Unless it's a transient container
+		if (!container_is_transient_for(container, root->fullscreen_global)) {
+			return;
+		}
+	}
 
 	struct sway_output *new_output = new_workspace->output;