* X11 IDs using x_con_init().
*
*/
-Con *con_new(Con *parent) {
+Con *con_new(Con *parent, i3Window *window) {
Con *new = scalloc(sizeof(Con));
new->on_remove_child = con_on_remove_child;
TAILQ_INSERT_TAIL(&all_cons, new, all_cons);
new->type = CT_CON;
+ new->window = window;
new->border_style = config.default_border;
static int cnt = 0;
DLOG("opening window %d\n", cnt);
Con *loop;
Con *current = NULL;
struct nodes_head *nodes_head = &(parent->nodes_head);
+ struct focus_head *focus_head = &(parent->focus_head);
/* Workspaces are handled differently: they need to be inserted at the
* right position. */
}
}
+ /* When the container is not a split container (but contains a window)
+ * and is attached to a workspace, we check if the user configured a
+ * workspace_layout. This is done in workspace_attach_to, which will
+ * provide us with the container to which we should attach (either the
+ * workspace or a new split container with the configured
+ * workspace_layout).
+ */
+ if (con->window != NULL && parent->type == CT_WORKSPACE) {
+ DLOG("Parent is a workspace. Applying default layout...\n");
+ Con *target = workspace_attach_to(parent);
+
+ /* Attach the original con to this new split con instead */
+ nodes_head = &(target->nodes_head);
+ focus_head = &(target->focus_head);
+ con->parent = target;
+ current = NULL;
+
+ DLOG("done\n");
+ }
+
/* Insert the container after the tiling container, if found.
* When adding to a CT_OUTPUT, just append one after another. */
if (current && parent->type != CT_OUTPUT) {
/* We insert to the TAIL because con_focus() will correct this.
* This way, we have the option to insert Cons without having
* to focus them. */
- TAILQ_INSERT_TAIL(&(parent->focus_head), con, focused);
+ TAILQ_INSERT_TAIL(focus_head, con, focused);
}
/*
* Returns the first fullscreen node below this node.
*
*/
-Con *con_get_fullscreen_con(Con *con) {
+Con *con_get_fullscreen_con(Con *con, int fullscreen_mode) {
Con *current, *child;
/* TODO: is breadth-first-search really appropriate? (check as soon as
while (!TAILQ_EMPTY(&bfs_head)) {
entry = TAILQ_FIRST(&bfs_head);
current = entry->con;
- if (current != con && current->fullscreen_mode != CF_NONE) {
+ if (current != con && current->fullscreen_mode == fullscreen_mode) {
/* empty the queue */
while (!TAILQ_EMPTY(&bfs_head)) {
entry = TAILQ_FIRST(&bfs_head);
* entered when there already is a fullscreen container on this workspace.
*
*/
-void con_toggle_fullscreen(Con *con) {
+void con_toggle_fullscreen(Con *con, int fullscreen_mode) {
Con *workspace, *fullscreen;
if (con->type == CT_WORKSPACE) {
DLOG("toggling fullscreen for %p / %s\n", con, con->name);
if (con->fullscreen_mode == CF_NONE) {
/* 1: check if there already is a fullscreen con */
- workspace = con_get_workspace(con);
- if ((fullscreen = con_get_fullscreen_con(workspace)) != NULL) {
+ if (fullscreen_mode == CF_GLOBAL)
+ fullscreen = con_get_fullscreen_con(croot, CF_GLOBAL);
+ else {
+ workspace = con_get_workspace(con);
+ fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
+ }
+ if (fullscreen != NULL) {
LOG("Not entering fullscreen mode, container (%p/%s) "
"already is in fullscreen mode\n",
fullscreen, fullscreen->name);
- } else {
- /* 2: enable fullscreen */
- con->fullscreen_mode = CF_OUTPUT;
+ goto update_netwm_state;
}
+
+ /* 2: enable fullscreen */
+ con->fullscreen_mode = fullscreen_mode;
} else {
/* 1: disable fullscreen */
con->fullscreen_mode = CF_NONE;
}
+
+update_netwm_state:
DLOG("mode now: %d\n", con->fullscreen_mode);
/* update _NET_WM_STATE if this container has a window */
unsigned int num = 0;
if (con->fullscreen_mode != CF_NONE)
- values[num++] = atoms[_NET_WM_STATE_FULLSCREEN];
+ values[num++] = A__NET_WM_STATE_FULLSCREEN;
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id,
- atoms[_NET_WM_STATE], ATOM, 32, num, values);
+ A__NET_WM_STATE, A_ATOM, 32, num, values);
}
/*
con = con->parent;
}
+ Con *source_output = con_get_output(con),
+ *dest_output = con_get_output(workspace);
+
/* 1: save the container which is going to be focused after the current
* container is moved away */
Con *focus_next = con_next_focused(con);
Con *next = con_descend_focused(workspace);
/* 3: we go up one level, but only when next is a normal container */
- if (next->type != CT_WORKSPACE)
+ if (next->type != CT_WORKSPACE) {
+ DLOG("next originally = %p / %s / type %d\n", next, next->name, next->type);
next = next->parent;
+ }
/* 4: if the target container is floating, we get the workspace instead.
* Only tiling windows need to get inserted next to the current container.
next = floatingcon->parent;
}
+ if (con->type == CT_FLOATING_CON) {
+ Con *ws = con_get_workspace(next);
+ DLOG("This is a floating window, using workspace %p / %s\n", ws, ws->name);
+ next = ws;
+ }
+
DLOG("Re-attaching container to %p / %s\n", next, next->name);
/* 5: re-attach the con to the parent of this focused container */
Con *parent = con->parent;
* calling tree_render(), so for the "real" focus this is a no-op) */
con_focus(con);
- /* 8: keep focus on the current workspace */
- con_focus(focus_next);
+ /* 8: when moving to a visible workspace on a different output, we keep the
+ * con focused. Otherwise, we leave the focus on the current workspace as we
+ * don’t want to focus invisible workspaces */
+ if (source_output != dest_output &&
+ workspace_is_visible(workspace)) {
+ DLOG("Moved to a different output, focusing target\n");
+ } else {
+ con_focus(focus_next);
+ }
CALL(parent, on_remove_child);
}
DLOG("Focus list empty, returning ws\n");
next = ws;
}
+ } else {
+ /* Instead of returning the next CT_FLOATING_CON, we descend it to
+ * get an actual window to focus. */
+ next = con_descend_focused(next);
}
return next;
}
return con_descend_focused(output_get_content(con->parent->parent));
}
- /* try to focus the next container on the same level as this one */
- next = TAILQ_NEXT(con, focused);
-
- /* if that was not possible, go up to its parent */
- if (next == TAILQ_END(&(parent->nodes_head)))
- next = con->parent;
+ /* if 'con' is not the first entry in the focus stack, use the first one as
+ * it’s currently focused already */
+ Con *first = TAILQ_FIRST(&(con->parent->focus_head));
+ if (first != con) {
+ DLOG("Using first entry %p\n", first);
+ next = first;
+ } else {
+ /* try to focus the next container on the same level as this one or fall
+ * back to its parent */
+ if (!(next = TAILQ_NEXT(con, focused)))
+ next = con->parent;
+ }
/* now go down the focus stack as far as
* possible, excluding the current container */
return next;
}
+/*
+ * Returns the focused con inside this client, descending the tree as far as
+ * possible. This comes in handy when attaching a con to a workspace at the
+ * currently focused position, for example.
+ *
+ * Works like con_descend_focused but considers only tiling cons.
+ *
+ */
+Con *con_descend_tiling_focused(Con *con) {
+ Con *next = con;
+ Con *before;
+ Con *child;
+ do {
+ before = next;
+ TAILQ_FOREACH(child, &(next->focus_head), focused) {
+ if (child->type == CT_FLOATING_CON)
+ continue;
+
+ next = child;
+ break;
+ }
+ } while (before != next);
+ return next;
+}
+
+
/*
* Returns a "relative" Rect which contains the amount of pixels that need to
* be added to the original Rect to get the final position (obviously the
*
*/
int con_border_style(Con *con) {
- Con *fs = con_get_fullscreen_con(con->parent);
+ Con *fs = con_get_fullscreen_con(con->parent, CF_OUTPUT);
if (fs == con) {
DLOG("this one is fullscreen! overriding BS_NONE\n");
return BS_NONE;
if (con->type == CT_WORKSPACE) {
DLOG("Creating new split container\n");
/* 1: create a new split container */
- Con *new = con_new(NULL);
+ Con *new = con_new(NULL, NULL);
new->parent = con;
/* 2: set the requested layout on the split con */
/* 3: While the layout is irrelevant in stacked/tabbed mode, it needs
* to be set. Otherwise, this con will not be interpreted as a split
* container. */
- new->orientation = HORIZ;
+ if (config.default_orientation == NO_ORIENTATION) {
+ new->orientation = (con->rect.height > con->rect.width) ? VERT : HORIZ;
+ } else {
+ new->orientation = config.default_orientation;
+ }
Con *old_focused = TAILQ_FIRST(&(con->focus_head));
if (old_focused == TAILQ_END(&(con->focus_head)))
int children = con_num_children(con);
if (children == 0) {
DLOG("Container empty, closing\n");
- tree_close(con, false, false);
+ tree_close(con, DONT_KILL_WINDOW, false);
return;
}
}
projects / i3 / i3 / blobdiff