struct all_cons_head all_cons = TAILQ_HEAD_INITIALIZER(all_cons);
/*
- * Loads tree from ~/.i3/_restart.json
+ * Loads tree from ~/.i3/_restart.json (used for in-place restarts).
*
*/
bool tree_restore() {
croot->type = CT_ROOT;
Con *ws;
+ int c = 1;
/* add the outputs */
TAILQ_FOREACH(output, &outputs, outputs) {
if (!output->active)
/* add a workspace to this output */
ws = con_new(oc);
- ws->name = strdup("1");
+ ws->type = CT_WORKSPACE;
+ asprintf(&(ws->name), "%d", c);
+ c++;
ws->fullscreen_mode = CF_OUTPUT;
+ ws->orientation = HORIZ;
}
con_focus(ws);
return new;
}
+/*
+ * vanishing is the container that is about to be closed (so any floating
+ * client which has old_parent == vanishing needs to be "re-parented").
+ *
+ */
+static void fix_floating_parent(Con *con, Con *vanishing) {
+ Con *child;
+
+ if (con->old_parent == vanishing) {
+ LOG("Fixing vanishing old_parent (%p) of container %p to be %p\n",
+ vanishing, con, vanishing->parent);
+ con->old_parent = vanishing->parent;
+ }
+
+ TAILQ_FOREACH(child, &(con->floating_head), floating_windows)
+ fix_floating_parent(child, vanishing);
+
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+ fix_floating_parent(child, vanishing);
+}
+
/*
* Closes the given container including all children
*
*/
void tree_close(Con *con, bool kill_window) {
- /* TODO: check floating clients and adjust old_parent if necessary */
+ Con *parent = con->parent;
+
+ /* check floating clients and adjust old_parent if necessary */
+ fix_floating_parent(croot, con);
/* Get the container which is next focused */
- Con *next;
- if (con->type == CT_FLOATING_CON) {
- next = TAILQ_NEXT(con, floating_windows);
- if (next == TAILQ_END(&(con->parent->floating_head)))
- next = con->parent;
- } else {
- next = TAILQ_NEXT(con, focused);
- if (next == TAILQ_END(&(con->parent->nodes_head)))
- next = con->parent;
- }
+ Con *next = con_next_focused(con);
- LOG("closing %p\n", con);
+ DLOG("closing %p, kill_window = %d\n", con, kill_window);
Con *child;
/* We cannot use TAILQ_FOREACH because the children get deleted
* in their parent’s nodes_head */
x_con_kill(con);
con_detach(con);
- con_fix_percent(con->parent, WINDOW_REMOVE);
+ con_fix_percent(parent, WINDOW_REMOVE);
+
+ if (con_is_floating(con)) {
+ DLOG("Container was floating, killing floating container\n");
+
+ TAILQ_REMOVE(&(parent->parent->floating_head), parent, floating_windows);
+ TAILQ_REMOVE(&(parent->parent->focus_head), parent, focused);
+ tree_close(parent, false);
+ next = NULL;
+ }
free(con->name);
TAILQ_REMOVE(&all_cons, con, all_cons);
free(con);
+ /* in the case of floating windows, we already focused another container
+ * when closing the parent, so we can exit now. */
+ if (!next)
+ return;
+
+ DLOG("focusing %p / %s\n", next, next->name);
/* TODO: check if the container (or one of its children) was focused */
con_focus(next);
+
+ /* check if the parent container is empty now and close it */
+ if (parent->type != CT_WORKSPACE &&
+ TAILQ_EMPTY(&(parent->nodes_head))) {
+ DLOG("Closing empty parent container\n");
+ /* TODO: check if this container would swallow any other client and
+ * don’t close it automatically. */
+ tree_close(parent, false);
+ }
}
+/*
+ * Closes the current container using tree_close().
+ *
+ */
void tree_close_con() {
assert(focused != NULL);
- if (focused->parent->type == CT_OUTPUT) {
+ if (focused->type == CT_WORKSPACE) {
LOG("Cannot close workspace\n");
return;
}
*/
void tree_split(Con *con, orientation_t orientation) {
/* for a workspace, we just need to change orientation */
- if (con->parent->type == CT_OUTPUT) {
+ if (con->type == CT_WORKSPACE) {
+ DLOG("Workspace, simply changing orientation to %d\n", orientation);
con->orientation = orientation;
return;
}
+
+ Con *parent = con->parent;
+ /* if we are in a container whose parent contains only one
+ * child and has the same orientation like we are trying to
+ * set, this operation is a no-op to not confuse the user */
+ if (con_orientation(parent) == orientation &&
+ TAILQ_NEXT(con, nodes) == TAILQ_END(&(parent->nodes_head))) {
+ DLOG("Not splitting the same way again\n");
+ return;
+ }
+
+ DLOG("Splitting in orientation %d\n", orientation);
+
/* 2: replace it with a new Con */
Con *new = con_new(NULL);
- Con *parent = con->parent;
TAILQ_REPLACE(&(parent->nodes_head), con, new, nodes);
TAILQ_REPLACE(&(parent->focus_head), con, new, focused);
new->parent = parent;
con_attach(con, new);
}
+/*
+ * Moves focus one level up.
+ *
+ */
void level_up() {
/* We can focus up to the workspace, but not any higher in the tree */
- if (focused->parent->type != CT_CON) {
+ if (focused->parent->type != CT_CON &&
+ focused->parent->type != CT_WORKSPACE) {
printf("cannot go up\n");
return;
}
con_focus(focused->parent);
}
+/*
+ * Moves focus one level down.
+ *
+ */
void level_down() {
/* Go down the focus stack of the current node */
Con *next = TAILQ_FIRST(&(focused->focus_head));
mark_unmapped(current);
}
+/*
+ * Renders the tree, that is rendering all outputs using render_con() and
+ * pushing the changes to X11 using x_push_changes().
+ *
+ */
void tree_render() {
if (croot == NULL)
return;
printf("-- END RENDERING --\n");
}
+/*
+ * Changes focus in the given way (next/previous) and given orientation
+ * (horizontal/vertical).
+ *
+ */
void tree_next(char way, orientation_t orientation) {
/* 1: get the first parent with the same orientation */
Con *parent = focused->parent;
- while (parent->orientation != orientation) {
+ while (focused->type != CT_WORKSPACE &&
+ con_orientation(parent) != orientation) {
LOG("need to go one level further up\n");
/* if the current parent is an output, we are at a workspace
* and the orientation still does not match */
- if (parent->parent->type == CT_OUTPUT)
+ if (parent->type == CT_WORKSPACE)
return;
parent = parent->parent;
}
while (!TAILQ_EMPTY(&(next->focus_head)))
next = TAILQ_FIRST(&(next->focus_head));
+ DLOG("focusing %p\n", next);
con_focus(next);
}
+/*
+ * Moves the current container in the given way (next/previous) and given
+ * orientation (horizontal/vertical).
+ *
+ */
void tree_move(char way, orientation_t orientation) {
/* 1: get the first parent with the same orientation */
Con *parent = focused->parent;
- if (parent->type == CT_OUTPUT)
+ Con *old_parent = parent;
+ if (focused->type == CT_WORKSPACE)
return;
bool level_changed = false;
- while (parent->orientation != orientation) {
+ while (con_orientation(parent) != orientation) {
LOG("need to go one level further up\n");
/* if the current parent is an output, we are at a workspace
* and the orientation still does not match */
- if (parent->parent->type == CT_OUTPUT)
+ if (parent->type == CT_WORKSPACE)
return;
parent = parent->parent;
level_changed = true;
LOG("cannot move further to the right\n");
return;
}
+
+ /* if this is a split container, we need to go down */
+ while (!TAILQ_EMPTY(&(next->focus_head)))
+ next = TAILQ_FIRST(&(next->focus_head));
}
con_detach(focused);
/* TODO: don’t influence focus handling? */
} else {
LOG("i would insert it before %p / %s\n", current, current->name);
+ bool gone_down = false;
if (!level_changed) {
next = TAILQ_PREV(next, nodes_head, nodes);
if (next == TAILQ_END(&(next->parent->nodes_head))) {
LOG("cannot move further\n");
return;
}
+
+ /* if this is a split container, we need to go down */
+ while (!TAILQ_EMPTY(&(next->focus_head))) {
+ gone_down = true;
+ next = TAILQ_FIRST(&(next->focus_head));
+ }
}
con_detach(focused);
focused->parent = next->parent;
- TAILQ_INSERT_BEFORE(next, focused, nodes);
+ /* After going down in the tree, we insert the container *after*
+ * the currently focused one even though the command used "before".
+ * This is to keep the user experience clear, since the before/after
+ * only signifies the direction of the movement on top-level */
+ if (gone_down)
+ TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, focused, nodes);
+ else TAILQ_INSERT_BEFORE(next, focused, nodes);
TAILQ_INSERT_HEAD(&(next->parent->focus_head), focused, focused);
/* TODO: don’t influence focus handling? */
}
+
+ if (con_num_children(old_parent) == 0) {
+ DLOG("Old container empty after moving. Let's close it\n");
+ tree_close(old_parent, false);
+ }
}
projects / i3 / i3 / blobdiff