2 files changed, 42 insertions, 23 deletions

diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index 9e0be9d0..38a4e1da 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -31,31 +31,10 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
 		wants_floating = !container->is_floating;
 	} else {
 		return cmd_results_new(CMD_FAILURE, "floating",
-			"Expected 'floating <enable|disable|toggle>");
+			"Expected 'floating <enable|disable|toggle>'");
 	}
 
-	// Change from tiled to floating
-	if (!container->is_floating && wants_floating) {
-		struct sway_container *workspace = container_parent(
-				container, C_WORKSPACE);
-		container_remove_child(container);
-		container_add_floating(workspace, container);
-
-		struct sway_output *output = workspace->parent->sway_output;
-		output_damage_whole_container(output, container);
-		// Reset to sane size and position
-		container->width = 640;
-		container->height = 480;
-		container->x = workspace->width / 2 - container->width / 2;
-		container->y = workspace->height / 2 - container->height / 2;
-		view_autoconfigure(container->sway_view);
-		output_damage_whole_container(output, container);
-
-		seat_set_focus(config->handler_context.seat, container);
-		arrange_workspace(workspace);
-	} else if (container->is_floating && !wants_floating) {
-		// TODO
-	}
+	container_set_floating(container, wants_floating);
 
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
new file mode 100644
index 00000000..4bb4bd39
--- /dev/null
+++ b/sway/commands/sticky.c
@@ -0,0 +1,40 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/seat.h"
+#include "sway/ipc-server.h"
+#include "sway/output.h"
+#include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/tree/view.h"
+#include "list.h"
+
+struct cmd_results *cmd_sticky(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "sticky", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	struct sway_container *container =
+		config->handler_context.current_container;
+	if (!container->is_floating) {
+		return cmd_results_new(CMD_FAILURE, "sticky",
+			"Can't set sticky on a tiled container");
+	}
+
+	bool wants_sticky;
+	if (strcasecmp(argv[0], "enable") == 0) {
+		wants_sticky = true;
+	} else if (strcasecmp(argv[0], "disable") == 0) {
+		wants_sticky = false;
+	} else if (strcasecmp(argv[0], "toggle") == 0) {
+		wants_sticky = !container->is_sticky;
+	} else {
+		return cmd_results_new(CMD_FAILURE, "sticky",
+			"Expected 'sticky <enable|disable|toggle>'");
+	}
+
+	container->is_sticky = wants_sticky;
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}