Merge branch 'fix-whitespace'

[i3/i3] / src / move.c

diff --git a/src/move.c b/src/move.c
index d3065c2490bf1faae92e6882231ece95b1a0fe16..46b90177dd27dbbd27024bf8d820994155754760 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "move.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -169,6 +171,12 @@ void tree_move(int direction) {
     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;