Merge pull request #2782 from RyanDwyer/popup-during-fullscreen

Implement popup_during_fullscreen

18 files changed, 160 insertions, 2 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 21b8b87..48228a9 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -154,6 +154,7 @@ sway_cmd cmd_new_window;
 sway_cmd cmd_no_focus;
 sway_cmd cmd_output;
 sway_cmd cmd_permit;
+sway_cmd cmd_popup_during_fullscreen;
 sway_cmd cmd_reject;
 sway_cmd cmd_reload;
 sway_cmd cmd_rename;
diff --git a/include/sway/config.h b/include/sway/config.h
index 0e51fbf..00b5f25 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -256,6 +256,12 @@ enum edge_border_types {
 	E_SMART_NO_GAPS, /**< hide both if one window and gaps to edge is zero */
 };
 
+enum sway_popup_during_fullscreen {
+	POPUP_SMART,
+	POPUP_IGNORE,
+	POPUP_LEAVE,
+};
+
 enum command_context {
 	CONTEXT_CONFIG = 1,
 	CONTEXT_BINDING = 2,
@@ -355,6 +361,7 @@ struct sway_config {
 	bool pango_markup;
 	size_t urgent_timeout;
 	enum sway_fowa focus_on_window_activation;
+	enum sway_popup_during_fullscreen popup_during_fullscreen;
 
 	// Flags
 	bool focus_follows_mouse;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index da6592b..920ef03 100644
--- 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/include/sway/tree/view.h b/include/sway/tree/view.h
index 028be53..eb1e98e 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -49,6 +49,8 @@ struct sway_view_impl {
 		wlr_surface_iterator_func_t iterator, void *user_data);
 	void (*for_each_popup)(struct sway_view *view,
 		wlr_surface_iterator_func_t iterator, void *user_data);
+	bool (*is_transient_for)(struct sway_view *child,
+			struct sway_view *ancestor);
 	void (*close)(struct sway_view *view);
 	void (*close_popups)(struct sway_view *view);
 	void (*destroy)(struct sway_view *view);
@@ -396,4 +398,6 @@ void view_remove_saved_buffer(struct sway_view *view);
 
 void view_save_buffer(struct sway_view *view);
 
+bool view_is_transient_for(struct sway_view *child, struct sway_view *ancestor);
+
 #endif
diff --git a/sway/commands.c b/sway/commands.c
index 780cd7d..8db1df0 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -109,6 +109,7 @@ static struct cmd_handler handlers[] = {
 	{ "new_window", cmd_default_border },
 	{ "no_focus", cmd_no_focus },
 	{ "output", cmd_output },
+	{ "popup_during_fullscreen", cmd_popup_during_fullscreen },
 	{ "raise_floating", cmd_raise_floating },
 	{ "seat", cmd_seat },
 	{ "set", cmd_set },
diff --git a/sway/commands/popup_during_fullscreen.c b/sway/commands/popup_during_fullscreen.c
new file mode 100644
index 0000000..da1904b
--- /dev/null
+++ b/sway/commands/popup_during_fullscreen.c
@@ -0,0 +1,25 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *cmd_popup_during_fullscreen(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "popup_during_fullscreen",
+					EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+
+	if (strcasecmp(argv[0], "smart") == 0) {
+		config->popup_during_fullscreen = POPUP_SMART;
+	} else if (strcasecmp(argv[0], "ignore") == 0) {
+		config->popup_during_fullscreen = POPUP_IGNORE;
+	} else if (strcasecmp(argv[0], "leave_fullscreen") == 0) {
+		config->popup_during_fullscreen = POPUP_LEAVE;
+	} else {
+		return cmd_results_new(CMD_INVALID, "popup_during_fullscreen",
+				"Expected "
+				"'popup_during_fullscreen smart|ignore|leave_fullscreen'");
+	}
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config.c b/sway/config.c
index e95c7b3..a50e914 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -214,6 +214,7 @@ static void config_defaults(struct sway_config *config) {
 	if (!(config->font = strdup("monospace 10"))) goto cleanup;
 	config->font_height = 17; // height of monospace 10
 	config->urgent_timeout = 500;
+	config->popup_during_fullscreen = POPUP_SMART;
 
 	// floating view
 	config->floating_maximum_width = 0;
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index cfb5a71..adc1ee1 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -329,6 +329,14 @@ 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);
+		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
 		send_frame_done_unmanaged(output, &root->xwayland_unmanaged, when);
 #endif
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index c8b08a5..3617da8 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -961,6 +961,14 @@ void output_render(struct sway_output *output, struct timespec *when,
 			render_container(output, damage, fullscreen_con,
 					fullscreen_con->current.focused);
 		}
+
+		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, fullscreen_con)) {
+				render_floating_container(output, damage, floater);
+			}
+		}
 #ifdef HAVE_XWAYLAND
 		render_unmanaged(output, damage, &root->xwayland_unmanaged);
 #endif
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index a8b527a..4690a3c 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -192,6 +192,21 @@ static void for_each_popup(struct sway_view *view,
 	wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, iterator, user_data);
 }
 
+static bool is_transient_for(struct sway_view *child,
+		struct sway_view *ancestor) {
+	if (xdg_shell_view_from_view(child) == NULL) {
+		return false;
+	}
+	struct wlr_xdg_surface *surface = child->wlr_xdg_surface;
+	while (surface) {
+		if (surface->toplevel->parent == ancestor->wlr_xdg_surface) {
+			return true;
+		}
+		surface = surface->toplevel->parent;
+	}
+	return false;
+}
+
 static void _close(struct sway_view *view) {
 	if (xdg_shell_view_from_view(view) == NULL) {
 		return;
@@ -233,6 +248,7 @@ static const struct sway_view_impl view_impl = {
 	.wants_floating = wants_floating,
 	.for_each_surface = for_each_surface,
 	.for_each_popup = for_each_popup,
+	.is_transient_for = is_transient_for,
 	.close = _close,
 	.close_popups = close_popups,
 	.destroy = destroy,
@@ -395,6 +411,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 			arrange_workspace(view->container->workspace);
 		}
 	}
+
 	transaction_commit_dirty();
 
 	xdg_shell_view->commit.notify = handle_commit;
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index a7838c0..ff950c7 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -189,6 +189,21 @@ static void for_each_popup(struct sway_view *view,
 		user_data);
 }
 
+static bool is_transient_for(struct sway_view *child,
+		struct sway_view *ancestor) {
+	if (xdg_shell_v6_view_from_view(child) == NULL) {
+		return false;
+	}
+	struct wlr_xdg_surface_v6 *surface = child->wlr_xdg_surface_v6;
+	while (surface) {
+		if (surface->toplevel->parent == ancestor->wlr_xdg_surface_v6) {
+			return true;
+		}
+		surface = surface->toplevel->parent;
+	}
+	return false;
+}
+
 static void _close(struct sway_view *view) {
 	if (xdg_shell_v6_view_from_view(view) == NULL) {
 		return;
@@ -230,6 +245,7 @@ static const struct sway_view_impl view_impl = {
 	.wants_floating = wants_floating,
 	.for_each_surface = for_each_surface,
 	.for_each_popup = for_each_popup,
+	.is_transient_for = is_transient_for,
 	.close = _close,
 	.close_popups = close_popups,
 	.destroy = destroy,
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 4c710f7..ebf2131 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -15,6 +15,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 
 static const char *atom_map[ATOM_LAST] = {
 	"_NET_WM_WINDOW_TYPE_NORMAL",
@@ -253,6 +254,21 @@ static void handle_set_decorations(struct wl_listener *listener, void *data) {
 	view_update_csd_from_client(view, csd);
 }
 
+static bool is_transient_for(struct sway_view *child,
+		struct sway_view *ancestor) {
+	if (xwayland_view_from_view(child) == NULL) {
+		return false;
+	}
+	struct wlr_xwayland_surface *surface = child->wlr_xwayland_surface;
+	while (surface) {
+		if (surface->parent == ancestor->wlr_xwayland_surface) {
+			return true;
+		}
+		surface = surface->parent;
+	}
+	return false;
+}
+
 static void _close(struct sway_view *view) {
 	if (xwayland_view_from_view(view) == NULL) {
 		return;
@@ -276,6 +292,7 @@ static const struct sway_view_impl view_impl = {
 	.set_tiled = set_tiled,
 	.set_fullscreen = set_fullscreen,
 	.wants_floating = wants_floating,
+	.is_transient_for = is_transient_for,
 	.close = _close,
 	.destroy = destroy,
 };
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 331c6c7..6d57c45 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -98,6 +98,18 @@ static struct sway_node *node_at_coords(
 		return NULL;
 	}
 	if (ws->fullscreen) {
+		// Try transient containers
+		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;
+				}
+			}
+		}
+		// Try fullscreen container
 		struct sway_container *con =
 			tiling_container_at(&ws->fullscreen->node, lx, ly, surface, sx, sy);
 		if (con) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
index f5cb2f9..f418785 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -655,7 +655,10 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 	// Deny setting focus to a view which is hidden by a fullscreen container
 	if (new_workspace && new_workspace->fullscreen && container &&
 			!container_is_fullscreen_or_child(container)) {
-		return;
+		// Unless it's a transient container
+		if (!container_is_transient_for(container, new_workspace->fullscreen)) {
+			return;
+		}
 	}
 
 	struct sway_output *last_output = last_workspace ?
diff --git a/sway/meson.build b/sway/meson.build
index 8ab2886..c7fc969 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -70,6 +70,7 @@ sway_sources = files(
 	'commands/no_focus.c',
 	'commands/nop.c',
 	'commands/output.c',
+	'commands/popup_during_fullscreen.c',
 	'commands/reload.c',
 	'commands/rename.c',
 	'commands/resize.c',
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 43f0e13..28ab15d 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -555,6 +555,12 @@ You may combine output commands into one, like so:
 You can get a list of output names with *swaymsg -t get\_outputs*. You may also
 match any output by using the output name "\*".
 
+*popup\_during\_fullscreen* smart|ignore|leave\_fullscreen
+	Determines what to do when a fullscreen view opens a dialog.
+	If _smart_ (the default), the dialog will be displayed. If _ignore_, the
+	dialog will not be rendered. If _leave\_fullscreen_, the view will exit
+	fullscreen mode and the dialog will be rendered.
+
 *set* $<name> <value>
 	Sets variable $_name_ to _value_. You can use the new variable in the
 	arguments of future commands. When the variable is used, it can be escaped
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 9db7aed..1664514 100644
--- 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
index 73ce55a..97525d6 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -575,6 +575,16 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 		view_set_tiled(view, true);
 	}
 
+	if (config->popup_during_fullscreen == POPUP_LEAVE &&
+			view->container->workspace &&
+			view->container->workspace->fullscreen &&
+			view->container->workspace->fullscreen->view) {
+		struct sway_container *fs = view->container->workspace->fullscreen;
+		if (view_is_transient_for(view, fs->view)) {
+			container_set_fullscreen(fs, false);
+		}
+	}
+
 	if (should_focus(view)) {
 		input_manager_set_focus(input_manager, &view->container->node);
 	}
@@ -1042,7 +1052,12 @@ bool view_is_visible(struct sway_view *view) {
 	// Check view isn't hidden by another fullscreen view
 	if (workspace->fullscreen &&
 			!container_is_fullscreen_or_child(view->container)) {
-		return false;
+		// However, if we're transient for the fullscreen view and we allow
+		// "popups" during fullscreen then it might be visible
+		if (!container_is_transient_for(view->container,
+					workspace->fullscreen)) {
+			return false;
+		}
 	}
 	return true;
 }
@@ -1095,3 +1110,9 @@ void view_save_buffer(struct sway_view *view) {
 		view->saved_buffer_height = view->surface->current.height;
 	}
 }
+
+bool view_is_transient_for(struct sway_view *child,
+		struct sway_view *ancestor) {
+	return child->impl->is_transient_for &&
+		child->impl->is_transient_for(child, ancestor);
+}