"#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->name = strdup("");
+ 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++;
TAILQ_INIT(&(new->swallow_head));
if (parent != NULL)
- con_attach(new, parent);
+ con_attach(new, parent, false);
return new;
}
* a container or when inserting a new container at a specific place in the
* tree.
*
+ * ignore_focus is to just insert the Con at the end (useful when creating a
+ * new split container *around* some containers, that is, detaching and
+ * attaching them in order without wanting to mess with the focus in between).
+ *
*/
-void con_attach(Con *con, Con *parent) {
+void con_attach(Con *con, Con *parent, bool ignore_focus) {
con->parent = parent;
- Con *current = TAILQ_FIRST(&(parent->focus_head));
+ Con *loop;
+ Con *current = NULL;
+ struct nodes_head *nodes_head = &(parent->nodes_head);
+
+ /* Workspaces are handled differently: they need to be inserted at the
+ * right position. */
+ if (con->type == CT_WORKSPACE) {
+ DLOG("it's a workspace. num = %d\n", con->num);
+ if (con->num == -1 || TAILQ_EMPTY(nodes_head)) {
+ TAILQ_INSERT_TAIL(nodes_head, con, nodes);
+ } else {
+ current = TAILQ_FIRST(nodes_head);
+ if (con->num < current->num) {
+ /* we need to insert the container at the beginning */
+ TAILQ_INSERT_HEAD(nodes_head, con, nodes);
+ } else {
+ while (current->num != -1 && con->num > current->num) {
+ current = TAILQ_NEXT(current, nodes);
+ if (current == TAILQ_END(nodes_head)) {
+ current = NULL;
+ break;
+ }
+ }
+ /* we need to insert con after current, if current is not NULL */
+ if (current)
+ TAILQ_INSERT_BEFORE(current, con, nodes);
+ else TAILQ_INSERT_TAIL(nodes_head, con, nodes);
+ }
+ }
+ goto add_to_focus_head;
+ }
+
+ if (con->type == CT_FLOATING_CON) {
+ DLOG("Inserting into floating containers\n");
+ TAILQ_INSERT_TAIL(&(parent->floating_head), con, floating_windows);
+ } else {
+ if (!ignore_focus) {
+ /* Get the first tiling container in focus stack */
+ TAILQ_FOREACH(loop, &(parent->focus_head), focused) {
+ if (loop->type == CT_FLOATING_CON)
+ continue;
+ current = loop;
+ break;
+ }
+ }
- if (current == TAILQ_END(&(parent->focus_head)))
- TAILQ_INSERT_TAIL(&(parent->nodes_head), con, nodes);
- else {
- DLOG("inserting after\n");
- TAILQ_INSERT_AFTER(&(parent->nodes_head), current, con, nodes);
+ /* Insert the container after the tiling container, if found */
+ if (current) {
+ DLOG("Inserting con = %p after last focused tiling con %p\n",
+ con, current);
+ TAILQ_INSERT_AFTER(nodes_head, current, con, nodes);
+ } else TAILQ_INSERT_TAIL(nodes_head, con, nodes);
}
+
+add_to_focus_head:
/* We insert to the TAIL because con_focus() will correct this.
* This way, we have the option to insert Cons without having
* to focus them. */
*/
void con_focus(Con *con) {
assert(con != NULL);
+ DLOG("con_focus = %p\n", con);
/* 1: set focused-pointer to the new con */
/* 2: exchange the position of the container in focus stack of the parent all the way up */
con->urgent = false;
workspace_update_urgent_flag(con_get_workspace(con));
}
+ DLOG("con_focus done = %p\n", 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()
Con *con_get_fullscreen_con(Con *con) {
Con *current, *child;
- LOG("looking for fullscreen node\n");
/* TODO: is breadth-first-search really appropriate? (check as soon as
* fullscreen levels and fullscreen for containers is implemented) */
TAILQ_HEAD(bfs_head, bfs_entry) bfs_head = TAILQ_HEAD_INITIALIZER(bfs_head);
while (!TAILQ_EMPTY(&bfs_head)) {
entry = TAILQ_FIRST(&bfs_head);
current = entry->con;
- LOG("checking %p\n", current);
if (current != con && current->fullscreen_mode != CF_NONE) {
/* empty the queue */
while (!TAILQ_EMPTY(&bfs_head)) {
return current;
}
- LOG("deleting from queue\n");
TAILQ_REMOVE(&bfs_head, entry, entries);
free(entry);
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;
*/
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);
}
+/*
+ * Checks if the given container is either floating or inside some floating
+ * container. It returns the FLOATING_CON container.
+ *
+ */
+Con *con_inside_floating(Con *con) {
+ assert(con != NULL);
+ if (con->type == CT_FLOATING_CON)
+ return con;
+
+ if (con->floating >= FLOATING_AUTO_ON)
+ return con->parent;
+
+ if (con->type == CT_WORKSPACE)
+ return NULL;
+
+ return con_inside_floating(con->parent);
+}
+
/*
* Returns the container with the given client window ID or NULL if no such
* container exists.
Con *con_for_window(i3Window *window, Match **store_match) {
Con *con;
Match *match;
- LOG("searching con for window %p\n", window);
- LOG("class == %s\n", window->class_class);
+ DLOG("searching con for window %p\n", window);
+ DLOG("class == %s\n", window->class_class);
TAILQ_FOREACH(con, &all_cons, all_cons)
TAILQ_FOREACH(match, &(con->swallow_head), matches) {
* 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;
- 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);
LOG("Not entering fullscreen mode, container (%p/%s) "
"already is in fullscreen mode\n",
fullscreen, fullscreen->name);
- return;
+ } else {
+ /* 2: enable fullscreen */
+ con->fullscreen_mode = CF_OUTPUT;
}
-
- /* 2: enable fullscreen */
- con->fullscreen_mode = CF_OUTPUT;
} else {
/* 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
*
*/
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;
+ }
+
/* 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)
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;
+ }
+
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);
+ con_attach(con, next, false);
+
+ /* 6: fix the percentages */
+ con_fix_percent(parent);
+ con->percent = 0.0;
+ con_fix_percent(next);
- /* 5: keep focus on the current workspace */
+ /* 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;
}
+/*
+ * Get the next/previous container in the specified orientation. This may
+ * travel up until it finds a container with suitable orientation.
+ *
+ */
+Con *con_get_next(Con *con, char way, orientation_t orientation) {
+ DLOG("con_get_next(way=%c, orientation=%d)\n", way, orientation);
+ /* 1: get the first parent with the same orientation */
+ Con *cur = con;
+ while (con_orientation(cur->parent) != orientation) {
+ 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;
+ }
+ cur = cur->parent;
+ }
+
+ /* 2: chose next (or previous) */
+ Con *next;
+ if (way == 'n') {
+ next = TAILQ_NEXT(cur, nodes);
+ /* if we are at the end of the list, we need to wrap */
+ if (next == TAILQ_END(&(parent->nodes_head)))
+ return NULL;
+ } else {
+ next = TAILQ_PREV(cur, nodes_head, nodes);
+ /* if we are at the end of the list, we need to wrap */
+ if (next == TAILQ_END(&(cur->nodes_head)))
+ return NULL;
+ }
+ DLOG("next = %p\n", next);
+
+ 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
* be added to the original Rect to get the final position (obviously the
* 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 (fs == con) {
+ DLOG("this one is fullscreen! overriding BS_NONE\n");
+ return BS_NONE;
+ }
+
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);
+
+ if (con->parent->type == CT_DOCKAREA)
+ return BS_NONE;
return con->border_style;
}
+
+/*
+ * This function changes the layout of a given container. Use it to handle
+ * special cases like changing a whole workspace to stacked/tabbed (creates a
+ * new split container before).
+ *
+ */
+void con_set_layout(Con *con, int layout) {
+ /* When the container type is CT_WORKSPACE, the user wants to change the
+ * whole workspace into stacked/tabbed mode. To do this and still allow
+ * intuitive operations (like level-up and then opening a new window), we
+ * need to create a new split container. */
+ if (con->type == CT_WORKSPACE) {
+ DLOG("Creating new split container\n");
+ /* 1: create a new split container */
+ Con *new = con_new(NULL);
+ new->parent = con;
+
+ /* 2: set the requested layout on the split con */
+ new->layout = 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;
+
+ Con *old_focused = TAILQ_FIRST(&(con->focus_head));
+ if (old_focused == TAILQ_END(&(con->focus_head)))
+ old_focused = NULL;
+
+ /* 4: move the existing cons of this workspace below the new con */
+ DLOG("Moving cons\n");
+ Con *child;
+ while (!TAILQ_EMPTY(&(con->nodes_head))) {
+ child = TAILQ_FIRST(&(con->nodes_head));
+ con_detach(child);
+ con_attach(child, new, true);
+ }
+
+ /* 4: attach the new split container to the workspace */
+ DLOG("Attaching new split to ws\n");
+ con_attach(new, con, false);
+
+ 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, false, false);
+ return;
+ }
+}
projects / i3 / i3 / blobdiff