Make workspace_layout handle all cons at workspace level, not only the first one...

[i3/i3] / src / move.c

diff --git a/src/move.c b/src/move.c
index 2700f205729c384080f8a69a1cc249c905247d56..37fc0d34d7b3ac9082a88a08be9f4a65577837f3 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -22,6 +22,23 @@ static void insert_con_into(Con *con, Con *target, position_t position) {
     con_detach(con);
     con_fix_percent(con->parent);
 
+    /* When moving to a workspace, we respect the user’s configured
+     * workspace_layout */
+    if (parent->type == CT_WORKSPACE) {
+        Con *split = workspace_attach_to(parent);
+        if (split != parent) {
+            DLOG("Got a new split con, using that one instead\n");
+            con->parent = split;
+            con_attach(con, split, false);
+            DLOG("attached\n");
+            con->percent = 0.0;
+            con_fix_percent(split);
+            con = split;
+            DLOG("ok, continuing with con %p instead\n", con);
+            con_detach(con);
+        }
+    }
+
     con->parent = parent;
 
     if (position == BEFORE) {
@@ -87,61 +104,63 @@ void tree_move(int direction) {
     orientation_t o = (direction == TOK_LEFT || direction == TOK_RIGHT ? HORIZ : VERT);
 
     Con *same_orientation = con_parent_with_orientation(con, o);
-    /* There is no parent container with the same orientation */
-    if (!same_orientation) {
-        if (con_is_floating(con)) {
-            /* this is a floating con, we just disable floating */
-            floating_disable(con, true);
-            return;
-        }
-        if (con_inside_floating(con)) {
-            /* 'con' should be moved out of a floating container */
-            DLOG("Inside floating, moving to workspace\n");
-            attach_to_workspace(con, con_get_workspace(con));
-            goto end;
-        }
-        DLOG("Force-changing orientation\n");
-        ws_force_orientation(con_get_workspace(con), o);
-        same_orientation = con_parent_with_orientation(con, o);
-    }
-
-    /* easy case: the move is within this container */
-    if (same_orientation == con->parent) {
-        DLOG("We are in the same container\n");
-        Con *swap;
-        /* TODO: TAILQ_SWAP? */
-        if (direction == TOK_LEFT || direction == TOK_UP) {
-            if (!(swap = TAILQ_PREV(con, nodes_head, nodes)))
+    /* The do {} while is used to 'restart' at this point with a different
+     * same_orientation, see the very last lines before the end of this block
+     * */
+    do {
+        /* There is no parent container with the same orientation */
+        if (!same_orientation) {
+            if (con_is_floating(con)) {
+                /* this is a floating con, we just disable floating */
+                floating_disable(con, true);
                 return;
-
-            if (!con_is_leaf(swap)) {
-                insert_con_into(con, con_descend_focused(swap), AFTER);
+            }
+            if (con_inside_floating(con)) {
+                /* 'con' should be moved out of a floating container */
+                DLOG("Inside floating, moving to workspace\n");
+                attach_to_workspace(con, con_get_workspace(con));
                 goto end;
             }
+            DLOG("Force-changing orientation\n");
+            ws_force_orientation(con_get_workspace(con), o);
+            same_orientation = con_parent_with_orientation(con, o);
+        }
 
-            /* the container right of the current one is a normal one. */
-            con_detach(con);
-            TAILQ_INSERT_BEFORE(swap, con, nodes);
-            TAILQ_INSERT_HEAD(&(swap->parent->focus_head), con, focused);
-        } else {
-            if (!(swap = TAILQ_NEXT(con, nodes)))
+        /* easy case: the move is within this container */
+        if (same_orientation == con->parent) {
+            DLOG("We are in the same container\n");
+            Con *swap;
+            if ((swap = (direction == TOK_LEFT || direction == TOK_UP ?
+                          TAILQ_PREV(con, nodes_head, nodes) :
+                          TAILQ_NEXT(con, nodes)))) {
+                if (!con_is_leaf(swap)) {
+                    insert_con_into(con, con_descend_focused(swap), AFTER);
+                    goto end;
+                }
+                if (direction == TOK_LEFT || direction == TOK_UP)
+                    TAILQ_SWAP(swap, con, &(swap->parent->nodes_head), nodes);
+                else TAILQ_SWAP(con, swap, &(swap->parent->nodes_head), nodes);
+
+                TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+                TAILQ_INSERT_HEAD(&(swap->parent->focus_head), con, focused);
+
+                DLOG("Swapped.\n");
                 return;
-
-            if (!con_is_leaf(swap)) {
-                insert_con_into(con, con_descend_focused(swap), AFTER);
-                goto end;
             }
 
-            con_detach(con);
-            TAILQ_INSERT_AFTER(&(swap->parent->nodes_head), swap, con, nodes);
-            TAILQ_INSERT_HEAD(&(swap->parent->focus_head), con, focused);
+            /* If there was no con with which we could swap the current one, search
+             * again, but starting one level higher. If we are on the workspace
+             * level, don’t do that. The result would be a force change of
+             * workspace orientation, which is not necessary. */
+            if (con->parent == con_get_workspace(con))
+                return;
+            same_orientation = con_parent_with_orientation(con->parent, o);
         }
-        DLOG("Swapped.\n");
-        return;
-    }
+    } while (same_orientation == NULL);
 
     /* this time, we have to move to another container */
-    /* This is the container *above* 'con' which is inside 'same_orientation' */
+    /* This is the container *above* 'con' (an ancestor of con) which is inside
+     * 'same_orientation' */
     Con *above = con;
     while (above->parent != same_orientation)
         above = above->parent;
@@ -152,7 +171,7 @@ void tree_move(int direction) {
     if (direction == TOK_UP || direction == TOK_LEFT) {
         position = BEFORE;
         next = TAILQ_PREV(above, nodes_head, nodes);
-    } else if (direction == TOK_DOWN || direction == TOK_RIGHT) {
+    } else {
         position = AFTER;
         next = TAILQ_NEXT(above, nodes);
     }