cleanup cmdparse lexer/parser (ignore whitespace, solves conflicts)

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index 806d0b292235162dc0b3eac3379d347f8834073c..45021f5f71320cf56cbde11e2a4a392fe653e593 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -549,8 +549,10 @@ void con_move_to_workspace(Con *con, Con *workspace) {
     Con *next = con_descend_focused(workspace);
 
     /* 3: we go up one level, but only when next is a normal container */
-    if (next->type != CT_WORKSPACE)
+    if (next->type != CT_WORKSPACE) {
+        DLOG("next originally = %p / %s / type %d\n", next, next->name, next->type);
         next = next->parent;
+    }
 
     /* 4: if the target container is floating, we get the workspace instead.
      * Only tiling windows need to get inserted next to the current container.
@@ -561,6 +563,12 @@ void con_move_to_workspace(Con *con, Con *workspace) {
         next = floatingcon->parent;
     }
 
+    if (con->type == CT_FLOATING_CON) {
+        Con *ws = con_get_workspace(next);
+        DLOG("This is a floating window, using workspace %p / %s\n", ws, ws->name);
+        next = ws;
+    }
+
     DLOG("Re-attaching container to %p / %s\n", next, next->name);
     /* 5: re-attach the con to the parent of this focused container */
     Con *parent = con->parent;
@@ -581,7 +589,7 @@ void con_move_to_workspace(Con *con, Con *workspace) {
      * don’t want to focus invisible workspaces */
     if (source_output != dest_output &&
         workspace_is_visible(workspace)) {
-        DLOG("Moved to a different output, focusing target");
+        DLOG("Moved to a different output, focusing target\n");
     } else {
         con_focus(focus_next);
     }
@@ -634,6 +642,10 @@ Con *con_next_focused(Con *con) {
                 DLOG("Focus list empty, returning ws\n");
                 next = ws;
             }
+        } else {
+            /* Instead of returning the next CT_FLOATING_CON, we descend it to
+             * get an actual window to focus. */
+            next = con_descend_focused(next);
         }
         return next;
     }
@@ -873,7 +885,7 @@ static void con_on_remove_child(Con *con) {
     int children = con_num_children(con);
     if (children == 0) {
         DLOG("Container empty, closing\n");
-        tree_close(con, false, false);
+        tree_close(con, DONT_KILL_WINDOW, false);
         return;
     }
 }