"#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
*/
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;
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()
* 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;
}
}
*/
void con_toggle_fullscreen(Con *con) {
Con *workspace, *fullscreen;
+
+ 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 */
*
*/
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;
* 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)
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;
con_detach(con);
con_attach(con, next, false);
- /* 6: keep focus on the current workspace */
+ /* 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: keep focus on the current workspace */
con_focus(focus_next);
+
+ CALL(parent, on_remove_child);
}
/*
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 a "relative" Rect which contains the amount of pixels that need to
* 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);
}
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;
}
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, false, false);
+ return;
+ }
+}
projects / i3 / i3 / blobdiff