fixed split

2 files changed, 42 insertions, 18 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 5f378a98..6ccc92fd 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -226,6 +226,7 @@ static bool cmd_set(struct sway_config *config, int argc, char **argv) {
 	list_add(config->symbols, var);
 	return true;
 }
+static void container_log(const swayc_t *c);
 
 static bool _do_split(struct sway_config *config, int argc, char **argv, int layout) {
 	char *name = layout == L_VERT  ? "splitv" :
@@ -235,20 +236,27 @@ static bool _do_split(struct sway_config *config, int argc, char **argv, int lay
 	}
 	swayc_t *focused = get_focused_container(&root_container);
 
-	/* Case that focus is on an empty workspace. change its layout */
-	if (focused->type == C_WORKSPACE) {
+	container_log(focused);
+
+	/* Case that focus is on an workspace with 0/1 children.change its layout */
+	if (focused->type == C_WORKSPACE && focused->children->length <= 1) {
+		sway_log(L_DEBUG, "changing workspace layout");
 		focused->layout = layout;
-		return true;
 	}
 	/* Case of no siblings. change parent layout */
-	if (focused->parent->children->length == 1) {
+	else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) {
+		sway_log(L_DEBUG, "changing container layout");
 		focused->parent->layout = layout;
-		return true;
 	}
-	/* regular case where new split container is build around focused container */
-	swayc_t *parent = new_container(focused, layout);
-	focus_view(focused);
-	arrange_windows(parent, -1, -1);
+	/* regular case where new split container is build around focused container
+	 * or in case of workspace, container inherits its children */
+	else {
+		sway_log(L_DEBUG, "Adding new container around current focused container");
+		swayc_t *parent = new_container(focused, layout);
+		focus_view(focused);
+		arrange_windows(parent, -1, -1);
+	}
+	container_log(focused);
 	return true;
 }
 
diff --git a/sway/container.c b/sway/container.c
index 1c17e92f..b52ffd8c 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -26,6 +26,9 @@ static void free_swayc(swayc_t *c) {
 		list_free(c->children);
 	}
 	if (c->parent) {
+		if (c->parent->focused == c) {
+			c->parent->focused = NULL;
+		}
 		remove_child(c->parent, c);
 	}
 	free(c);
@@ -88,9 +91,28 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
 	cont->y        = child->y;
 	cont->visible  = child->visible;
 
-	swayc_t *parent = replace_child(child, cont);
-	if (parent) {
-		add_child(cont, child);
+	/* Container inherits all of workspaces children, layout and whatnot */
+	if (child->type == C_WORKSPACE) {
+		swayc_t *workspace = child;
+		//reorder focus
+		cont->focused = workspace->focused;
+		workspace->focused = cont;
+		//Swap children
+		list_t  *tmp_list  = workspace->children;
+		workspace->children = cont->children;
+		cont->children = tmp_list;
+		//add container to workspace chidren
+		add_child(workspace, cont);
+		//give them proper layouts
+		cont->layout = workspace->layout;
+		workspace->layout = layout;
+	}
+	//Or is built around container
+	else {
+		swayc_t *parent = replace_child(child, cont);
+		if (parent) {
+			add_child(cont, child);
+		}
 	}
 	return cont;
 }
@@ -152,9 +174,6 @@ swayc_t *destroy_container(swayc_t *container) {
 		swayc_t *parent = container->parent;
 		free_swayc(container);
 
-		if (parent->focused == container) {
-			parent->focused = NULL;
-		}
 		container = parent;
 	}
 	return container;
@@ -169,9 +188,6 @@ swayc_t *destroy_view(swayc_t *view) {
 	swayc_t *parent = view->parent;
 	free_swayc(view);
 
-	if (parent->focused == view) {
-		parent->focused = NULL;
-	}
 	//Destroy empty containers
 	if (parent->type == C_CONTAINER) {
 		return destroy_container(parent);