Introduce container_is_transient_for

2 files changed, 8 insertions, 16 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 08eeb812..6d57c45f 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -99,17 +99,13 @@ static struct sway_node *node_at_coords(
 	}
 	if (ws->fullscreen) {
 		// Try transient containers
-		if (config->popup_during_fullscreen == POPUP_SMART &&
-				ws->fullscreen->view) {
-			for (int i = 0; i < ws->floating->length; ++i) {
-				struct sway_container *floater = ws->floating->items[i];
-				if (floater->view && view_is_transient_for(
-							floater->view, ws->fullscreen->view)) {
-					struct sway_container *con = tiling_container_at(
-							&floater->node, lx, ly, surface, sx, sy);
-					if (con) {
-						return &con->node;
-					}
+		for (int i = 0; i < ws->floating->length; ++i) {
+			struct sway_container *floater = ws->floating->items[i];
+			if (container_is_transient_for(floater, ws->fullscreen)) {
+				struct sway_container *con = tiling_container_at(
+						&floater->node, lx, ly, surface, sx, sy);
+				if (con) {
+					return &con->node;
 				}
 			}
 		}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 690b59e6..f418785d 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -656,11 +656,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 	if (new_workspace && new_workspace->fullscreen && container &&
 			!container_is_fullscreen_or_child(container)) {
 		// Unless it's a transient container
-		bool is_transient = new_workspace->fullscreen->view &&
-			config->popup_during_fullscreen == POPUP_SMART &&
-			container->view && view_is_transient_for(
-					container->view, new_workspace->fullscreen->view);
-		if (!is_transient) {
+		if (!container_is_transient_for(container, new_workspace->fullscreen)) {
 			return;
 		}
 	}