2 files changed, 67 insertions, 1 deletions

diff --git a/sway/commands.c b/sway/commands.c
index d1bbdc89..cb96703e 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -206,7 +206,7 @@ static bool cmd_floating(struct sway_config *config, int argc, char **argv) {
 		if (!view->is_floating) {
 			// Remove view from its current location
 			destroy_container(remove_child(view));
-			
+
 			// and move it into workspace floating
 			add_floating(active_workspace,view);
 			view->x = (active_workspace->width - view->width)/2;
@@ -341,6 +341,27 @@ static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char *
 	return true;
 }
 
+static bool cmd_move(struct sway_config *config, int argc, char **argv) {
+	if (!checkarg(argc, "workspace", EXPECTED_EQUAL_TO, 1)) {
+		return false;
+	}
+
+	swayc_t *view = get_focused_container(&root_container);
+
+	if (strcasecmp(argv[0], "left") == 0) {
+		move_container(view,&root_container,MOVE_LEFT);
+	} else if (strcasecmp(argv[0], "right") == 0) {
+		move_container(view,&root_container,MOVE_RIGHT);
+	} else if (strcasecmp(argv[0], "up") == 0) {
+		move_container(view,&root_container,MOVE_UP);
+	} else if (strcasecmp(argv[0], "down") == 0) {
+		move_container(view,&root_container,MOVE_DOWN);
+	} else {
+		return false;
+	}
+	return true;
+}
+
 static bool cmd_gaps(struct sway_config *config, int argc, char **argv) {
 	if (!checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1)) {
 		return false;
@@ -736,6 +757,7 @@ static struct cmd_handler handlers[] = {
 	{ "kill", cmd_kill },
 	{ "layout", cmd_layout },
 	{ "log_colors", cmd_log_colors },
+	{ "move", cmd_move},
 	{ "reload", cmd_reload },
 	{ "resize", cmd_resize },
 	{ "set", cmd_set },
diff --git a/sway/layout.c b/sway/layout.c
index 35aa4942..7eaa9ea4 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -108,6 +108,50 @@ swayc_t *remove_child(swayc_t *child) {
 	return parent;
 }
 
+//TODO: Implement horizontal movement.
+//TODO: Implement move to a different workspace.
+void move_container(swayc_t *container,swayc_t* root,enum movement_direction direction){
+	sway_log(L_DEBUG, "Moved window");
+	swayc_t *temp;
+	int i;
+	uint clength = root->children->length;
+	//Rearrange
+	for (i = 0; i < clength; ++i) {
+		swayc_t *child = root->children->items[i];
+		if (child->handle == container->handle){
+			if (clength == 1){
+				//Only one container, meh.
+				break;
+			}
+			if (direction == MOVE_LEFT && i > 0){
+				temp = root->children->items[i-1];
+				root->children->items[i] = temp;
+				root->children->items[i-1] = container;
+				arrange_windows(&root_container,-1,-1);
+			}
+			else if (direction == MOVE_RIGHT && i < clength-1){
+				temp = root->children->items[i+1];
+				root->children->items[i] = temp;
+				root->children->items[i+1] = container;
+				arrange_windows(&root_container,-1,-1);
+
+			}
+			else if (direction == MOVE_UP){
+				sway_log(L_INFO, "Moving up not implemented");
+			}
+			else if (direction == MOVE_DOWN){
+				sway_log(L_INFO, "Moving down not implemented");
+			}
+
+			break;
+		}
+		else if (child->children != NULL){
+			move_container(container,child,direction);
+		}
+	}
+
+}
+
 
 void arrange_windows(swayc_t *container, double width, double height) {
 	int i;