* Loads tree from ~/.i3/_restart.json (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)) {
}
/* 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);
* 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
+ };
}
/*
* 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. 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);
- /* 5: focus the new container */
- con_focus(new);
-
return new;
}
}
/*
- * 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;
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 {
+ xcb_void_cookie_t cookie;
/* un-parent the window */
- xcb_reparent_window(conn, con->window->id, root, 0, 0);
- /* TODO: client_unmap to set state to withdrawn */
+ 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);
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);
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);
}
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) {
- if (kill_window || !dont_kill_parent || 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 */
- con_focus(next);
+ 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");
/* check if the parent container is empty now and close it */
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");
assert(focused->type != CT_ROOT);
/* Kill con */
- tree_close(focused, true, false);
+ tree_close(focused, kill_window, false);
}
/*
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;
*
*/
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);
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;
+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->name);
+ 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)));
+ if (con->type == CT_FLOATING_CON) {
+ /* TODO: implement focus for floating windows */
+ return false;
+ }
+
+ Con *parent = con->parent;
+
+ /* 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);
}
/*
/* 4: close the redundant cons */
DLOG("closing redundant cons\n");
- tree_close(con, false, true);
+ 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,
projects / i3 / i3 / blobdiff