implement TAILQ_SWAP (only for consecutive elements, order relevant) and use it

[i3/i3] / src / move.c

diff --git a/src/move.c b/src/move.c
index 2700f205729c384080f8a69a1cc249c905247d56..6088c6e40ec2de6533ea2ab75362c5e3622f8f28 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -109,33 +109,22 @@ void tree_move(int direction) {
     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)))
-                return;
-
-            if (!con_is_leaf(swap)) {
-                insert_con_into(con, con_descend_focused(swap), AFTER);
-                goto end;
-            }
-
-            /* 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)))
-                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 (!(swap = (direction == TOK_LEFT || direction == TOK_UP ?
+                      TAILQ_PREV(con, nodes_head, nodes) :
+                      TAILQ_NEXT(con, nodes))))
+            return;
+
+        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;
     }