From 8f09ba78859ea894e843258246156406566d8e51 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Fri, 28 Sep 2018 23:47:22 -0400
Subject: [PATCH] Move sticky containers in output_evacuate

---
 sway/tree/container.c |  7 +++++++
 sway/tree/output.c    | 28 +++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/sway/tree/container.c b/sway/tree/container.c
index baaa82fd..01bd04c7 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -823,9 +823,16 @@ void container_floating_move_to_center(struct sway_container *con) {
 		return;
 	}
 	struct sway_workspace *ws = con->workspace;
+	bool full = con->is_fullscreen;
+	if (full) {
+		container_set_fullscreen(con, false);
+	}
 	double new_lx = ws->x + (ws->width - con->width) / 2;
 	double new_ly = ws->y + (ws->height - con->height) / 2;
 	container_floating_translate(con, new_lx - con->x, new_ly - con->y);
+	if (full) {
+		container_set_fullscreen(con, true);
+	}
 }
 
 static bool find_urgent_iterator(struct sway_container *con, void *data) {
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 06933dc4..c3176325 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -113,6 +113,20 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
 	arrange_root();
 }
 
+static void evacuate_sticky(struct sway_workspace *old_ws,
+		struct sway_output *new_output) {
+	struct sway_workspace *new_ws = output_get_active_workspace(new_output);
+	while (old_ws->floating->length) {
+		struct sway_container *sticky = old_ws->floating->items[0];
+		container_detach(sticky);
+		workspace_add_floating(new_ws, sticky);
+		container_handle_fullscreen_reparent(sticky);
+		container_floating_move_to_center(sticky);
+		ipc_event_window(sticky, "move");
+	}
+	workspace_detect_urgent(new_ws);
+}
+
 static void output_evacuate(struct sway_output *output) {
 	if (!output->workspaces->length) {
 		return;
@@ -130,17 +144,21 @@ static void output_evacuate(struct sway_output *output) {
 
 		workspace_detach(workspace);
 
-		if (workspace_is_empty(workspace)) {
-			workspace_begin_destroy(workspace);
-			continue;
-		}
-
 		struct sway_output *new_output =
 			workspace_output_get_highest_available(workspace, output);
 		if (!new_output) {
 			new_output = fallback_output;
 		}
 
+		if (workspace_is_empty(workspace)) {
+			// If floating is not empty, there are sticky containers to move
+			if (workspace->floating->length) {
+				evacuate_sticky(workspace, new_output);
+			}
+			workspace_begin_destroy(workspace);
+			continue;
+		}
+
 		if (new_output) {
 			workspace_output_add_priority(workspace, new_output);
 			output_add_workspace(new_output, workspace);