3 files changed, 47 insertions, 1 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 960244c0..a46a0b89 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -59,6 +59,7 @@ static sway_cmd cmd_set;
 static sway_cmd cmd_split;
 static sway_cmd cmd_splith;
 static sway_cmd cmd_splitv;
+static sway_cmd cmd_sticky;
 static sway_cmd cmd_workspace;
 static sway_cmd cmd_ws_auto_back_and_forth;
 
@@ -1237,6 +1238,28 @@ static struct cmd_results *cmd_splith(int argc, char **argv) {
 	return _do_split(argc, argv, L_HORIZ);
 }
 
+static struct cmd_results *cmd_sticky(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if (config->reading) return cmd_results_new(CMD_FAILURE, "sticky", "Can't be used in config file.");
+	if (!config->active) return cmd_results_new(CMD_FAILURE, "sticky", "Can only be used when sway is running.");
+	if ((error = checkarg(argc, "sticky", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	char *action = argv[0];
+	swayc_t *cont = get_focused_view(&root_container);
+	if (strcmp(action, "toggle") == 0) {
+		cont->sticky = !cont->sticky;
+	} else if (strcmp(action, "enable") == 0) {
+		cont->sticky = true;
+	} else if (strcmp(action, "disable") == 0) {
+		cont->sticky = false;
+	} else {
+		return cmd_results_new(CMD_FAILURE, "sticky",
+				"Expected 'sticky enable|disable|toggle'");
+	}
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
 static struct cmd_results *cmd_log_colors(int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	if (!config->reading) return cmd_results_new(CMD_FAILURE, "log_colors", "Can only be used in config file.");
@@ -1416,6 +1439,7 @@ static struct cmd_handler handlers[] = {
 	{ "split", cmd_split },
 	{ "splith", cmd_splith },
 	{ "splitv", cmd_splitv },
+	{ "sticky", cmd_sticky },
 	{ "workspace", cmd_workspace },
 	{ "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth },
 };
diff --git a/sway/container.c b/sway/container.c
index 1634cce0..ba37d7c8 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -226,6 +226,7 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
 	view->app_id = app_id ? strdup(app_id) : NULL;
 	view->visible = true;
 	view->is_focused = true;
+	view->sticky = false;
 	// Setup geometry
 	const struct wlc_geometry* geometry = wlc_view_get_geometry(handle);
 	view->width = 0;
@@ -261,6 +262,7 @@ swayc_t *new_floating_view(wlc_handle handle) {
 	const char *app_id = wlc_view_get_app_id(handle);
 	view->app_id = app_id ? strdup(app_id) : NULL;
 	view->visible = true;
+	view->sticky = false;
 
 	// Set the geometry of the floating view
 	const struct wlc_geometry* geometry = wlc_view_get_geometry(handle);
diff --git a/sway/workspace.c b/sway/workspace.c
index f18a691f..6c9a39e0 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -221,11 +221,31 @@ bool workspace_switch(swayc_t *workspace) {
 		strcpy(prev_workspace_name, active_ws->name);
 	}
 
+	// move sticky containers
+	if (swayc_parent_by_type(active_ws, C_OUTPUT) == swayc_parent_by_type(workspace, C_OUTPUT)) {
+		// don't change list while traversing it, use intermediate list instead
+		list_t *stickies = create_list();
+		for (int i = 0; i < active_ws->floating->length; i++) {
+			swayc_t *cont = active_ws->floating->items[i];
+			if (cont->sticky) {
+				list_add(stickies, cont);
+			}
+		}
+		for (int i = 0; i < stickies->length; i++) {
+			swayc_t *cont = stickies->items[i];
+			sway_log(L_DEBUG, "Moving sticky container %p to %p:%s",
+					cont, workspace, workspace->name);
+			swayc_t *parent = remove_child(cont);
+			add_floating(workspace, cont);
+			// Destroy old container if we need to
+			destroy_container(parent);
+		}
+		list_free(stickies);
+	}
 	sway_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
 	if (!set_focused_container(get_focused_view(workspace))) {
 		return false;
 	}
 	arrange_windows(workspace, -1, -1);
-
 	return true;
 }