* Loads tree from ~/.i3/_restart.json (used for in-place restarts).
*
*/
-bool tree_restore() {
- char *globbed = resolve_tilde("~/.i3/_restart.json");
+bool tree_restore(const char *path) {
+ char *globbed = resolve_tilde(path);
if (!path_exists(globbed)) {
LOG("%s does not exist, not restoring tree\n", globbed);
focused = croot;
tree_append_json(globbed);
- char *old_restart = resolve_tilde("~/.i3/_restart.json.old");
- unlink(old_restart);
- rename(globbed, old_restart);
- free(globbed);
- free(old_restart);
printf("appended tree, using new root\n");
croot = TAILQ_FIRST(&(croot->nodes_head));
printf("out = %p\n", out);
Con *ws = TAILQ_FIRST(&(out->nodes_head));
printf("ws = %p\n", ws);
- con_focus(ws);
return true;
}
/*
- * Initializes the tree by creating the root node, adding all RandR outputs
- * to the tree (that means randr_init() has to be called before) and
- * assigning a workspace to each RandR output.
+ * Initializes the tree by creating the root node. The CT_OUTPUT Cons below the
+ * root node are created in randr.c for each Output.
*
*/
void tree_init() {
- Output *output;
-
croot = con_new(NULL);
+ FREE(croot->name);
croot->name = "root";
croot->type = CT_ROOT;
-
- Con *ws;
- int c = 1;
- /* add the outputs */
- TAILQ_FOREACH(output, &outputs, outputs) {
- if (!output->active)
- continue;
-
- Con *oc = con_new(croot);
- oc->name = strdup(output->name);
- oc->type = CT_OUTPUT;
- oc->rect = output->rect;
- output->con = oc;
-
- char *name;
- asprintf(&name, "[i3 con] output %s", oc->name);
- x_set_name(oc, name);
- free(name);
-
- /* add a workspace to this output */
- ws = con_new(NULL);
- ws->type = CT_WORKSPACE;
- ws->num = c;
- asprintf(&(ws->name), "%d", c);
- c++;
- con_attach(ws, oc);
-
- asprintf(&name, "[i3 con] workspace %s", ws->name);
- x_set_name(ws, name);
- free(name);
-
- ws->fullscreen_mode = CF_OUTPUT;
- ws->orientation = HORIZ;
- }
-
- con_focus(ws);
}
/*
con = focused->parent;
/* If the parent is an output, we are on a workspace. In this case,
* the new container needs to be opened as a leaf of the workspace. */
- if (con->type == CT_OUTPUT)
+ if (con->parent->type == CT_OUTPUT && con->type != CT_DOCKAREA) {
con = focused;
+ }
+
/* If the currently focused container is a floating container, we
* attach the new container to the workspace */
if (con->type == CT_FLOATING_CON)
con = con->parent;
+ DLOG("con = %p\n", con);
}
assert(con != NULL);
- /* 3: re-calculate child->percent for each child */
- con_fix_percent(con, WINDOW_ADD);
-
- /* 4: add a new container leaf to this con */
+ /* 3. create the container and attach it to its parent */
Con *new = con_new(con);
- con_focus(new);
+
+ /* 4: re-calculate child->percent for each child */
+ con_fix_percent(con);
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) {
+static bool _is_con_mapped(Con *con) {
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);
+ if (_is_con_mapped(child))
+ return true;
+
+ return con->mapped;
}
/*
- * Closes the given container including all children
+ * Closes the given container including all children.
+ * Returns true if the container was killed or false if just WM_DELETE was sent
+ * and the window is expected to kill itself.
*
*/
-void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
+bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) {
+ bool was_mapped = con->mapped;
Con *parent = con->parent;
- /* check floating clients and adjust old_parent if necessary */
- fix_floating_parent(croot, con);
+ if (!was_mapped) {
+ /* Even if the container itself is not mapped, its children may be
+ * mapped (for example split containers don't have a mapped window on
+ * their own but usually contain mapped children). */
+ was_mapped = _is_con_mapped(con);
+ }
/* Get the container which is next focused */
Con *next = con_next_focused(con);
+ DLOG("next = %p, focused = %p\n", next, focused);
DLOG("closing %p, kill_window = %d\n", con, kill_window);
- Con *child;
+ Con *child, *nextchild;
+ bool abort_kill = false;
/* We cannot use TAILQ_FOREACH because the children get deleted
* in their parent’s nodes_head */
- while (!TAILQ_EMPTY(&(con->nodes_head))) {
- child = TAILQ_FIRST(&(con->nodes_head));
+ for (child = TAILQ_FIRST(&(con->nodes_head)); child; ) {
+ nextchild = TAILQ_NEXT(child, nodes);
DLOG("killing child=%p\n", child);
- tree_close(child, kill_window, true);
+ if (!tree_close(child, kill_window, true))
+ abort_kill = true;
+ child = nextchild;
+ }
+
+ if (abort_kill) {
+ DLOG("One of the children could not be killed immediately (WM_DELETE sent), aborting.\n");
+ return false;
}
if (con->window != NULL) {
- if (kill_window)
- x_window_kill(con->window->id);
- else {
+ if (kill_window != DONT_KILL_WINDOW) {
+ x_window_kill(con->window->id, kill_window);
+ return false;
+ } else {
/* un-parent the window */
xcb_reparent_window(conn, con->window->id, root, 0, 0);
- /* TODO: client_unmap to set state to withdrawn */
-
+ /* We are no longer handling this window, thus set WM_STATE to
+ * WM_STATE_WITHDRAWN (see ICCCM 4.1.3.1) */
+ long data[] = { XCB_ICCCM_WM_STATE_WITHDRAWN, XCB_NONE };
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id,
+ A_WM_STATE, A_WM_STATE, 32, 2, data);
}
+ FREE(con->window->class_class);
+ FREE(con->window->class_instance);
+ FREE(con->window->name_x);
+ FREE(con->window->name_json);
free(con->window);
}
x_con_kill(con);
con_detach(con);
- con_fix_percent(parent, WINDOW_REMOVE);
+ if (con->type != CT_FLOATING_CON) {
+ /* If the container is *not* floating, we might need to re-distribute
+ * percentage values for the resized containers. */
+ con_fix_percent(parent);
+ }
if (con_is_floating(con)) {
+ Con *ws = con_get_workspace(con);
DLOG("Container was floating, killing floating container\n");
- tree_close(parent, false, false);
- next = NULL;
+ tree_close(parent, DONT_KILL_WINDOW, false);
+ DLOG("parent container killed\n");
+ if (con == focused) {
+ DLOG("This is the focused container, i need to find another one to focus. I start looking at ws = %p\n", ws);
+ /* go down the focus stack as far as possible */
+ next = con_descend_focused(ws);
+
+ dont_kill_parent = true;
+ DLOG("Alright, focusing %p\n", next);
+ } else {
+ next = NULL;
+ }
}
free(con->name);
+ FREE(con->deco_render_params);
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;
+ if (!next) {
+ DLOG("No next container, i will just exit now\n");
+ return true;
+ }
- DLOG("focusing %p / %s\n", next, next->name);
- /* TODO: check if the container (or one of its children) was focused */
- con_focus(next);
+ if (was_mapped || con == focused) {
+ if ((kill_window != DONT_KILL_WINDOW) || !dont_kill_parent || con == focused) {
+ DLOG("focusing %p / %s\n", next, next->name);
+ /* TODO: check if the container (or one of its children) was focused */
+ if (next->type == CT_DOCKAREA) {
+ /* Instead of focusing the dockarea, we need to restore focus to the workspace */
+ con_focus(con_descend_focused(output_get_content(next->parent)));
+ } else {
+ con_focus(next);
+ }
+ }
+ else {
+ DLOG("not focusing because we're not killing anybody");
+ }
+ } else {
+ DLOG("not focusing, was not mapped\n");
+ }
/* check if the parent container is empty now and close it */
- if (!dont_kill_parent &&
- 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, false);
- }
+ if (!dont_kill_parent)
+ CALL(parent, on_remove_child);
+
+ return true;
}
/*
* Closes the current container using tree_close().
*
*/
-void tree_close_con() {
+void tree_close_con(kill_window_t kill_window) {
assert(focused != NULL);
if (focused->type == CT_WORKSPACE) {
LOG("Cannot close workspace\n");
return;
}
+ /* There *should* be no possibility to focus outputs / root container */
+ assert(focused->type != CT_OUTPUT);
+ assert(focused->type != CT_ROOT);
+
/* Kill con */
- tree_close(focused, true, false);
+ tree_close(focused, kill_window, false);
}
/*
new->parent = parent;
new->orientation = orientation;
- /* 3: add it as a child to the new Con */
- con_attach(con, new);
+ /* 3: swap 'percent' (resize factor) */
+ new->percent = con->percent;
+ con->percent = 0.0;
+
+ /* 4: add it as a child to the new Con */
+ con_attach(con, new, false);
}
/*
*
*/
void level_up() {
+ /* We cannot go up when we are in fullscreen mode at the moment, that would
+ * be totally not intuitive */
+ if (focused->fullscreen_mode != CF_NONE) {
+ LOG("Currently in fullscreen, not going up\n");
+ return;
+ }
/* We can focus up to the workspace, but not any higher in the tree */
- if (focused->parent->type != CT_CON &&
- focused->parent->type != CT_WORKSPACE) {
- printf("cannot go up\n");
+ if ((focused->parent->type != CT_CON &&
+ focused->parent->type != CT_WORKSPACE) ||
+ focused->type == CT_WORKSPACE) {
+ LOG("Cannot go up any further\n");
return;
}
con_focus(focused->parent);
static void mark_unmapped(Con *con) {
Con *current;
- DLOG("marking container %p unmapped\n", con);
con->mapped = false;
TAILQ_FOREACH(current, &(con->nodes_head), nodes)
mark_unmapped(current);
if (con->type == CT_WORKSPACE) {
- TAILQ_FOREACH(current, &(con->floating_head), floating_windows) {
- DLOG("Marking unmapped for floating %p\n", current);
- current->mapped = false;
- Con *child = TAILQ_FIRST(&(current->nodes_head));
- DLOG(" unmapping floating child %p\n", child);
- child->mapped = false;
- }
+ /* We need to call mark_unmapped on floating nodes aswell since we can
+ * make containers floating. */
+ TAILQ_FOREACH(current, &(con->floating_head), floating_windows)
+ mark_unmapped(current);
}
- DLOG("mark_unmapped done\n");
}
/*
if (croot == NULL)
return;
- printf("-- BEGIN RENDERING --\n");
+ DLOG("-- BEGIN RENDERING --\n");
/* Reset map state for all nodes in tree */
/* TODO: a nicer method to walk all nodes would be good, maybe? */
mark_unmapped(croot);
/* We start rendering at an output */
Con *output;
TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- printf("output %p / %s\n", output, output->name);
+ DLOG("output %p / %s\n", output, output->name);
render_con(output, false);
}
x_push_changes(croot);
- printf("-- END RENDERING --\n");
+ DLOG("-- END RENDERING --\n");
}
/*
/* 1: get the first parent with the same orientation */
Con *parent = focused->parent;
while (focused->type != CT_WORKSPACE &&
- con_orientation(parent) != orientation) {
+ (con_orientation(parent) != orientation ||
+ con_num_children(parent) == 1)) {
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 */
Con *current = TAILQ_FIRST(&(parent->focus_head));
assert(current != TAILQ_END(&(parent->focus_head)));
+ if (TAILQ_EMPTY(&(parent->nodes_head))) {
+ DLOG("Nothing to focus here, move along...\n");
+ return;
+ }
+
/* 2: chose next (or previous) */
Con *next;
if (way == 'n') {
/* 3: focus choice comes in here. at the moment we will go down
* until we find a window */
/* TODO: check for window, atm we only go down as far as possible */
- while (!TAILQ_EMPTY(&(next->focus_head)))
- next = TAILQ_FIRST(&(next->focus_head));
-
- DLOG("focusing %p\n", next);
- con_focus(next);
+ con_focus(con_descend_focused(next));
}
/*
- * Moves the current container in the given way (next/previous) and given
- * orientation (horizontal/vertical).
+ * tree_flatten() removes pairs of redundant split containers, e.g.:
+ * [workspace, horizontal]
+ * [v-split] [child3]
+ * [h-split]
+ * [child1] [child2]
+ * In this example, the v-split and h-split container are redundant.
+ * Such a situation can be created by moving containers in a direction which is
+ * not the orientation of their parent container. i3 needs to create a new
+ * split container then and if you move containers this way multiple times,
+ * redundant chains of split-containers can be the result.
*
*/
-void tree_move(char way, orientation_t orientation) {
- /* 1: get the first parent with the same orientation */
- Con *parent = focused->parent;
- Con *old_parent = parent;
- if (focused->type == CT_WORKSPACE)
- return;
- bool level_changed = false;
- 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->type == CT_WORKSPACE)
- return;
- parent = parent->parent;
- level_changed = true;
+void tree_flatten(Con *con) {
+ Con *current, *child, *parent = con->parent;
+ DLOG("Checking if I can flatten con = %p / %s\n", con, con->name);
+
+ /* We only consider normal containers without windows */
+ if (con->type != CT_CON || con->window != NULL)
+ goto recurse;
+
+ /* Ensure it got only one child */
+ child = TAILQ_FIRST(&(con->nodes_head));
+ if (child == NULL || TAILQ_NEXT(child, nodes) != NULL)
+ goto recurse;
+
+ /* The child must have a different orientation than the con but the same as
+ * the con’s parent to be redundant */
+ if (con->orientation == NO_ORIENTATION ||
+ child->orientation == NO_ORIENTATION ||
+ con->orientation == child->orientation ||
+ child->orientation != parent->orientation)
+ goto recurse;
+
+ DLOG("Alright, I have to flatten this situation now. Stay calm.\n");
+ /* 1: save focus */
+ Con *focus_next = TAILQ_FIRST(&(child->focus_head));
+
+ DLOG("detaching...\n");
+ /* 2: re-attach the children to the parent before con */
+ while (!TAILQ_EMPTY(&(child->nodes_head))) {
+ current = TAILQ_FIRST(&(child->nodes_head));
+ DLOG("detaching current=%p / %s\n", current, current->name);
+ con_detach(current);
+ DLOG("re-attaching\n");
+ /* We don’t use con_attach() here because for a CT_CON, the special
+ * case handling of con_attach() does not trigger. So all it would do
+ * is calling TAILQ_INSERT_AFTER, but with the wrong container. So we
+ * directly use the TAILQ macros. */
+ current->parent = parent;
+ TAILQ_INSERT_BEFORE(con, current, nodes);
+ DLOG("attaching to focus list\n");
+ TAILQ_INSERT_TAIL(&(parent->focus_head), current, focused);
+ current->percent = con->percent;
+ }
+ DLOG("re-attached all\n");
+
+ /* 3: restore focus, if con was focused */
+ if (focus_next != NULL &&
+ TAILQ_FIRST(&(parent->focus_head)) == con) {
+ DLOG("restoring focus to focus_next=%p\n", focus_next);
+ TAILQ_REMOVE(&(parent->focus_head), focus_next, focused);
+ TAILQ_INSERT_HEAD(&(parent->focus_head), focus_next, focused);
+ DLOG("restored focus.\n");
}
- Con *current = TAILQ_FIRST(&(parent->focus_head));
- assert(current != TAILQ_END(&(parent->focus_head)));
-
- /* 2: chose next (or previous) */
- Con *next = current;
- if (way == 'n') {
- LOG("i would insert it after %p / %s\n", next, next->name);
- if (!level_changed) {
- next = TAILQ_NEXT(next, nodes);
- if (next == TAILQ_END(&(next->parent->nodes_head))) {
- 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);
- focused->parent = next->parent;
-
- TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, focused, nodes);
- TAILQ_INSERT_HEAD(&(next->parent->focus_head), focused, 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;
-
- /* 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? */
+ /* 4: close the redundant cons */
+ DLOG("closing redundant cons\n");
+ tree_close(con, DONT_KILL_WINDOW, true);
+
+ /* Well, we got to abort the recursion here because we destroyed the
+ * container. However, if tree_flatten() is called sufficiently often,
+ * there can’t be the situation of having two pairs of redundant containers
+ * at once. Therefore, we can safely abort the recursion on this level
+ * after flattening. */
+ return;
+
+recurse:
+ /* We cannot use normal foreach here because tree_flatten might close the
+ * current container. */
+ current = TAILQ_FIRST(&(con->nodes_head));
+ while (current != NULL) {
+ Con *next = TAILQ_NEXT(current, nodes);
+ tree_flatten(current);
+ current = next;
}
- if (con_num_children(old_parent) == 0) {
- DLOG("Old container empty after moving. Let's close it\n");
- tree_close(old_parent, false, false);
+ current = TAILQ_FIRST(&(con->floating_head));
+ while (current != NULL) {
+ Con *next = TAILQ_NEXT(current, floating_windows);
+ tree_flatten(current);
+ current = next;
}
}
projects / i3 / i3 / blobdiff