X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ftree.c;h=5559908f0738d20afbbed8e9b5f048a7609a4e65;hb=ed2bcc15e384be99225a247435f6cff678e64f0c;hp=8d55c14b69b105c251fd13134b878237f824854a;hpb=167bdd26b71789b9b1ad28883fbd2d3998944080;p=i3%2Fi3 diff --git a/src/tree.c b/src/tree.c index 8d55c14b..5559908f 100644 --- a/src/tree.c +++ b/src/tree.c @@ -1,7 +1,12 @@ /* * 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; @@ -10,10 +15,51 @@ struct Con *focused; 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. + * + */ +static Con *_create___i3() { + 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. */ + __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"); + + 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"); + 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) { +bool tree_restore(const char *path, xcb_get_geometry_reply_t *geometry) { char *globbed = resolve_tilde(path); if (!path_exists(globbed)) { @@ -23,7 +69,13 @@ bool tree_restore(const char *path) { } /* 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); @@ -36,6 +88,17 @@ bool tree_restore(const char *path) { Con *ws = TAILQ_FIRST(&(out->nodes_head)); printf("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; } @@ -44,18 +107,26 @@ bool tree_restore(const char *path) { * 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->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; @@ -66,16 +137,20 @@ Con *tree_open_con(Con *con) { } /* 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. create the container and attach it to its parent */ - Con *new = con_new(con); + Con *new = con_new(con, window); /* 4: re-calculate child->percent for each child */ con_fix_percent(con); @@ -98,8 +173,15 @@ static bool _is_con_mapped(Con *con) { * 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. + * */ -bool tree_close(Con *con, kill_window_t 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; @@ -122,7 +204,7 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) { for (child = TAILQ_FIRST(&(con->nodes_head)); child; ) { nextchild = TAILQ_NEXT(child, nodes); DLOG("killing child=%p\n", child); - if (!tree_close(child, kill_window, true)) + if (!tree_close(child, kill_window, true, false)) abort_kill = true; child = nextchild; } @@ -137,13 +219,23 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) { x_window_kill(con->window->id, kill_window); return false; } else { + xcb_void_cookie_t cookie; /* un-parent the window */ - xcb_reparent_window(conn, con->window->id, root, 0, 0); + 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 }; - xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id, - A_WM_STATE, A_WM_STATE, 32, 2, data); + 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); @@ -165,7 +257,7 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) { if (con_is_floating(con)) { Con *ws = con_get_workspace(con); DLOG("Container was floating, killing floating container\n"); - tree_close(parent, DONT_KILL_WINDOW, 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); @@ -194,12 +286,13 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) { 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); + if (!force_set_focus && con != focused) + DLOG("not changing focus, the container was not focused before\n"); + else con_focus(next); } } else { @@ -232,7 +325,7 @@ void tree_close_con(kill_window_t kill_window) { assert(focused->type != CT_ROOT); /* Kill con */ - tree_close(focused, kill_window, false); + tree_close(focused, kill_window, false, false); } /* @@ -249,10 +342,16 @@ void tree_split(Con *con, orientation_t orientation) { } 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) { + if (con_num_children(parent) == 1 && + parent->layout == L_DEFAULT) { parent->orientation = orientation; DLOG("Just changing orientation of existing container\n"); return; @@ -261,7 +360,7 @@ void tree_split(Con *con, orientation_t orientation) { 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; @@ -339,60 +438,142 @@ void tree_render() { 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 || - 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 */ - if (parent->type == CT_WORKSPACE) - return; - parent = parent->parent; +static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap) { + /* Stop recursing at workspaces after attempting to switch to next + * workspace if possible. */ + if (con->type == CT_WORKSPACE) { + 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); + 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); + Con *focus = con_descend_direction(workspace, direction); + if (focus) { + con_focus(focus); + x_set_warp_to(&(focus->rect)); + } + return true; } - Con *current = TAILQ_FIRST(&(parent->focus_head)); - assert(current != TAILQ_END(&(parent->focus_head))); + Con *parent = con->parent; + + 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); + } + + /* Still no next/previous container? bail out */ + if (!next) + return false; + + 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; + } + } + + /* 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)); + /* TODO: when can the following happen (except for floating windows, which + * are handled above)? */ if (TAILQ_EMPTY(&(parent->nodes_head))) { - DLOG("Nothing to focus here, move along...\n"); - return; + DLOG("nothing to focus\n"); + return false; } - /* 2: chose next (or previous) */ Con *next; - if (way == 'n') { + 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))) + else next = TAILQ_PREV(current, nodes_head, nodes); + + 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; + } + + if (way == 'n') 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); + else next = TAILQ_LAST(&(parent->nodes_head), nodes_head); } /* 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; +} + +/* + * 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); } /* @@ -463,7 +644,7 @@ void tree_flatten(Con *con) { /* 4: close the redundant cons */ DLOG("closing redundant cons\n"); - tree_close(con, DONT_KILL_WINDOW, 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,