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

diff --git a/src/con.c b/src/con.c
index 57dda39b..45021f5f 100644
--- a/src/con.c
+++ b/src/con.c
@@ -24,6 +24,8 @@ char *colors[] = {
     "#aa00aa"
 };
 
+static void con_on_remove_child(Con *con);
+
 /*
  * Create a new container (and attach it to the given parent, if not NULL).
  * This function initializes the data structures and creates the appropriate
@@ -32,14 +34,15 @@ char *colors[] = {
  */
 Con *con_new(Con *parent) {
     Con *new = scalloc(sizeof(Con));
+    new->on_remove_child = con_on_remove_child;
     TAILQ_INSERT_TAIL(&all_cons, new, all_cons);
     new->type = CT_CON;
     new->border_style = config.default_border;
     static int cnt = 0;
-    LOG("opening window %d\n", cnt);
+    DLOG("opening window %d\n", cnt);
 
     /* TODO: remove window coloring after test-phase */
-    LOG("color %s\n", colors[cnt]);
+    DLOG("color %s\n", colors[cnt]);
     new->name = strdup(colors[cnt]);
     //uint32_t cp = get_colorpixel(colors[cnt]);
     cnt++;
@@ -56,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;
 }
@@ -120,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);
@@ -223,10 +238,32 @@ Con *con_get_workspace(Con *con) {
     Con *result = con;
     while (result != NULL && result->type != CT_WORKSPACE)
         result = result->parent;
-    assert(result != NULL);
     return result;
 }
 
+/*
+ * Searches parenst of the given 'con' until it reaches one with the specified
+ * 'orientation'. Aborts when it comes across a floating_con.
+ *
+ */
+Con *con_parent_with_orientation(Con *con, orientation_t orientation) {
+    DLOG("Searching for parent of Con %p with orientation %d\n", con, orientation);
+    Con *parent = con->parent;
+    if (parent->type == CT_FLOATING_CON)
+        return NULL;
+    while (con_orientation(parent) != orientation) {
+        DLOG("Need to go one level further up\n");
+        parent = parent->parent;
+        /* Abort when we reach a floating con */
+        if (parent && parent->type == CT_FLOATING_CON)
+            parent = NULL;
+        if (parent == NULL)
+            break;
+    }
+    DLOG("Result: %p\n", parent);
+    return parent;
+}
+
 /*
  * helper data structure for the breadth-first-search in
  * con_get_fullscreen_con()
@@ -273,6 +310,12 @@ Con *con_get_fullscreen_con(Con *con) {
             entry->con = child;
             TAILQ_INSERT_TAIL(&bfs_head, entry, entries);
         }
+
+        TAILQ_FOREACH(child, &(current->floating_head), floating_windows) {
+            entry = smalloc(sizeof(struct bfs_entry));
+            entry->con = child;
+            TAILQ_INSERT_TAIL(&bfs_head, entry, entries);
+        }
     }
 
     return NULL;
@@ -284,7 +327,7 @@ Con *con_get_fullscreen_con(Con *con) {
  */
 bool con_is_floating(Con *con) {
     assert(con != NULL);
-    LOG("checking if con %p is floating\n", con);
+    DLOG("checking if con %p is floating\n", con);
     return (con->floating >= FLOATING_AUTO_ON);
 }
 
@@ -301,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);
@@ -334,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;
-    LOG("searching con for window %p\n", window);
-    LOG("class == %s\n", window->class_class);
+    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;
 }
@@ -376,20 +436,41 @@ int con_num_children(Con *con) {
  * container.
  *
  */
-void con_fix_percent(Con *con, int action) {
+void con_fix_percent(Con *con) {
     Con *child;
     int children = con_num_children(con);
-    /* TODO: better document why this math works */
-    double fix;
-    if (action == WINDOW_ADD)
-        fix = (1.0 - (1.0 / (children+1)));
-    else
-        fix = 1.0 / (1.0 - (1.0 / (children+1)));
 
+    // calculate how much we have distributed and how many containers
+    // with a percentage set we have
+    double total = 0.0;
+    int children_with_percent = 0;
     TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
-        if (child->percent <= 0.0)
-            continue;
-        child->percent *= fix;
+        if (child->percent > 0.0) {
+            total += child->percent;
+            ++children_with_percent;
+        }
+    }
+
+    // if there were children without a percentage set, set to a value that
+    // will make those children proportional to all others
+    if (children_with_percent != children) {
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            if (child->percent <= 0.0) {
+                if (children_with_percent == 0)
+                    total += (child->percent = 1.0);
+                else total += (child->percent = total / children_with_percent);
+            }
+        }
+    }
+
+    // if we got a zero, just distribute the space equally, otherwise
+    // distribute according to the proportions we got
+    if (total == 0.0) {
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+            child->percent = 1.0 / children;
+    } else if (total != 1.0) {
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+            child->percent /= total;
     }
 }
 
@@ -400,7 +481,13 @@ void con_fix_percent(Con *con, int action) {
  */
 void con_toggle_fullscreen(Con *con) {
     Con *workspace, *fullscreen;
-    LOG("toggling fullscreen for %p / %s\n", con, con->name);
+
+    if (con->type == CT_WORKSPACE) {
+        DLOG("You cannot make a workspace fullscreen.\n");
+        return;
+    }
+
+    DLOG("toggling fullscreen for %p / %s\n", con, con->name);
     if (con->fullscreen_mode == CF_NONE) {
         /* 1: check if there already is a fullscreen con */
         workspace = con_get_workspace(con);
@@ -416,7 +503,7 @@ void con_toggle_fullscreen(Con *con) {
         /* 1: disable fullscreen */
         con->fullscreen_mode = CF_NONE;
     }
-    LOG("mode now: %d\n", con->fullscreen_mode);
+    DLOG("mode now: %d\n", con->fullscreen_mode);
 
     /* update _NET_WM_STATE if this container has a window */
     /* TODO: when a window is assigned to a container which is already
@@ -428,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);
 }
 
 /*
@@ -441,33 +528,73 @@ void con_toggle_fullscreen(Con *con) {
  *
  */
 void con_move_to_workspace(Con *con, Con *workspace) {
+    if (con->type == CT_WORKSPACE) {
+        DLOG("Moving workspaces is not yet implemented.\n");
+        return;
+    }
+
     if (con_is_floating(con)) {
         DLOG("Using FLOATINGCON instead\n");
         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);
 
-    /* 2: get the focused container of this workspace by going down as far as
-     * possible */
-    Con *next = workspace;
-
-    while (!TAILQ_EMPTY(&(next->focus_head)))
-        next = TAILQ_FIRST(&(next->focus_head));
+    /* 2: get the focused container of this 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.
+     * */
+    Con *floatingcon = con_inside_floating(next);
+    if (floatingcon != NULL) {
+        DLOG("floatingcon, going up even further\n");
+        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);
-    /* 4: re-attach the con to the parent of this focused container */
+    /* 5: re-attach the con to the parent of this focused container */
+    Con *parent = con->parent;
     con_detach(con);
     con_attach(con, next, false);
 
-    /* 5: keep focus on the current workspace */
-    con_focus(focus_next);
+    /* 6: fix the percentages */
+    con_fix_percent(parent);
+    con->percent = 0.0;
+    con_fix_percent(next);
+
+    /* 7: focus the con on the target workspace (the X focus is only updated by
+     * calling tree_render(), so for the "real" focus this is a no-op) */
+    con_focus(con);
+
+    /* 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);
 }
 
 /*
@@ -515,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 */
@@ -545,7 +688,7 @@ Con *con_get_next(Con *con, char way, orientation_t orientation) {
     /* 1: get the first parent with the same orientation */
     Con *cur = con;
     while (con_orientation(cur->parent) != orientation) {
-        LOG("need to go one level further up\n");
+        DLOG("need to go one level further up\n");
         if (cur->parent->type == CT_WORKSPACE) {
             LOG("that's a workspace, we can't go further up\n");
             return NULL;
@@ -571,6 +714,44 @@ Con *con_get_next(Con *con, char way, orientation_t orientation) {
     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.
+ *
+ */
+Con *con_descend_focused(Con *con) {
+    Con *next = con;
+    while (!TAILQ_EMPTY(&(next->focus_head)))
+        next = TAILQ_FIRST(&(next->focus_head));
+    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
@@ -601,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);
@@ -610,10 +793,13 @@ int con_border_style(Con *con) {
     }
 
     if (con->parent->layout == L_STACKED)
-        return BS_NORMAL;
+        return (con_num_children(con->parent) == 1 ? con->border_style : BS_NORMAL);
 
     if (con->parent->layout == L_TABBED && con->border_style != BS_NORMAL)
-        return con_num_children(con->parent) == 1 ? 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;
 }
@@ -641,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)))
@@ -663,8 +853,97 @@ void con_set_layout(Con *con, int layout) {
         if (old_focused)
             con_focus(old_focused);
 
+        tree_flatten(croot);
+
         return;
     }
 
     con->layout = layout;
 }
+
+/*
+ * Callback which will be called when removing a child from the given con.
+ * Kills the container if it is empty and replaces it with the child if there
+ * is exactly one child.
+ *
+ */
+static void con_on_remove_child(Con *con) {
+    DLOG("on_remove_child\n");
+
+    /* 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;
+    }
+
+    /* TODO: check if this container would swallow any other client and
+     * don’t close it automatically. */
+    int children = con_num_children(con);
+    if (children == 0) {
+        DLOG("Container empty, closing\n");
+        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 (con->type == CT_FLOATING_CON) {
+        DLOG("floating con\n");
+        Con *child = TAILQ_FIRST(&(con->nodes_head));
+        return con_minimum_size(child);
+    }
+
+    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);
+}