+#undef I3__FILE__
+#define I3__FILE__ "tree.c"
/*
* vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * tree.c: Everything that primarily modifies the layout tree data structure.
+ *
*/
-
#include "all.h"
struct Con *croot;
struct all_cons_head all_cons = TAILQ_HEAD_INITIALIZER(all_cons);
/*
- * Loads tree from ~/.i3/_restart.json (used for in-place restarts).
+ * Create the pseudo-output __i3. Output-independent workspaces such as
+ * __i3_scratch will live there.
*
*/
-bool tree_restore(const char *path) {
+static Con *_create___i3(void) {
+ Con *__i3 = con_new(croot, NULL);
+ FREE(__i3->name);
+ __i3->name = sstrdup("__i3");
+ __i3->type = CT_OUTPUT;
+ __i3->layout = L_OUTPUT;
+ con_fix_percent(croot);
+ x_set_name(__i3, "[i3 con] pseudo-output __i3");
+ /* For retaining the correct position/size of a scratchpad window, the
+ * dimensions of the real outputs should be multiples of the __i3
+ * pseudo-output. Ensuring that is the job of scratchpad_fix_resolution()
+ * which gets called after this function and after detecting all the
+ * outputs (or whenever an output changes). */
+ __i3->rect.width = 1280;
+ __i3->rect.height = 1024;
+
+ /* Add a content container. */
+ DLOG("adding main content container\n");
+ Con *content = con_new(NULL, NULL);
+ content->type = CT_CON;
+ FREE(content->name);
+ content->name = sstrdup("content");
+ content->layout = L_SPLITH;
+
+ x_set_name(content, "[i3 con] content __i3");
+ con_attach(content, __i3, false);
+
+ /* Attach the __i3_scratch workspace. */
+ Con *ws = con_new(NULL, NULL);
+ ws->type = CT_WORKSPACE;
+ ws->num = -1;
+ ws->name = sstrdup("__i3_scratch");
+ ws->layout = L_SPLITH;
+ con_attach(ws, content, false);
+ x_set_name(ws, "[i3 con] workspace __i3_scratch");
+ ws->fullscreen_mode = CF_OUTPUT;
+
+ return __i3;
+}
+
+/*
+ * Loads tree from 'path' (used for in-place restarts).
+ *
+ */
+bool tree_restore(const char *path, xcb_get_geometry_reply_t *geometry) {
char *globbed = resolve_tilde(path);
if (!path_exists(globbed)) {
}
/* TODO: refactor the following */
- croot = con_new(NULL);
+ croot = con_new(NULL, NULL);
+ croot->rect = (Rect) {
+ geometry->x,
+ geometry->y,
+ geometry->width,
+ geometry->height};
focused = croot;
- tree_append_json(globbed);
+ tree_append_json(focused, globbed, NULL);
- printf("appended tree, using new root\n");
+ DLOG("appended tree, using new root\n");
croot = TAILQ_FIRST(&(croot->nodes_head));
- printf("new root = %p\n", croot);
+ DLOG("new root = %p\n", croot);
Con *out = TAILQ_FIRST(&(croot->nodes_head));
- printf("out = %p\n", out);
+ DLOG("out = %p\n", out);
Con *ws = TAILQ_FIRST(&(out->nodes_head));
- printf("ws = %p\n", ws);
+ DLOG("ws = %p\n", ws);
+
+ /* For in-place restarting into v4.2, we need to make sure the new
+ * pseudo-output __i3 is present. */
+ if (strcmp(out->name, "__i3") != 0) {
+ DLOG("Adding pseudo-output __i3 during inplace restart\n");
+ Con *__i3 = _create___i3();
+ /* Ensure that it is the first output, other places in the code make
+ * that assumption. */
+ TAILQ_REMOVE(&(croot->nodes_head), __i3, nodes);
+ TAILQ_INSERT_HEAD(&(croot->nodes_head), __i3, nodes);
+ }
return true;
}
* root node are created in randr.c for each Output.
*
*/
-void tree_init() {
- croot = con_new(NULL);
+void tree_init(xcb_get_geometry_reply_t *geometry) {
+ croot = con_new(NULL, NULL);
FREE(croot->name);
croot->name = "root";
croot->type = CT_ROOT;
+ croot->layout = L_SPLITH;
+ croot->rect = (Rect) {
+ geometry->x,
+ geometry->y,
+ geometry->width,
+ geometry->height};
+
+ _create___i3();
}
/*
* Opens an empty container in the current container
*
*/
-Con *tree_open_con(Con *con) {
+Con *tree_open_con(Con *con, i3Window *window) {
if (con == NULL) {
/* every focusable Con has a parent (outputs have parent root) */
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;
+ * attach the new container to the currently focused spot in its
+ * workspace. */
+ if (con->type == CT_FLOATING_CON) {
+ con = con_descend_tiling_focused(con->parent);
+ if (con->type != CT_WORKSPACE)
+ 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);
+ /* 3. create the container and attach it to its parent */
+ Con *new = con_new(con, window);
+ new->layout = L_SPLITH;
- /* 4: add a new container leaf to this con */
- 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) {
- 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);
-}
-
static bool _is_con_mapped(Con *con) {
Con *child;
- TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+ TAILQ_FOREACH (child, &(con->nodes_head), nodes)
if (_is_con_mapped(child))
return true;
}
/*
- * 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.
+ *
+ * The dont_kill_parent flag is specified when the function calls itself
+ * recursively while deleting a containers children.
+ *
+ * The force_set_focus flag is specified in the case of killing a floating
+ * window: tree_close() will be invoked for the CT_FLOATINGCON (the parent
+ * container) and focus should be set there.
*
*/
-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 force_set_focus) {
bool was_mapped = con->mapped;
Con *parent = con->parent;
was_mapped = _is_con_mapped(con);
}
- /* check floating clients and adjust old_parent if necessary */
- fix_floating_parent(croot, con);
+ /* remove the urgency hint of the workspace (if set) */
+ if (con->urgent) {
+ con->urgent = false;
+ con_update_parents_urgency(con);
+ workspace_update_urgent_flag(con_get_workspace(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, false))
+ abort_kill = true;
+ child = nextchild;
}
- if (con->window != NULL) {
- if (kill_window)
- x_window_kill(con->window->id);
- else {
- /* un-parent the window */
- xcb_reparent_window(conn, con->window->id, root, 0, 0);
- /* TODO: client_unmap to set state to withdrawn */
+ 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 != DONT_KILL_WINDOW) {
+ x_window_kill(con->window->id, kill_window);
+ return false;
+ } else {
+ xcb_void_cookie_t cookie;
+ /* Ignore any further events by clearing the event mask,
+ * unmap the window,
+ * then reparent it to the root window. */
+ xcb_change_window_attributes(conn, con->window->id,
+ XCB_CW_EVENT_MASK, (uint32_t[]) {XCB_NONE});
+ xcb_unmap_window(conn, con->window->id);
+ cookie = xcb_reparent_window(conn, con->window->id, root, 0, 0);
+
+ /* Ignore X11 errors for the ReparentWindow request.
+ * X11 Errors are returned when the window was already destroyed */
+ add_ignore_event(cookie.sequence, 0);
+
+ /* 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};
+ cookie = xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ con->window->id, A_WM_STATE, A_WM_STATE, 32, 2, data);
+
+ /* Ignore X11 errors for the ReparentWindow request.
+ * X11 Errors are returned when the window was already destroyed */
+ add_ignore_event(cookie.sequence, 0);
}
FREE(con->window->class_class);
FREE(con->window->class_instance);
- FREE(con->window->name_x);
- FREE(con->window->name_json);
- free(con->window);
+ i3string_free(con->window->name);
+ FREE(con->window->ran_assignments);
+ FREE(con->window);
}
- /* kill the X11 part of this container */
- x_con_kill(con);
+ Con *ws = con_get_workspace(con);
+
+ /* Figure out which container to focus next before detaching 'con'. */
+ if (con_is_floating(con)) {
+ 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);
+ next = con_next_focused(parent);
+ dont_kill_parent = true;
+ DLOG("Alright, focusing %p\n", next);
+ } else {
+ next = NULL;
+ }
+ }
+
+ /* Detach the container so that it will not be rendered anymore. */
con_detach(con);
+
+ /* disable urgency timer, if needed */
+ if (con->urgency_timer != NULL) {
+ DLOG("Removing urgency timer of con %p\n", con);
+ workspace_update_urgent_flag(ws);
+ ev_timer_stop(main_loop, con->urgency_timer);
+ FREE(con->urgency_timer);
+ }
+
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, WINDOW_REMOVE);
+ con_fix_percent(parent);
}
+ /* Render the tree so that the surrounding containers take up the space
+ * which 'con' does no longer occupy. If we don’t render here, there will
+ * be a gap in our containers and that could trigger an EnterNotify for an
+ * underlying container, see ticket #660.
+ *
+ * Rendering has to be avoided when dont_kill_parent is set (when
+ * tree_close calls itself recursively) because the tree is in a
+ * non-renderable state during that time. */
+ if (!dont_kill_parent)
+ tree_render();
+
+ /* kill the X11 part of this container */
+ x_con_kill(con);
+
if (con_is_floating(con)) {
- Con *ws = con_get_workspace(con);
DLOG("Container was floating, killing floating container\n");
- tree_close(parent, false, false);
+ tree_close(parent, DONT_KILL_WINDOW, false, (con == focused));
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);
- next = con_next_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);
* when closing the parent, so we can exit now. */
if (!next) {
DLOG("No next container, i will just exit now\n");
- return;
+ return true;
}
if (was_mapped || con == focused) {
- DLOG("focusing %p / %s\n", next, next->name);
- /* TODO: check if the container (or one of its children) was focused */
- con_focus(next);
+ if ((kill_window != DONT_KILL_WINDOW) || !dont_kill_parent || con == focused) {
+ DLOG("focusing %p / %s\n", next, next->name);
+ 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 {
+ if (!force_set_focus && con != focused)
+ DLOG("not changing focus, the container was not focused before\n");
+ else
+ con_focus(next);
+ }
+ } else {
+ DLOG("not focusing because we're not killing anybody\n");
+ }
} 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);
+ if (focused->type == CT_WORKSPACE) {
+ DLOG("Workspaces cannot be close, closing all children instead\n");
+ Con *child, *nextchild;
+ for (child = TAILQ_FIRST(&(focused->focus_head)); child;) {
+ nextchild = TAILQ_NEXT(child, focused);
+ DLOG("killing child=%p\n", child);
+ tree_close(child, kill_window, false, false);
+ child = nextchild;
+ }
+
+ return;
+ }
+
/* Kill con */
- tree_close(focused, true, false);
+ tree_close(focused, kill_window, false, false);
}
/*
*
*/
void tree_split(Con *con, orientation_t orientation) {
- /* for a workspace, we just need to change orientation */
- if (con->type == CT_WORKSPACE) {
- DLOG("Workspace, simply changing orientation to %d\n", orientation);
- con->orientation = orientation;
+ if (con_is_floating(con)) {
+ DLOG("Floating containers can't be split.\n");
return;
}
+ if (con->type == CT_WORKSPACE) {
+ if (con_num_children(con) < 2) {
+ DLOG("Just changing orientation of workspace\n");
+ con->layout = (orientation == HORIZ) ? L_SPLITH : L_SPLITV;
+ return;
+ } else {
+ /* if there is more than one container on the workspace
+ * move them into a new container and handle this instead */
+ con = workspace_encapsulate(con);
+ }
+ }
+
Con *parent = con->parent;
+
+ /* Force re-rendering to make the indicator border visible. */
+ FREE(con->deco_render_params);
+ FREE(parent->deco_render_params);
+
/* if we are in a container whose parent contains only one
* child (its split functionality is unused so far), we just change the
* orientation (more intuitive than splitting again) */
- if (con_num_children(parent) == 1) {
- parent->orientation = orientation;
+ if (con_num_children(parent) == 1 &&
+ (parent->layout == L_SPLITH ||
+ parent->layout == L_SPLITV)) {
+ parent->layout = (orientation == HORIZ) ? L_SPLITH : L_SPLITV;
DLOG("Just changing orientation of existing container\n");
return;
}
DLOG("Splitting in orientation %d\n", orientation);
/* 2: replace it with a new Con */
- Con *new = con_new(NULL);
+ Con *new = con_new(NULL, NULL);
TAILQ_REPLACE(&(parent->nodes_head), con, new, nodes);
TAILQ_REPLACE(&(parent->focus_head), con, new, focused);
new->parent = parent;
- new->orientation = orientation;
+ new->layout = (orientation == HORIZ) ? L_SPLITH : L_SPLITV;
/* 3: swap 'percent' (resize factor) */
new->percent = con->percent;
}
/*
- * Moves focus one level up.
+ * Moves focus one level up. Returns true if focus changed.
*
*/
-void level_up() {
+bool level_up(void) {
+ /* Skip over floating containers and go directly to the grandparent
+ * (which should always be a workspace) */
+ if (focused->parent->type == CT_FLOATING_CON) {
+ con_focus(focused->parent->parent);
+ return true;
+ }
+
/* 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");
- return;
+ if ((focused->parent->type != CT_CON &&
+ focused->parent->type != CT_WORKSPACE) ||
+ focused->type == CT_WORKSPACE) {
+ ELOG("'focus parent': Focus is already on the workspace, cannot go higher than that.\n");
+ return false;
}
con_focus(focused->parent);
+ return true;
}
/*
- * Moves focus one level down.
+ * Moves focus one level down. Returns true if focus changed.
*
*/
-void level_down() {
+bool level_down(void) {
/* Go down the focus stack of the current node */
Con *next = TAILQ_FIRST(&(focused->focus_head));
if (next == TAILQ_END(&(focused->focus_head))) {
- printf("cannot go down\n");
- return;
+ DLOG("cannot go down\n");
+ return false;
+ } else if (next->type == CT_FLOATING_CON) {
+ /* Floating cons shouldn't be directly focused; try immediately
+ * going to the grandchild of the focused con. */
+ Con *child = TAILQ_FIRST(&(next->focus_head));
+ if (child == TAILQ_END(&(next->focus_head))) {
+ DLOG("cannot go down\n");
+ return false;
+ } else
+ next = TAILQ_FIRST(&(next->focus_head));
}
+
con_focus(next);
+ return true;
}
static void mark_unmapped(Con *con) {
Con *current;
con->mapped = false;
- TAILQ_FOREACH(current, &(con->nodes_head), nodes)
+ TAILQ_FOREACH (current, &(con->nodes_head), nodes)
mark_unmapped(current);
if (con->type == CT_WORKSPACE) {
- TAILQ_FOREACH(current, &(con->floating_head), floating_windows) {
- current->mapped = false;
- Con *child = TAILQ_FIRST(&(current->nodes_head));
- 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);
}
}
* pushing the changes to X11 using x_push_changes().
*
*/
-void tree_render() {
+void tree_render(void) {
if (croot == NULL)
return;
mark_unmapped(croot);
croot->mapped = true;
- /* We start rendering at an output */
- Con *output;
- TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
- DLOG("output %p / %s\n", output, output->name);
- render_con(output, false);
- }
+ render_con(croot, false);
+
x_push_changes(croot);
DLOG("-- END RENDERING --\n");
}
/*
- * Changes focus in the given way (next/previous) and given orientation
- * (horizontal/vertical).
+ * Recursive function to walk the tree until a con can be found to focus.
*
*/
-void tree_next(char way, orientation_t orientation) {
- /* 1: get the first parent with the same orientation */
- Con *parent = focused->parent;
- 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->type == CT_WORKSPACE)
- return;
- parent = parent->parent;
- }
- Con *current = TAILQ_FIRST(&(parent->focus_head));
- assert(current != TAILQ_END(&(parent->focus_head)));
+static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap) {
+ /* When dealing with fullscreen containers, it's necessary to go up to the
+ * workspace level, because 'focus $dir' will start at the con's real
+ * position in the tree, and it may not be possible to get to the edge
+ * normally due to fullscreen focusing restrictions. */
+ if (con->fullscreen_mode == CF_OUTPUT && con->type != CT_WORKSPACE)
+ con = con_get_workspace(con);
+
+ /* Stop recursing at workspaces after attempting to switch to next
+ * workspace if possible. */
+ if (con->type == CT_WORKSPACE) {
+ if (con_get_fullscreen_con(con, CF_GLOBAL)) {
+ DLOG("Cannot change workspace while in global fullscreen mode.\n");
+ return false;
+ }
+ Output *current_output = get_output_containing(con->rect.x, con->rect.y);
+ Output *next_output;
+
+ if (!current_output)
+ return false;
+ DLOG("Current output is %s\n", current_output->name);
+
+ /* Try to find next output */
+ direction_t direction;
+ if (way == 'n' && orientation == HORIZ)
+ direction = D_RIGHT;
+ else if (way == 'p' && orientation == HORIZ)
+ direction = D_LEFT;
+ else if (way == 'n' && orientation == VERT)
+ direction = D_DOWN;
+ else if (way == 'p' && orientation == VERT)
+ direction = D_UP;
+ else
+ return false;
+
+ next_output = get_output_next(direction, current_output, CLOSEST_OUTPUT);
+ if (!next_output)
+ return false;
+ DLOG("Next output is %s\n", next_output->name);
+
+ /* Find visible workspace on next output */
+ Con *workspace = NULL;
+ GREP_FIRST(workspace, output_get_content(next_output->con), workspace_is_visible(child));
+
+ /* Show next workspace and focus appropriate container if possible. */
+ if (!workspace)
+ return false;
+
+ workspace_show(workspace);
+
+ /* If a workspace has an active fullscreen container, one of its
+ * children should always be focused. The above workspace_show()
+ * should be adequate for that, so return. */
+ if (con_get_fullscreen_con(workspace, CF_OUTPUT))
+ return true;
- /* 2: chose next (or previous) */
- Con *next;
- if (way == 'n') {
- next = TAILQ_NEXT(current, nodes);
- /* if we are at the end of the list, we need to wrap */
- if (next == TAILQ_END(&(parent->nodes_head)))
- next = TAILQ_FIRST(&(parent->nodes_head));
- } else {
- next = TAILQ_PREV(current, nodes_head, nodes);
- /* if we are at the end of the list, we need to wrap */
- if (next == TAILQ_END(&(parent->nodes_head)))
- next = TAILQ_LAST(&(parent->nodes_head), nodes_head);
+ Con *focus = con_descend_direction(workspace, direction);
+ if (focus) {
+ con_focus(focus);
+ x_set_warp_to(&(focus->rect));
+ }
+ return true;
}
- /* 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 *parent = con->parent;
-/*
- * 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;
- Con *old_parent = parent;
- if (focused->type == CT_WORKSPACE)
- return;
- bool level_changed = false;
- while (con_orientation(parent) != orientation) {
- DLOG("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. In this case, we split the
- * workspace to have the same look & feel as in older i3 releases. */
- if (parent->type == CT_WORKSPACE) {
- DLOG("Arrived at workspace, splitting...\n");
- /* 1: create a new split container */
- Con *new = con_new(NULL);
- new->parent = parent;
-
- /* 2: copy layout and orientation from workspace */
- new->layout = parent->layout;
- new->orientation = parent->orientation;
-
- Con *old_focused = TAILQ_FIRST(&(parent->focus_head));
- if (old_focused == TAILQ_END(&(parent->focus_head)))
- old_focused = NULL;
-
- /* 3: move the existing cons of this workspace below the new con */
- DLOG("Moving cons\n");
- Con *child;
- while (!TAILQ_EMPTY(&(parent->nodes_head))) {
- child = TAILQ_FIRST(&(parent->nodes_head));
- con_detach(child);
- con_attach(child, new, true);
+ if (con->type == CT_FLOATING_CON) {
+ /* left/right focuses the previous/next floating container */
+ if (orientation == HORIZ) {
+ Con *next;
+ if (way == 'n')
+ next = TAILQ_NEXT(con, floating_windows);
+ else
+ next = TAILQ_PREV(con, floating_head, floating_windows);
+
+ /* If there is no next/previous container, wrap */
+ if (!next) {
+ if (way == 'n')
+ next = TAILQ_FIRST(&(parent->floating_head));
+ else
+ next = TAILQ_LAST(&(parent->floating_head), floating_head);
}
- /* 4: switch workspace orientation */
- parent->orientation = orientation;
-
- /* 4: attach the new split container to the workspace */
- DLOG("Attaching new split to ws\n");
- con_attach(new, parent, false);
-
- if (old_focused)
- con_focus(old_focused);
+ /* Still no next/previous container? bail out */
+ if (!next)
+ return false;
- level_changed = true;
-
- break;
+ con_focus(con_descend_focused(next));
+ return true;
+ } else {
+ /* up/down cycles through the Z-index */
+ /* TODO: implement cycling through the z-index */
+ return false;
}
- parent = parent->parent;
- level_changed = true;
}
+
+ /* If the orientation does not match or there is no other con to focus, we
+ * need to go higher in the hierarchy */
+ if (con_orientation(parent) != orientation ||
+ con_num_children(parent) == 1)
+ return _tree_next(parent, way, orientation, wrap);
+
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);
-
- /* Have a look at the next container: If there is no next container or
- * if it is a leaf node, we move the focused one left to it. However,
- * for split containers, we descend into it. */
- next = TAILQ_NEXT(next, nodes);
- if (next == TAILQ_END(&(next->parent->nodes_head))) {
- if (focused == current)
- return;
- next = current;
- } else {
- if (level_changed && con_is_leaf(next)) {
- next = current;
- } else {
- /* if this is a split container, we need to go down */
- while (!TAILQ_EMPTY(&(next->focus_head)))
- next = TAILQ_FIRST(&(next->focus_head));
- }
- }
+ /* TODO: when can the following happen (except for floating windows, which
+ * are handled above)? */
+ if (TAILQ_EMPTY(&(parent->nodes_head))) {
+ DLOG("nothing to focus\n");
+ return false;
+ }
- con_detach(focused);
- focused->parent = next->parent;
+ Con *next;
+ if (way == 'n')
+ next = TAILQ_NEXT(current, nodes);
+ else
+ next = TAILQ_PREV(current, nodes_head, nodes);
- 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;
- next = TAILQ_PREV(next, nodes_head, nodes);
- if (next == TAILQ_END(&(next->parent->nodes_head))) {
- if (focused == current)
- return;
- next = current;
- } else {
- if (level_changed && con_is_leaf(next)) {
- next = current;
- } else {
- /* 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));
- }
- }
+ if (!next) {
+ if (!config.force_focus_wrapping) {
+ /* If there is no next/previous container, we check if we can focus one
+ * when going higher (without wrapping, though). If so, we are done, if
+ * not, we wrap */
+ if (_tree_next(parent, way, orientation, false))
+ return true;
+
+ if (!wrap)
+ return false;
}
- 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? */
+ if (way == 'n')
+ next = TAILQ_FIRST(&(parent->nodes_head));
+ else
+ next = TAILQ_LAST(&(parent->nodes_head), nodes_head);
}
- /* We need to call con_focus() to fix the focus stack "above" the container
- * we just inserted the focused container into (otherwise, the parent
- * container(s) would still point to the old container(s)). */
- con_focus(focused);
+ /* Don't violate fullscreen focus restrictions. */
+ if (!con_fullscreen_permits_focusing(next))
+ return false;
- if (con_num_children(old_parent) == 0) {
- DLOG("Old container empty after moving. Let's close it\n");
- tree_close(old_parent, false, false);
- }
+ /* 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 */
+ con_focus(con_descend_focused(next));
+ return true;
+}
- tree_flatten(croot);
+/*
+ * Changes focus in the given way (next/previous) and given orientation
+ * (horizontal/vertical).
+ *
+ */
+void tree_next(char way, orientation_t orientation) {
+ _tree_next(focused, way, orientation, true);
}
/*
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)
+ if (con->type != CT_CON ||
+ parent->layout == L_OUTPUT || /* con == "content" */
+ con->window != NULL)
goto recurse;
/* Ensure it got only one child */
child = TAILQ_FIRST(&(con->nodes_head));
- if (TAILQ_NEXT(child, nodes) != NULL)
+ if (child == NULL || TAILQ_NEXT(child, nodes) != NULL)
goto recurse;
+ DLOG("child = %p, con = %p, parent = %p\n", child, con, parent);
+
/* 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)
+ if (!con_is_split(con) ||
+ !con_is_split(child) ||
+ (con->layout != L_SPLITH && con->layout != L_SPLITV) ||
+ (child->layout != L_SPLITH && child->layout != L_SPLITV) ||
+ con_orientation(con) == con_orientation(child) ||
+ con_orientation(child) != con_orientation(parent))
goto recurse;
DLOG("Alright, I have to flatten this situation now. Stay calm.\n");
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");
/* 4: close the redundant cons */
DLOG("closing redundant cons\n");
- tree_close(con, false, true);
+ tree_close(con, DONT_KILL_WINDOW, true, false);
/* Well, we got to abort the recursion here because we destroyed the
* container. However, if tree_flatten() is called sufficiently often,
projects / i3 / i3 / blobdiff