sway

commit f23588de3c7085830614f6764a5c0cd262538afd
parent 832ebc896655cb5ca7689559d4e42b426d764e71
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Mon,  8 Oct 2018 23:00:36 +1000

Introduce container_is_transient_for

Diffstat:
M
include/sway/tree/container.h
 | 
3
+++
M
sway/desktop/output.c
 | 
15
++++++---------
M
sway/desktop/render.c
 | 
12
++++--------
M
sway/input/cursor.c
 | 
18
+++++++-----------
M
sway/input/seat.c
 | 
6
+-----
M
sway/tree/container.c
 | 
7
+++++++
M
sway/tree/view.c
 | 
6
++----

7 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
@@ -292,4 +292,7 @@ bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out);
 struct sway_container *container_split(struct sway_container *child,
 		enum sway_container_layout layout);
 
+bool container_is_transient_for(struct sway_container *child,
+		struct sway_container *ancestor);
+
 #endif
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
@@ -329,15 +329,12 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) {
 				workspace->current.fullscreen, &data);
 		container_for_each_child(workspace->current.fullscreen,
 				send_frame_done_container_iterator, &data);
-		if (config->popup_during_fullscreen == POPUP_SMART &&
-				workspace->current.fullscreen->view) {
-			for (int i = 0; i < workspace->current.floating->length; ++i) {
-				struct sway_container *floater =
-					workspace->current.floating->items[i];
-				if (floater->view && view_is_transient_for(floater->view,
-							workspace->current.fullscreen->view)) {
-					send_frame_done_container_iterator(floater, &data);
-				}
+		for (int i = 0; i < workspace->current.floating->length; ++i) {
+			struct sway_container *floater =
+				workspace->current.floating->items[i];
+			if (container_is_transient_for(floater,
+						workspace->current.fullscreen)) {
+				send_frame_done_container_iterator(floater, &data);
 			}
 		}
 #ifdef HAVE_XWAYLAND
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
@@ -962,14 +962,10 @@ void output_render(struct sway_output *output, struct timespec *when,
 					fullscreen_con->current.focused);
 		}
 
-		if (config->popup_during_fullscreen == POPUP_SMART &&
-				fullscreen_con->view) {
-			for (int i = 0; i < workspace->floating->length; ++i) {
-				struct sway_container *floater = workspace->floating->items[i];
-				if (floater->view && view_is_transient_for(
-							floater->view, fullscreen_con->view)) {
-					render_floating_container(output, damage, floater);
-				}
+		for (int i = 0; i < workspace->floating->length; ++i) {
+			struct sway_container *floater = workspace->floating->items[i];
+			if (container_is_transient_for(floater, fullscreen_con)) {
+				render_floating_container(output, damage, floater);
 			}
 		}
 #ifdef HAVE_XWAYLAND
diff --git 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
@@ -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;
 		}
 	}
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -1212,3 +1212,10 @@ struct sway_container *container_split(struct sway_container *child,
 
 	return cont;
 }
+
+bool container_is_transient_for(struct sway_container *child,
+		struct sway_container *ancestor) {
+	return config->popup_during_fullscreen == POPUP_SMART &&
+		child->view && ancestor->view &&
+		view_is_transient_for(child->view, ancestor->view);
+}
diff --git a/sway/tree/view.c b/sway/tree/view.c
@@ -1044,10 +1044,8 @@ bool view_is_visible(struct sway_view *view) {
 			!container_is_fullscreen_or_child(view->container)) {
 		// However, if we're transient for the fullscreen view and we allow
 		// "popups" during fullscreen then it might be visible
-		bool is_transient = config->popup_during_fullscreen == POPUP_SMART &&
-				workspace->fullscreen->view &&
-				view_is_transient_for(view, workspace->fullscreen->view);
-		if (!is_transient) {
+		if (!container_is_transient_for(view->container,
+					workspace->fullscreen)) {
 			return false;
 		}
 	}