X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcon.c;h=45021f5f71320cf56cbde11e2a4a392fe653e593;hb=08f64f011d00da966b474d4f93f7f55b78387fb7;hp=92b05fd7430f6dbc0a7f5a9093ee6000c76617b8;hpb=834f4d7bc29cc2e0b4b151c62c8bc468943fa2d7;p=i3%2Fi3

diff --git a/src/con.c b/src/con.c
index 92b05fd7..45021f5f 100644
--- a/src/con.c
+++ b/src/con.c
@@ -59,8 +59,19 @@ Con *con_new(Con *parent) {
     TAILQ_INIT(&(new->focus_head));
     TAILQ_INIT(&(new->swallow_head));
 
-    if (parent != NULL)
-        con_attach(new, parent, false);
+    if (parent != NULL) {
+        /* Set layout of ws if this is the first child of the ws and the user
+         * wanted something different than the default layout. */
+        if (parent->type == CT_WORKSPACE &&
+            con_is_leaf(parent) &&
+            config.default_layout != L_DEFAULT) {
+            con_set_layout(new, config.default_layout);
+            con_attach(new, parent, false);
+            con_set_layout(parent, config.default_layout);
+        } else {
+            con_attach(new, parent, false);
+        }
+    }
 
     return new;
 }
@@ -123,8 +134,9 @@ void con_attach(Con *con, Con *parent, bool ignore_focus) {
             }
         }
 
-        /* Insert the container after the tiling container, if found */
-        if (current) {
+        /* Insert the container after the tiling container, if found.
+         * When adding to a CT_OUTPUT, just append one after another. */
+        if (current && parent->type != CT_OUTPUT) {
             DLOG("Inserting con = %p after last focused tiling con %p\n",
                  con, current);
             TAILQ_INSERT_AFTER(nodes_head, current, con, nodes);
@@ -226,7 +238,6 @@ Con *con_get_workspace(Con *con) {
     Con *result = con;
     while (result != NULL && result->type != CT_WORKSPACE)
         result = result->parent;
-    assert(result != NULL);
     return result;
 }
 
@@ -333,7 +344,7 @@ Con *con_inside_floating(Con *con) {
     if (con->floating >= FLOATING_AUTO_ON)
         return con->parent;
 
-    if (con->type == CT_WORKSPACE)
+    if (con->type == CT_WORKSPACE || con->type == CT_OUTPUT)
         return NULL;
 
     return con_inside_floating(con->parent);
@@ -366,24 +377,41 @@ Con *con_by_frame_id(xcb_window_t frame) {
 }
 
 /*
- * Returns the first container which wants to swallow this window
+ * Returns the first container below 'con' which wants to swallow this window
  * TODO: priority
  *
  */
-Con *con_for_window(i3Window *window, Match **store_match) {
-    Con *con;
+Con *con_for_window(Con *con, i3Window *window, Match **store_match) {
+    Con *child;
     Match *match;
-    DLOG("searching con for window %p\n", window);
+    DLOG("searching con for window %p starting at con %p\n", window, con);
     DLOG("class == %s\n", window->class_class);
 
-    TAILQ_FOREACH(con, &all_cons, all_cons)
-        TAILQ_FOREACH(match, &(con->swallow_head), matches) {
+    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        TAILQ_FOREACH(match, &(child->swallow_head), matches) {
             if (!match_matches_window(match, window))
                 continue;
             if (store_match != NULL)
                 *store_match = match;
-            return con;
+            return child;
         }
+        Con *result = con_for_window(child, window, store_match);
+        if (result != NULL)
+            return result;
+    }
+
+    TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
+        TAILQ_FOREACH(match, &(child->swallow_head), matches) {
+            if (!match_matches_window(match, window))
+                continue;
+            if (store_match != NULL)
+                *store_match = match;
+            return child;
+        }
+        Con *result = con_for_window(child, window, store_match);
+        if (result != NULL)
+            return result;
+    }
 
     return NULL;
 }
@@ -487,10 +515,10 @@ void con_toggle_fullscreen(Con *con) {
     unsigned int num = 0;
 
     if (con->fullscreen_mode != CF_NONE)
-        values[num++] = atoms[_NET_WM_STATE_FULLSCREEN];
+        values[num++] = A__NET_WM_STATE_FULLSCREEN;
 
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id,
-                        atoms[_NET_WM_STATE], ATOM, 32, num, values);
+                        A__NET_WM_STATE, A_ATOM, 32, num, values);
 }
 
 /*
@@ -510,6 +538,9 @@ void con_move_to_workspace(Con *con, Con *workspace) {
         con = con->parent;
     }
 
+    Con *source_output = con_get_output(con),
+        *dest_output = con_get_output(workspace);
+
     /* 1: save the container which is going to be focused after the current
      * container is moved away */
     Con *focus_next = con_next_focused(con);
@@ -518,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.
@@ -530,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;
@@ -545,8 +584,15 @@ void con_move_to_workspace(Con *con, Con *workspace) {
      * calling tree_render(), so for the "real" focus this is a no-op) */
     con_focus(con);
 
-    /* 8: keep focus on the current workspace */
-    con_focus(focus_next);
+    /* 8: when moving to a visible workspace on a different output, we keep the
+     * con focused. Otherwise, we leave the focus on the current workspace as we
+     * don’t want to focus invisible workspaces */
+    if (source_output != dest_output &&
+        workspace_is_visible(workspace)) {
+        DLOG("Moved to a different output, focusing target\n");
+    } else {
+        con_focus(focus_next);
+    }
 
     CALL(parent, on_remove_child);
 }
@@ -596,16 +642,32 @@ 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;
     }
 
-    /* try to focus the next container on the same level as this one */
-    next = TAILQ_NEXT(con, focused);
+    /* dock clients cannot be focused, so we focus the workspace instead */
+    if (con->parent->type == CT_DOCKAREA) {
+        DLOG("selecting workspace for dock client\n");
+        return con_descend_focused(output_get_content(con->parent->parent));
+    }
 
-    /* if that was not possible, go up to its parent */
-    if (next == TAILQ_END(&(parent->nodes_head)))
-        next = con->parent;
+    /* if 'con' is not the first entry in the focus stack, use the first one as
+     * it’s currently focused already */
+    Con *first = TAILQ_FIRST(&(con->parent->focus_head));
+    if (first != con) {
+        DLOG("Using first entry %p\n", first);
+        next = first;
+    } else {
+        /* try to focus the next container on the same level as this one or fall
+         * back to its parent */
+        if (!(next = TAILQ_NEXT(con, focused)))
+            next = con->parent;
+    }
 
     /* now go down the focus stack as far as
      * possible, excluding the current container */
@@ -665,6 +727,32 @@ Con *con_descend_focused(Con *con) {
     return next;
 }
 
+/*
+ * Returns the focused con inside this client, descending the tree as far as
+ * possible. This comes in handy when attaching a con to a workspace at the
+ * currently focused position, for example.
+ *
+ * Works like con_descend_focused but considers only tiling cons.
+ *
+ */
+Con *con_descend_tiling_focused(Con *con) {
+    Con *next = con;
+    Con *before;
+    Con *child;
+    do {
+        before = next;
+        TAILQ_FOREACH(child, &(next->focus_head), focused) {
+            if (child->type == CT_FLOATING_CON)
+                continue;
+
+            next = child;
+            break;
+        }
+    } while (before != next);
+    return next;
+}
+
+
 /*
  * Returns a "relative" Rect which contains the amount of pixels that need to
  * be added to the original Rect to get the final position (obviously the
@@ -694,6 +782,8 @@ Rect con_border_style_rect(Con *con) {
  * borderless and the only element in the tabbed container, the border is not
  * rendered.
  *
+ * For children of a CT_DOCKAREA, the border style is always none.
+ *
  */
 int con_border_style(Con *con) {
     Con *fs = con_get_fullscreen_con(con->parent);
@@ -708,6 +798,9 @@ int con_border_style(Con *con) {
     if (con->parent->layout == L_TABBED && con->border_style != BS_NORMAL)
         return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL);
 
+    if (con->parent->type == CT_DOCKAREA)
+        return BS_NONE;
+
     return con->border_style;
 }
 
@@ -734,7 +827,11 @@ void con_set_layout(Con *con, int layout) {
         /* 3: While the layout is irrelevant in stacked/tabbed mode, it needs
          * to be set. Otherwise, this con will not be interpreted as a split
          * container. */
-        new->orientation = HORIZ;
+        if (config.default_orientation == NO_ORIENTATION) {
+            new->orientation = (con->rect.height > con->rect.width) ? VERT : HORIZ;
+        } else {
+            new->orientation = config.default_orientation;
+        }
 
         Con *old_focused = TAILQ_FIRST(&(con->focus_head));
         if (old_focused == TAILQ_END(&(con->focus_head)))
@@ -773,8 +870,12 @@ void con_set_layout(Con *con, int layout) {
 static void con_on_remove_child(Con *con) {
     DLOG("on_remove_child\n");
 
-    /* Nothing to do for workspaces */
-    if (con->type == CT_WORKSPACE || con->type == CT_OUTPUT || con->type == CT_ROOT) {
+    /* Every container 'above' (in the hierarchy) the workspace content should
+     * not be closed when the last child was removed */
+    if (con->type == CT_WORKSPACE ||
+        con->type == CT_OUTPUT ||
+        con->type == CT_ROOT ||
+        con->type == CT_DOCKAREA) {
         DLOG("not handling, type = %d\n", con->type);
         return;
     }
@@ -784,31 +885,65 @@ 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;
     }
+}
+
+/*
+ * Determines the minimum size of the given con by looking at its children (for
+ * split/stacked/tabbed cons). Will be called when resizing floating cons
+ *
+ */
+Rect con_minimum_size(Con *con) {
+    DLOG("Determining minimum size for con %p\n", con);
+
+    if (con_is_leaf(con)) {
+        DLOG("leaf node, returning 75x50\n");
+        return (Rect){ 0, 0, 75, 50 };
+    }
 
-    /* If we did not close the container, check if we have only a single child left */
-    if (children == 1) {
+    if (con->type == CT_FLOATING_CON) {
+        DLOG("floating con\n");
         Con *child = TAILQ_FIRST(&(con->nodes_head));
-        Con *parent = con->parent;
-        DLOG("Container has only one child, replacing con %p with child %p\n", con, child);
-
-        /* TODO: refactor it into con_swap */
-        TAILQ_REPLACE(&(parent->nodes_head), con, child, nodes);
-        TAILQ_REPLACE(&(parent->focus_head), con, child, focused);
-        if (focused == con)
-            focused = child;
-        child->parent = parent;
-        child->percent = 0.0;
-        con_fix_percent(parent);
-
-        con->parent = NULL;
-        x_con_kill(con);
-        free(con->name);
-        TAILQ_REMOVE(&all_cons, con, all_cons);
-        free(con);
+        return con_minimum_size(child);
+    }
 
-        return;
+    if (con->layout == L_STACKED || con->layout == L_TABBED) {
+        uint32_t max_width = 0, max_height = 0, deco_height = 0;
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            Rect min = con_minimum_size(child);
+            deco_height += child->deco_rect.height;
+            max_width = max(max_width, min.width);
+            max_height = max(max_height, min.height);
+        }
+        DLOG("stacked/tabbed now, returning %d x %d + deco_rect = %d\n",
+             max_width, max_height, deco_height);
+        return (Rect){ 0, 0, max_width, max_height + deco_height };
     }
+
+    /* For horizontal/vertical split containers we sum up the width (h-split)
+     * or height (v-split) and use the maximum of the height (h-split) or width
+     * (v-split) as minimum size. */
+    if (con->orientation == HORIZ || con->orientation == VERT) {
+        uint32_t width = 0, height = 0;
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            Rect min = con_minimum_size(child);
+            if (con->orientation == HORIZ) {
+                width += min.width;
+                height = max(height, min.height);
+            } else {
+                height += min.height;
+                width = max(width, min.width);
+            }
+        }
+        DLOG("split container, returning width = %d x height = %d\n", width, height);
+        return (Rect){ 0, 0, width, height };
+    }
+
+    ELOG("Unhandled case, type = %d, layout = %d, orientation = %d\n",
+         con->type, con->layout, con->orientation);
+    assert(false);
 }