Prevent moving out of fullscreen containers.

[i3/i3] / src / move.c

diff --git a/src/move.c b/src/move.c
index 955cb6b09824b09f2627bdd213e01d3bcaf2e598..d110312aa57ab9b916b9cfe3073b96943b73a6ea 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1,9 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * move.c: Moving containers into some direction.
+ *
  */
-
 #include "all.h"
-#include "cmdparse.tab.h"
 
 typedef enum { BEFORE, AFTER } position_t;
 
@@ -22,6 +26,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) {
@@ -65,8 +86,8 @@ static void attach_to_workspace(Con *con, Con *ws) {
 }
 
 /*
- * Moves the current container in the given direction (TOK_LEFT, TOK_RIGHT,
- * TOK_UP, TOK_DOWN from cmdparse.l)
+ * Moves the current container in the given direction (D_LEFT, D_RIGHT,
+ * D_UP, D_DOWN).
  *
  */
 void tree_move(int direction) {
@@ -84,7 +105,7 @@ void tree_move(int direction) {
         return;
     }
 
-    orientation_t o = (direction == TOK_LEFT || direction == TOK_RIGHT ? HORIZ : VERT);
+    orientation_t o = (direction == D_LEFT || direction == D_RIGHT ? HORIZ : VERT);
 
     Con *same_orientation = con_parent_with_orientation(con, o);
     /* The do {} while is used to 'restart' at this point with a different
@@ -113,14 +134,14 @@ void tree_move(int direction) {
         if (same_orientation == con->parent) {
             DLOG("We are in the same container\n");
             Con *swap;
-            if ((swap = (direction == TOK_LEFT || direction == TOK_UP ?
+            if ((swap = (direction == D_LEFT || direction == D_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)
+                if (direction == D_LEFT || direction == D_UP)
                     TAILQ_SWAP(swap, con, &(swap->parent->nodes_head), nodes);
                 else TAILQ_SWAP(con, swap, &(swap->parent->nodes_head), nodes);
 
@@ -142,18 +163,25 @@ void tree_move(int direction) {
     } 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;
 
+    /* Enforce the fullscreen focus restrictions. */
+    if (!con_fullscreen_permits_focusing(above->parent)) {
+        LOG("Cannot move out of fullscreen container\n");
+        return;
+    }
+
     DLOG("above = %p\n", above);
     Con *next;
     position_t position;
-    if (direction == TOK_UP || direction == TOK_LEFT) {
+    if (direction == D_UP || direction == D_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);
     }
@@ -171,5 +199,8 @@ end:
      * container(s) would still point to the old container(s)). */
     con_focus(con);
 
+    /* force re-painting the indicators */
+    FREE(con->deco_render_params);
+
     tree_flatten(croot);
 }