* 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, 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() {
+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
+ };
}
/*
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);
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->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);
}
/*
projects / i3 / i3 / blobdiff