Revert "Fixes dealing with workspace_layout and related bugs [rfc]"

7 files changed, 26 insertions, 44 deletions

diff --git a/include/sway/container.h b/include/sway/container.h
index 90825a49..5e251885 100644
--- a/include/sway/container.h
+++ b/include/sway/container.h
@@ -68,7 +68,6 @@ struct sway_container {
         enum swayc_types type;
         enum swayc_layouts layout;
         enum swayc_layouts prev_layout;
-        enum swayc_layouts workspace_layout;
 
         /**
          * Width and height of this container, without borders or gaps.
@@ -322,10 +321,4 @@ void update_visibility(swayc_t *container);
  */
 void close_views(swayc_t *container);
 
-/**
- * Assign layout to a container. Needed due to workspace container specifics.
- * Workspace always needs L_HORIZ layout.
- */
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout);
-
 #endif
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index a716f9be..e0af30aa 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -22,10 +22,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         enum swayc_layouts old_layout = parent->layout;
 
         if (strcasecmp(argv[0], "default") == 0) {
-                swayc_change_layout(parent, parent->prev_layout);
+                parent->layout = parent->prev_layout;
                 if (parent->layout == L_NONE) {
                         swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
-                        swayc_change_layout(parent, default_layout(output));
+                        parent->layout = default_layout(output);
                 }
         } else {
                 if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@@ -37,22 +37,22 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                                 parent = new_container(parent, L_TABBED);
                         }
 
-                        swayc_change_layout(parent, L_TABBED);
+                        parent->layout = L_TABBED;
                 } else if (strcasecmp(argv[0], "stacking") == 0) {
                         if (parent->type != C_CONTAINER && !swayc_is_empty_workspace(parent)) {
                                 parent = new_container(parent, L_STACKED);
                         }
 
-                        swayc_change_layout(parent, L_STACKED);
+                        parent->layout = L_STACKED;
                 } else if (strcasecmp(argv[0], "splith") == 0) {
-                        swayc_change_layout(parent, L_HORIZ);
+                        parent->layout = L_HORIZ;
                 } else if (strcasecmp(argv[0], "splitv") == 0) {
-                        swayc_change_layout(parent, L_VERT);
+                        parent->layout = L_VERT;
                 } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
                         if (parent->layout == L_VERT) {
-                                swayc_change_layout(parent, L_HORIZ);
+                                parent->layout = L_HORIZ;
                         } else {
-                                swayc_change_layout(parent, L_VERT);
+                                parent->layout = L_VERT;
                         }
                 }
         }
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 4819d9ef..48e9d562 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -37,7 +37,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
                                 if (!view->children || view->children->length == 0) {
                                         return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
                                 }
-                                view = new_container(view, view->workspace_layout);
+                                view = new_container(view, view->layout);
                         } if (view->type != C_CONTAINER && view->type != C_VIEW) {
                                 return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
                         }
@@ -65,7 +65,7 @@ struct cmd_results *cmd_move(int argc, char **argv) {
                                 if (!view->children || view->children->length == 0) {
                                         return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
                                 }
-                                view = new_container(view, view->workspace_layout);
+                                view = new_container(view, view->layout);
                         } else if (view->type != C_CONTAINER && view->type != C_VIEW) {
                                 return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
                         } else if (!(output = output_by_name(argv[3], &abs_pos))) {
diff --git a/sway/commands/split.c b/sway/commands/split.c
index f3e58fbf..9ff1d638 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -25,11 +25,11 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) {
         /* 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");
-                swayc_change_layout(focused, layout);
+                focused->layout = layout;
         } else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) {
                 /* Case of no siblings. change parent layout */
                 sway_log(L_DEBUG, "changing container layout");
-                swayc_change_layout(focused->parent, layout);
+                focused->parent->layout = layout;
         } else {
                 /* regular case where new split container is build around focused container
                  * or in case of workspace, container inherits its children */
diff --git a/sway/container.c b/sway/container.c
index c3461acb..9d5e2690 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -27,7 +27,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
         c->handle = -1;
         c->gaps = -1;
         c->layout = L_NONE;
-        c->workspace_layout = L_NONE;
         c->type = type;
         if (type != C_VIEW) {
                 c->children = create_list();
@@ -210,8 +209,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
         swayc_t *workspace = new_swayc(C_WORKSPACE);
 
         workspace->prev_layout = L_NONE;
-        workspace->layout = L_HORIZ;
-        workspace->workspace_layout = default_layout(output);
+        workspace->layout = default_layout(output);
 
         workspace->x = output->x;
         workspace->y = output->y;
@@ -264,7 +262,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
                 // add container to workspace chidren
                 add_child(workspace, cont);
                 // give them proper layouts
-                cont->layout = workspace->workspace_layout;
+                cont->layout = workspace->layout;
                 cont->prev_layout = workspace->prev_layout;
                 /* TODO: might break shit in move_container!!! workspace->layout = layout; */
                 set_focused_container_for(workspace, get_focused_view(workspace));
@@ -931,12 +929,3 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) {
         }
         return NULL;
 }
-
-swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
-        if (container->type == C_WORKSPACE) {
-                container->workspace_layout = layout;
-        } else {
-                container->layout = layout;
-        }
-        return container;
-}
diff --git a/sway/handlers.c b/sway/handlers.c
index 9a84182a..2235bc8b 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -398,6 +398,17 @@ static bool handle_view_created(wlc_handle handle) {
                 if (workspace && workspace->fullscreen) {
                         set_focused_container(workspace->fullscreen);
                 }
+
+                // if parent container is a workspace, newview its only child and
+                // layout is tabbed/stacked, add a container around newview
+                swayc_t *parent_container = newview->parent;
+                if (parent_container && parent_container->type == C_WORKSPACE &&
+                        parent_container->children && parent_container->children->length == 1 &&
+                        (parent_container->layout == L_TABBED || parent_container->layout == L_STACKED)) {
+                        swayc_t *container = new_container(newview, parent_container->layout);
+                        set_focused_container(newview);
+                        arrange_windows(container, -1, -1);
+                }
         } else {
                 swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT);
                 wlc_handle *h = malloc(sizeof(wlc_handle));
diff --git a/sway/layout.c b/sway/layout.c
index 8565113d..4f2ea09a 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -66,11 +66,6 @@ void add_child(swayc_t *parent, swayc_t *child) {
         if (!parent->focused) {
                 parent->focused = child;
         }
-
-        // wrap view into a container
-        if (parent->type == C_WORKSPACE && child->type == C_VIEW) {
-                new_container(child, parent->workspace_layout);
-        }
 }
 
 void insert_child(swayc_t *parent, swayc_t *child, int index) {
@@ -85,11 +80,6 @@ void insert_child(swayc_t *parent, swayc_t *child, int index) {
         if (!parent->focused) {
                 parent->focused = child;
         }
-
-        // wrap view into a container
-        if (parent->type == C_WORKSPACE && child->type == C_VIEW) {
-                new_container(child, parent->workspace_layout);
-        }
 }
 
 void add_floating(swayc_t *ws, swayc_t *child) {
@@ -312,8 +302,7 @@ void move_container(swayc_t *container, enum movement_direction dir) {
                 }
                 // Change parent layout if we need to
                 if (parent->children->length == 1 && parent->layout != layout) {
-                        swayc_change_layout(parent, layout);
-                        /* parent->layout = layout; */
+                        parent->layout = layout;
                         continue;
                 }
                 if (parent->type == C_WORKSPACE) {