-#undef I3__FILE__
-#define I3__FILE__ "con.c"
/*
* vim:ts=4:sw=4:expandtab
*
*
*/
#include "all.h"
+
#include "yajl_utils.h"
static void con_on_remove_child(Con *con);
void con_force_split_parents_redraw(Con *con) {
Con *parent = con;
- while (parent && parent->type != CT_WORKSPACE && parent->type != CT_DOCKAREA) {
- if (!con_is_leaf(parent))
+ while (parent != NULL && parent->type != CT_WORKSPACE && parent->type != CT_DOCKAREA) {
+ if (!con_is_leaf(parent)) {
FREE(parent->deco_render_params);
+ }
+
parent = parent->parent;
}
}
new->depth = window->depth;
new->window->aspect_ratio = 0.0;
} else {
- new->depth = XCB_COPY_FROM_PARENT;
+ new->depth = root_depth;
}
DLOG("opening window\n");
*/
Con *con_new(Con *parent, i3Window *window) {
Con *new = con_new_skeleton(parent, window);
- x_con_init(new, new->depth);
+ x_con_init(new);
return new;
}
+/*
+ * Frees the specified container.
+ *
+ */
+void con_free(Con *con) {
+ free(con->name);
+ FREE(con->deco_render_params);
+ TAILQ_REMOVE(&all_cons, con, all_cons);
+ while (!TAILQ_EMPTY(&(con->swallow_head))) {
+ Match *match = TAILQ_FIRST(&(con->swallow_head));
+ TAILQ_REMOVE(&(con->swallow_head), match, matches);
+ match_free(match);
+ free(match);
+ }
+ while (!TAILQ_EMPTY(&(con->marks_head))) {
+ mark_t *mark = TAILQ_FIRST(&(con->marks_head));
+ TAILQ_REMOVE(&(con->marks_head), mark, marks);
+ FREE(mark->name);
+ FREE(mark);
+ }
+ free(con);
+ DLOG("con %p freed\n", con);
+}
+
static void _con_attach(Con *con, Con *parent, Con *previous, bool ignore_focus) {
con->parent = parent;
Con *loop;
/* 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) {
+ if (current != NULL && parent->type != CT_OUTPUT) {
DLOG("Inserting con = %p after con %p\n", con, current);
TAILQ_INSERT_AFTER(nodes_head, current, con, nodes);
} else
}
}
+/*
+ * Raise container to the top if it is floating or inside some floating
+ * container.
+ *
+ */
+static void con_raise(Con *con) {
+ Con *floating = con_inside_floating(con);
+ if (floating) {
+ floating_raise_con(floating);
+ }
+}
+
+/*
+ * Sets input focus to the given container and raises it to the top.
+ *
+ */
+void con_activate(Con *con) {
+ con_focus(con);
+ con_raise(con);
+}
+
+/*
+ * Closes the given container.
+ *
+ */
+void con_close(Con *con, kill_window_t kill_window) {
+ assert(con != NULL);
+ DLOG("Closing con = %p.\n", con);
+
+ /* We never close output or root containers. */
+ if (con->type == CT_OUTPUT || con->type == CT_ROOT) {
+ DLOG("con = %p is of type %d, not closing anything.\n", con, con->type);
+ return;
+ }
+
+ if (con->type == CT_WORKSPACE) {
+ DLOG("con = %p is a workspace, closing all children instead.\n", con);
+ Con *child, *nextchild;
+ for (child = TAILQ_FIRST(&(con->focus_head)); child;) {
+ nextchild = TAILQ_NEXT(child, focused);
+ DLOG("killing child = %p.\n", child);
+ tree_close_internal(child, kill_window, false, false);
+ child = nextchild;
+ }
+
+ return;
+ }
+
+ tree_close_internal(con, kill_window, false, false);
+}
+
/*
* Returns true when this node is a leaf node (has no children)
*
}
/*
- * Searches parenst of the given 'con' until it reaches one with the specified
+ * Searches parents of the given 'con' until it reaches one with the specified
* 'orientation'. Aborts when it comes across a floating_con.
*
*/
struct bfs_entry {
Con *con;
- TAILQ_ENTRY(bfs_entry) entries;
+ TAILQ_ENTRY(bfs_entry)
+ entries;
};
/*
/* TODO: is breadth-first-search really appropriate? (check as soon as
* fullscreen levels and fullscreen for containers is implemented) */
- TAILQ_HEAD(bfs_head, bfs_entry) bfs_head = TAILQ_HEAD_INITIALIZER(bfs_head);
+ TAILQ_HEAD(bfs_head, bfs_entry)
+ bfs_head = TAILQ_HEAD_INITIALIZER(bfs_head);
+
struct bfs_entry *entry = smalloc(sizeof(struct bfs_entry));
entry->con = con;
TAILQ_INSERT_TAIL(&bfs_head, entry, entries);
return (con->floating >= FLOATING_AUTO_ON);
}
+/*
+ * Returns true if the container is a docked container.
+ *
+ */
+bool con_is_docked(Con *con) {
+ if (con->parent == NULL)
+ return false;
+
+ if (con->parent->type == CT_DOCKAREA)
+ return true;
+
+ return con_is_docked(con->parent);
+}
+
/*
* Checks if the given container is either floating or inside some floating
* container. It returns the FLOATING_CON container.
return con_inside_focused(con->parent);
}
+/*
+ * Checks if the container has the given parent as an actual parent.
+ *
+ */
+bool con_has_parent(Con *con, Con *parent) {
+ Con *current = con->parent;
+ if (current == NULL) {
+ return false;
+ }
+
+ if (current == parent) {
+ return true;
+ }
+
+ return con_has_parent(current, parent);
+}
+
/*
* Returns the container with the given client window ID or NULL if no such
* container exists.
return NULL;
}
+/*
+ * Returns the container with the given container ID or NULL if no such
+ * container exists.
+ *
+ */
+Con *con_by_con_id(long target) {
+ Con *con;
+ TAILQ_FOREACH(con, &all_cons, all_cons) {
+ if (con == (Con *)target) {
+ return con;
+ }
+ }
+
+ return NULL;
+}
+
+/*
+ * Returns true if the given container (still) exists.
+ * This can be used, e.g., to make sure a container hasn't been closed in the meantime.
+ *
+ */
+bool con_exists(Con *con) {
+ return con_by_con_id((long)con) != NULL;
+}
+
/*
* Returns the container with the given frame ID or NULL if no such container
* exists.
Con *con_by_frame_id(xcb_window_t frame) {
Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons)
- if (con->frame == frame)
+ if (con->frame.id == frame)
return con;
return NULL;
}
DLOG("Removing all existing marks on con = %p.\n", con);
mark_t *current;
- TAILQ_FOREACH(current, &(con->marks_head), marks) {
+ while (!TAILQ_EMPTY(&(con->marks_head))) {
+ current = TAILQ_FIRST(&(con->marks_head));
con_unmark(con, current->name);
}
}
mark_t *new = scalloc(1, sizeof(mark_t));
new->name = sstrdup(mark);
TAILQ_INSERT_TAIL(&(con->marks_head), new, marks);
+ ipc_send_window_event("mark", con);
con->mark_changed = true;
}
FREE(mark->name);
TAILQ_REMOVE(&(current->marks_head), mark, marks);
FREE(mark);
+
+ ipc_send_window_event("mark", current);
}
current->mark_changed = true;
FREE(mark->name);
TAILQ_REMOVE(&(current->marks_head), mark, marks);
FREE(mark);
+
+ ipc_send_window_event("mark", current);
break;
}
}
return NULL;
}
+static int num_focus_heads(Con *con) {
+ int focus_heads = 0;
+
+ Con *current;
+ TAILQ_FOREACH(current, &(con->focus_head), focused) {
+ focus_heads++;
+ }
+
+ return focus_heads;
+}
+
+/*
+ * Iterate over the container's focus stack and return an array with the
+ * containers inside it, ordered from higher focus order to lowest.
+ *
+ */
+Con **get_focus_order(Con *con) {
+ const int focus_heads = num_focus_heads(con);
+ Con **focus_order = smalloc(focus_heads * sizeof(Con *));
+ Con *current;
+ int idx = 0;
+ TAILQ_FOREACH(current, &(con->focus_head), focused) {
+ assert(idx < focus_heads);
+ focus_order[idx++] = current;
+ }
+
+ return focus_order;
+}
+
+/*
+ * Clear the container's focus stack and re-add it using the provided container
+ * array. The function doesn't check if the provided array contains the same
+ * containers with the previous focus stack but will not add floating containers
+ * in the new focus stack if container is not a workspace.
+ *
+ */
+void set_focus_order(Con *con, Con **focus_order) {
+ int focus_heads = 0;
+ while (!TAILQ_EMPTY(&(con->focus_head))) {
+ Con *current = TAILQ_FIRST(&(con->focus_head));
+
+ TAILQ_REMOVE(&(con->focus_head), current, focused);
+ focus_heads++;
+ }
+
+ for (int idx = 0; idx < focus_heads; idx++) {
+ /* Useful when encapsulating a workspace. */
+ if (con->type != CT_WORKSPACE && con_inside_floating(focus_order[idx])) {
+ focus_heads++;
+ continue;
+ }
+
+ TAILQ_INSERT_TAIL(&(con->focus_head), focus_order[idx], focused);
+ }
+}
+
/*
* Returns the number of children of this container.
*
return children;
}
+/**
+ * Returns the number of visible non-floating children of this container.
+ * For example, if the container contains a hsplit which has two children,
+ * this will return 2 instead of 1.
+ */
+int con_num_visible_children(Con *con) {
+ if (con == NULL)
+ return 0;
+
+ int children = 0;
+ Con *current = NULL;
+ TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
+ /* Visible leaf nodes are a child. */
+ if (!con_is_hidden(current) && con_is_leaf(current))
+ children++;
+ /* All other containers need to be recursed. */
+ else
+ children += con_num_visible_children(current);
+ }
+
+ return children;
+}
+
+/*
+ * Count the number of windows (i.e., leaf containers).
+ *
+ */
+int con_num_windows(Con *con) {
+ if (con == NULL)
+ return 0;
+
+ if (con_has_managed_window(con))
+ return 1;
+
+ int num = 0;
+ Con *current = NULL;
+ TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
+ num += con_num_windows(current);
+ }
+
+ return num;
+}
+
/*
* Updates the percent attribute of the children of the given container. This
* function needs to be called when a window is added or removed from a
if (children_with_percent != children) {
TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
if (child->percent <= 0.0) {
- if (children_with_percent == 0)
+ if (children_with_percent == 0) {
total += (child->percent = 1.0);
- else
+ } else {
total += (child->percent = total / children_with_percent);
+ }
}
}
}
// if we got a zero, just distribute the space equally, otherwise
// distribute according to the proportions we got
if (total == 0.0) {
- TAILQ_FOREACH(child, &(con->nodes_head), nodes)
- child->percent = 1.0 / children;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ child->percent = 1.0 / children;
+ }
} else if (total != 1.0) {
- TAILQ_FOREACH(child, &(con->nodes_head), nodes)
- child->percent /= total;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+ child->percent /= total;
+ }
}
}
Con *old_focused = focused;
if (fullscreen_mode == CF_GLOBAL && cur_ws != con_ws)
workspace_show(con_ws);
- con_focus(con);
+ con_activate(con);
if (fullscreen_mode != CF_GLOBAL && cur_ws != con_ws)
- con_focus(old_focused);
+ con_activate(old_focused);
con_set_fullscreen_mode(con, fullscreen_mode);
}
con_set_fullscreen_mode(con, CF_NONE);
}
-static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fix_coordinates, bool dont_warp, bool ignore_focus) {
+static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fix_coordinates, bool dont_warp, bool ignore_focus, bool fix_percentage) {
Con *orig_target = target;
/* Prevent moving if this would violate the fullscreen focus restrictions. */
Con *target_ws = con_get_workspace(target);
- if (!con_fullscreen_permits_focusing(target_ws)) {
+ if (!ignore_focus && !con_fullscreen_permits_focusing(target_ws)) {
LOG("Cannot move out of a fullscreen container.\n");
return false;
}
/* 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 *focus_next = NULL;
+ if (!ignore_focus && source_ws == current_ws) {
+ focus_next = con_descend_focused(source_ws);
+ if (focus_next == con || con_has_parent(focus_next, con)) {
+ focus_next = con_next_focused(con);
+ }
+ }
/* 2: we go up one level, but only when target is a normal container */
if (target->type != CT_WORKSPACE) {
floating_fix_coordinates(con, &(source_output->rect), &(dest_output->rect));
} else
DLOG("Not fixing coordinates, fix_coordinates flag = %d\n", fix_coordinates);
-
- /* If moving to a visible workspace, call show so it can be considered
- * focused. Must do before attaching because workspace_show checks to see
- * if focused container is in its area. */
- if (!ignore_focus && workspace_is_visible(target_ws)) {
- workspace_show(target_ws);
-
- /* Don’t warp if told so (when dragging floating windows with the
- * mouse for example) */
- if (dont_warp)
- x_set_warp_to(NULL);
- else
- x_set_warp_to(&(con->rect));
- }
}
/* If moving a fullscreen container and the destination already has a
_con_attach(con, target, behind_focused ? NULL : orig_target, !behind_focused);
/* 5: fix the percentages */
- con_fix_percent(parent);
- con->percent = 0.0;
- con_fix_percent(target);
+ if (fix_percentage) {
+ con_fix_percent(parent);
+ con->percent = 0.0;
+ con_fix_percent(target);
+ }
/* 6: focus the con on the target workspace, but only within that
* workspace, that is, don’t move focus away if the target workspace is
/* We need to save the focused workspace on the output in case the
* new workspace is hidden and it's necessary to immediately switch
* back to the originally-focused workspace. */
- Con *old_focus = TAILQ_FIRST(&(output_get_content(dest_output)->focus_head));
- con_focus(con_descend_focused(con));
+ Con *old_focus_ws = TAILQ_FIRST(&(output_get_content(dest_output)->focus_head));
+ Con *old_focus = focused;
+ con_activate(con_descend_focused(con));
/* Restore focus if the output's focused workspace has changed. */
- if (con_get_workspace(focused) != old_focus)
+ if (con_get_workspace(focused) != old_focus_ws) {
con_focus(old_focus);
+ }
+
+ /* Restore focus to the currently focused container. */
+ if (old_focus_ws == current_ws && old_focus->type != CT_WORKSPACE) {
+ con_activate(old_focus);
+ }
}
/* 7: when moving to another workspace, we leave the focus on the current
* workspace. (see also #809) */
-
- /* Descend focus stack in case focus_next is a workspace which can
- * occur if we move to the same workspace. Also show current workspace
- * to ensure it is focused. */
- if (!ignore_focus)
+ if (!ignore_focus) {
workspace_show(current_ws);
+ if (dont_warp) {
+ DLOG("x_set_warp_to(NULL) because dont_warp is set\n");
+ x_set_warp_to(NULL);
+ }
+ }
/* Set focus only if con was on current workspace before moving.
* Otherwise we would give focus to some window on different workspace. */
- if (!ignore_focus && source_ws == current_ws)
- con_focus(con_descend_focused(focus_next));
+ if (focus_next)
+ con_activate(con_descend_focused(focus_next));
/* 8. If anything within the container is associated with a startup sequence,
* delete it so child windows won't be created on the old workspace. */
startup_sequence_delete(sequence);
}
- CALL(parent, on_remove_child);
-
/* 9. If the container was marked urgent, move the urgency hint. */
if (urgent) {
workspace_update_urgent_flag(source_ws);
con_set_urgency(con, true);
}
+ /* Ensure the container will be redrawn. */
+ FREE(con->deco_render_params);
+
+ CALL(parent, on_remove_child);
+
ipc_send_window_event("move", con);
+ ewmh_update_wm_desktop();
return true;
}
return true;
}
- if (con->type == CT_WORKSPACE) {
+ if (target->type == CT_WORKSPACE) {
DLOG("target container is a workspace, simply moving the container there.\n");
con_move_to_workspace(con, target, true, false, false);
return true;
target = TAILQ_FIRST(&(target->focus_head));
}
- if (con == target || con == target->parent) {
+ if (con == target || con_has_parent(target, con)) {
DLOG("cannot move the container to or inside itself, aborting.\n");
return false;
}
- return _con_move_to_con(con, target, false, true, false, false);
+ return _con_move_to_con(con, target, false, true, false, false, true);
}
/*
}
Con *target = con_descend_focused(workspace);
- _con_move_to_con(con, target, true, fix_coordinates, dont_warp, ignore_focus);
+ _con_move_to_con(con, target, true, fix_coordinates, dont_warp, ignore_focus, true);
+}
+
+/*
+ * Moves the given container to the currently focused container on the
+ * visible workspace on the given output.
+ *
+ */
+void con_move_to_output(Con *con, Output *output, bool fix_coordinates) {
+ Con *ws = NULL;
+ GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
+ assert(ws != NULL);
+ DLOG("Moving con %p to output %s\n", con, output_primary_name(output));
+ con_move_to_workspace(con, ws, fix_coordinates, false, false);
+}
+
+/*
+ * Moves the given container to the currently focused container on the
+ * visible workspace on the output specified by the given name.
+ * The current output for the container is used to resolve relative names
+ * such as left, right, up, down.
+ *
+ */
+bool con_move_to_output_name(Con *con, const char *name, bool fix_coordinates) {
+ Output *current_output = get_output_for_con(con);
+ assert(current_output != NULL);
+
+ Output *output = get_output_from_string(current_output, name);
+ if (output == NULL) {
+ ELOG("Could not find output \"%s\"\n", name);
+ return false;
+ }
+
+ con_move_to_output(con, output, fix_coordinates);
+ return true;
}
/*
return HORIZ;
case L_DEFAULT:
- DLOG("Someone called con_orientation() on a con with L_DEFAULT, this is a bug in the code.\n");
+ ELOG("Someone called con_orientation() on a con with L_DEFAULT, this is a bug in the code.\n");
assert(false);
- return HORIZ;
case L_DOCKAREA:
case L_OUTPUT:
- DLOG("con_orientation() called on dockarea/output (%d) container %p\n", con->layout, con);
- assert(false);
- return HORIZ;
-
- default:
- DLOG("con_orientation() ran into default\n");
+ ELOG("con_orientation() called on dockarea/output (%d) container %p\n", con->layout, con);
assert(false);
}
+ /* should not be reached */
+ assert(false);
}
/*
* Returns the container which will be focused next when the given container
- * is not available anymore. Called in tree_close and con_move_to_workspace
+ * is not available anymore. Called in tree_close_internal and con_move_to_workspace
* to properly restore focus.
*
*/
Con *con_next_focused(Con *con) {
- Con *next;
- /* floating containers are attached to a workspace, so we focus either the
- * next floating container (if any) or the workspace itself. */
- if (con->type == CT_FLOATING_CON) {
- DLOG("selecting next for CT_FLOATING_CON\n");
- next = TAILQ_NEXT(con, floating_windows);
- DLOG("next = %p\n", next);
- if (!next) {
- next = TAILQ_PREV(con, floating_head, floating_windows);
- DLOG("using prev, next = %p\n", next);
- }
- if (!next) {
- Con *ws = con_get_workspace(con);
- next = ws;
- DLOG("no more floating containers for next = %p, restoring workspace focus\n", next);
- while (next != TAILQ_END(&(ws->focus_head)) && !TAILQ_EMPTY(&(next->focus_head))) {
- next = TAILQ_FIRST(&(next->focus_head));
- if (next == con) {
- DLOG("skipping container itself, we want the next client\n");
- next = TAILQ_NEXT(next, focused);
- }
- }
- if (next == TAILQ_END(&(ws->focus_head))) {
- 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;
- }
-
/* dock clients cannot be focused, so we focus the workspace instead */
if (con->parent->type == CT_DOCKAREA) {
DLOG("selecting workspace for dock client\n");
/* 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;
+ Con *next = TAILQ_FIRST(&(con->parent->focus_head));
+ if (next != con) {
+ DLOG("Using first entry %p\n", next);
} 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)))
+ if (!(next = TAILQ_NEXT(con, focused))) {
next = con->parent;
+ }
}
/* now go down the focus stack as far as
* possible, excluding the current container */
- while (!TAILQ_EMPTY(&(next->focus_head)) &&
- TAILQ_FIRST(&(next->focus_head)) != con)
+ while (!TAILQ_EMPTY(&(next->focus_head)) && TAILQ_FIRST(&(next->focus_head)) != con) {
next = TAILQ_FIRST(&(next->focus_head));
+ }
+
+ if (con->type == CT_FLOATING_CON && next != con->parent) {
+ next = con_descend_focused(next);
+ }
return next;
}
*
*/
Rect con_border_style_rect(Con *con) {
+ if (config.hide_edge_borders == HEBM_SMART && con_num_visible_children(con_get_workspace(con)) <= 1) {
+ if (!con_is_floating(con)) {
+ return (Rect){0, 0, 0, 0};
+ }
+ }
+
adjacent_t borders_to_hide = ADJ_NONE;
int border_width = con->current_border_width;
DLOG("The border width for con is set to: %d\n", con->current_border_width);
* whole workspace into stacked/tabbed mode. To do this and still allow
* intuitive operations (like level-up and then opening a new window), we
* need to create a new split container. */
- if (con->type == CT_WORKSPACE &&
- (layout == L_STACKED || layout == L_TABBED)) {
+ if (con->type == CT_WORKSPACE) {
if (con_num_children(con) == 0) {
- DLOG("Setting workspace_layout to %d\n", layout);
- con->workspace_layout = layout;
- } else {
+ layout_t ws_layout = (layout == L_STACKED || layout == L_TABBED) ? layout : L_DEFAULT;
+ DLOG("Setting workspace_layout to %d\n", ws_layout);
+ con->workspace_layout = ws_layout;
+ DLOG("Setting layout to %d\n", layout);
+ con->layout = layout;
+ } else if (layout == L_STACKED || layout == L_TABBED || layout == L_SPLITV || layout == L_SPLITH) {
DLOG("Creating new split container\n");
/* 1: create a new split container */
Con *new = con_new(NULL, NULL);
new->layout = layout;
new->last_split_layout = con->last_split_layout;
- /* Save the container that was focused before we move containers
- * around, but only if the container is visible (otherwise focus
- * will be restored properly automatically when switching). */
- Con *old_focused = TAILQ_FIRST(&(con->focus_head));
- if (old_focused == TAILQ_END(&(con->focus_head)))
- old_focused = NULL;
- if (old_focused != NULL &&
- !workspace_is_visible(con_get_workspace(old_focused)))
- old_focused = NULL;
-
/* 3: move the existing cons of this workspace below the new con */
+ Con **focus_order = get_focus_order(con);
+
DLOG("Moving cons\n");
Con *child;
while (!TAILQ_EMPTY(&(con->nodes_head))) {
con_attach(child, new, true);
}
+ set_focus_order(new, focus_order);
+ free(focus_order);
+
/* 4: attach the new split container to the workspace */
DLOG("Attaching new split to ws\n");
con_attach(new, con, false);
- if (old_focused)
- con_focus(old_focused);
-
tree_flatten(croot);
}
con_force_split_parents_redraw(con);
parent = con->parent;
DLOG("con_toggle_layout(%p, %s), parent = %p\n", con, toggle_mode, parent);
- if (strcmp(toggle_mode, "split") == 0) {
- /* Toggle between splits. When the current layout is not a split
- * layout, we just switch back to last_split_layout. Otherwise, we
- * change to the opposite split layout. */
- if (parent->layout != L_SPLITH && parent->layout != L_SPLITV)
- con_set_layout(con, parent->last_split_layout);
- else {
- if (parent->layout == L_SPLITH)
- con_set_layout(con, L_SPLITV);
- else
- con_set_layout(con, L_SPLITH);
+ const char delim[] = " ";
+
+ if (strcasecmp(toggle_mode, "split") == 0 || strstr(toggle_mode, delim)) {
+ /* L_DEFAULT is used as a placeholder value to distinguish if
+ * the first layout has already been saved. (it can never be L_DEFAULT) */
+ layout_t new_layout = L_DEFAULT;
+ bool current_layout_found = false;
+ char *tm_dup = sstrdup(toggle_mode);
+ char *cur_tok = strtok(tm_dup, delim);
+
+ for (layout_t layout; cur_tok != NULL; cur_tok = strtok(NULL, delim)) {
+ if (strcasecmp(cur_tok, "split") == 0) {
+ /* Toggle between splits. When the current layout is not a split
+ * layout, we just switch back to last_split_layout. Otherwise, we
+ * change to the opposite split layout. */
+ if (parent->layout != L_SPLITH && parent->layout != L_SPLITV) {
+ layout = parent->last_split_layout;
+ /* In case last_split_layout was not initialized… */
+ if (layout == L_DEFAULT) {
+ layout = L_SPLITH;
+ }
+ } else {
+ layout = (parent->layout == L_SPLITH) ? L_SPLITV : L_SPLITH;
+ }
+ } else {
+ bool success = layout_from_name(cur_tok, &layout);
+ if (!success || layout == L_DEFAULT) {
+ ELOG("The token '%s' was not recognized and has been skipped.\n", cur_tok);
+ continue;
+ }
+ }
+
+ /* If none of the specified layouts match the current,
+ * fall back to the first layout in the list */
+ if (new_layout == L_DEFAULT) {
+ new_layout = layout;
+ }
+
+ /* We found the active layout in the last iteration, so
+ * now let's activate the current layout (next in list) */
+ if (current_layout_found) {
+ new_layout = layout;
+ break;
+ }
+
+ if (parent->layout == layout) {
+ current_layout_found = true;
+ }
}
- } else {
+ free(tm_dup);
+
+ if (new_layout != L_DEFAULT) {
+ con_set_layout(con, new_layout);
+ }
+ } else if (strcasecmp(toggle_mode, "all") == 0 || strcasecmp(toggle_mode, "default") == 0) {
if (parent->layout == L_STACKED)
con_set_layout(con, L_TABBED);
else if (parent->layout == L_TABBED) {
- if (strcmp(toggle_mode, "all") == 0)
+ if (strcasecmp(toggle_mode, "all") == 0)
con_set_layout(con, L_SPLITH);
else
con_set_layout(con, parent->last_split_layout);
} else if (parent->layout == L_SPLITH || parent->layout == L_SPLITV) {
- if (strcmp(toggle_mode, "all") == 0) {
+ if (strcasecmp(toggle_mode, "all") == 0) {
/* When toggling through all modes, we toggle between
* splith/splitv, whereas normally we just directly jump to
* stacked. */
if (TAILQ_EMPTY(&(con->focus_head)) && !workspace_is_visible(con)) {
LOG("Closing old workspace (%p / %s), it is empty\n", con, con->name);
yajl_gen gen = ipc_marshal_workspace_event("empty", con, NULL);
- tree_close(con, DONT_KILL_WINDOW, false, false);
+ tree_close_internal(con, DONT_KILL_WINDOW, false, false);
const unsigned char *payload;
ylength length;
int children = con_num_children(con);
if (children == 0) {
DLOG("Container empty, closing\n");
- tree_close(con, DONT_KILL_WINDOW, false, false);
+ tree_close_internal(con, DONT_KILL_WINDOW, false, false);
return;
}
}
/* Allow it only if the container to be focused is contained within the
* current fullscreen container. */
- do {
- if (con->parent == fs)
- return true;
- con = con->parent;
- } while (con);
-
- /* Focusing con would hide it behind a fullscreen window, disallow it. */
- return false;
+ return con_has_parent(con, fs);
}
/*
void con_update_parents_urgency(Con *con) {
Con *parent = con->parent;
+ /* Urgency hints should not be set on any container higher up in the
+ * hierarchy than the workspace level. Unfortunately, since the content
+ * container has type == CT_CON, that’s not easy to verify in the loop
+ * below, so we need another condition to catch that case: */
+ if (con->type == CT_WORKSPACE)
+ return;
+
bool new_urgency_value = con->urgent;
while (parent && parent->type != CT_WORKSPACE && parent->type != CT_DOCKAREA) {
if (new_urgency_value) {
(TAILQ_FIRST(&(con->nodes_head)) == child ? "" : " "), child_txt);
free(buf);
buf = tmp_buf;
+ free(child_txt);
}
/* 3) close the brackets */
return complete_buf;
}
+
+/*
+ * Returns the container's title considering the current title format.
+ *
+ */
+i3String *con_parse_title_format(Con *con) {
+ assert(con->title_format != NULL);
+
+ i3Window *win = con->window;
+
+ /* We need to ensure that we only escape the window title if pango
+ * is used by the current font. */
+ const bool pango_markup = font_is_pango();
+
+ char *title;
+ char *class;
+ char *instance;
+ if (win == NULL) {
+ title = pango_escape_markup(con_get_tree_representation(con));
+ class = sstrdup("i3-frame");
+ instance = sstrdup("i3-frame");
+ } else {
+ title = pango_escape_markup(sstrdup((win->name == NULL) ? "" : i3string_as_utf8(win->name)));
+ class = pango_escape_markup(sstrdup((win->class_class == NULL) ? "" : win->class_class));
+ instance = pango_escape_markup(sstrdup((win->class_instance == NULL) ? "" : win->class_instance));
+ }
+
+ placeholder_t placeholders[] = {
+ {.name = "%title", .value = title},
+ {.name = "%class", .value = class},
+ {.name = "%instance", .value = instance}};
+ const size_t num = sizeof(placeholders) / sizeof(placeholder_t);
+
+ char *formatted_str = format_placeholders(con->title_format, &placeholders[0], num);
+ i3String *formatted = i3string_from_utf8(formatted_str);
+ i3string_set_markup(formatted, pango_markup);
+ FREE(formatted_str);
+
+ for (size_t i = 0; i < num; i++) {
+ FREE(placeholders[i].value);
+ }
+
+ return formatted;
+}
+
+/*
+ * Swaps the two containers.
+ *
+ */
+bool con_swap(Con *first, Con *second) {
+ assert(first != NULL);
+ assert(second != NULL);
+ DLOG("Swapping containers %p / %p\n", first, second);
+
+ if (first->type != CT_CON) {
+ ELOG("Only regular containers can be swapped, but found con = %p with type = %d.\n", first, first->type);
+ return false;
+ }
+
+ if (second->type != CT_CON) {
+ ELOG("Only regular containers can be swapped, but found con = %p with type = %d.\n", second, second->type);
+ return false;
+ }
+
+ if (con_is_floating(first) || con_is_floating(second)) {
+ ELOG("Floating windows cannot be swapped.\n");
+ return false;
+ }
+
+ if (first == second) {
+ DLOG("Swapping container %p with itself, nothing to do.\n", first);
+ return false;
+ }
+
+ if (con_has_parent(first, second) || con_has_parent(second, first)) {
+ ELOG("Cannot swap containers %p and %p because they are in a parent-child relationship.\n", first, second);
+ return false;
+ }
+
+ Con *old_focus = focused;
+
+ Con *first_ws = con_get_workspace(first);
+ Con *second_ws = con_get_workspace(second);
+ Con *current_ws = con_get_workspace(old_focus);
+ const bool focused_within_first = (first == old_focus || con_has_parent(old_focus, first));
+ const bool focused_within_second = (second == old_focus || con_has_parent(old_focus, second));
+ fullscreen_mode_t first_fullscreen_mode = first->fullscreen_mode;
+ fullscreen_mode_t second_fullscreen_mode = second->fullscreen_mode;
+
+ if (first_fullscreen_mode != CF_NONE) {
+ con_disable_fullscreen(first);
+ }
+ if (second_fullscreen_mode != CF_NONE) {
+ con_disable_fullscreen(second);
+ }
+
+ double first_percent = first->percent;
+ double second_percent = second->percent;
+
+ /* De- and reattaching the containers will insert them at the tail of the
+ * focus_heads. We will need to fix this. But we need to make sure first
+ * and second don't get in each other's way if they share the same parent,
+ * so we select the closest previous focus_head that isn't involved. */
+ Con *first_prev_focus_head = first;
+ while (first_prev_focus_head == first || first_prev_focus_head == second) {
+ first_prev_focus_head = TAILQ_PREV(first_prev_focus_head, focus_head, focused);
+ }
+
+ Con *second_prev_focus_head = second;
+ while (second_prev_focus_head == second || second_prev_focus_head == first) {
+ second_prev_focus_head = TAILQ_PREV(second_prev_focus_head, focus_head, focused);
+ }
+
+ /* We use a fake container to mark the spot of where the second container needs to go. */
+ Con *fake = con_new(NULL, NULL);
+ fake->layout = L_SPLITH;
+ _con_attach(fake, first->parent, first, true);
+
+ bool result = true;
+ /* Swap the containers. We set the ignore_focus flag here because after the
+ * container is attached, the focus order is not yet correct and would
+ * result in wrong windows being focused. */
+
+ /* Move first to second. */
+ result &= _con_move_to_con(first, second, false, false, false, true, false);
+ /* If swapping the containers didn't work we don't need to mess with the focus. */
+ if (!result) {
+ goto swap_end;
+ }
+
+ /* If we moved the container holding the focused window to another
+ * workspace we need to ensure the visible workspace has the focused
+ * container.
+ * We don't need to check this for the second container because we've only
+ * moved the first one at this point.*/
+ if (first_ws != second_ws && focused_within_first) {
+ con_activate(con_descend_focused(current_ws));
+ }
+
+ /* Move second to where first has been originally. */
+ result &= _con_move_to_con(second, fake, false, false, false, true, false);
+ if (!result) {
+ goto swap_end;
+ }
+
+ /* Swapping will have inserted the containers at the tail of their parents'
+ * focus head. We fix this now by putting them in the position of the focus
+ * head the container they swapped with was in. */
+ TAILQ_REMOVE(&(first->parent->focus_head), first, focused);
+ TAILQ_REMOVE(&(second->parent->focus_head), second, focused);
+
+ if (second_prev_focus_head == NULL) {
+ TAILQ_INSERT_HEAD(&(first->parent->focus_head), first, focused);
+ } else {
+ TAILQ_INSERT_AFTER(&(first->parent->focus_head), second_prev_focus_head, first, focused);
+ }
+
+ if (first_prev_focus_head == NULL) {
+ TAILQ_INSERT_HEAD(&(second->parent->focus_head), second, focused);
+ } else {
+ TAILQ_INSERT_AFTER(&(second->parent->focus_head), first_prev_focus_head, second, focused);
+ }
+
+ /* If the focus was within any of the swapped containers, do the following:
+ * - If swapping took place within a workspace, ensure the previously
+ * focused container stays focused.
+ * - Otherwise, focus the container that has been swapped in.
+ *
+ * To understand why fixing the focus_head previously wasn't enough,
+ * consider the scenario
+ * H[ V[ A X ] V[ Y B ] ]
+ * with B being focused, but X being the focus_head within its parent. If
+ * we swap A and B now, fixing the focus_head would focus X, but since B
+ * was the focused container before it should stay focused.
+ */
+ if (focused_within_first) {
+ if (first_ws == second_ws) {
+ con_activate(old_focus);
+ } else {
+ con_activate(con_descend_focused(second));
+ }
+ } else if (focused_within_second) {
+ if (first_ws == second_ws) {
+ con_activate(old_focus);
+ } else {
+ con_activate(con_descend_focused(first));
+ }
+ }
+
+ /* We need to copy each other's percentages to ensure that the geometry
+ * doesn't change during the swap. This needs to happen _before_ we close
+ * the fake container as closing the tree will recalculate percentages. */
+ first->percent = second_percent;
+ second->percent = first_percent;
+ fake->percent = 0.0;
+
+ SWAP(first_fullscreen_mode, second_fullscreen_mode, fullscreen_mode_t);
+
+swap_end:
+ /* The two windows exchange their original fullscreen status */
+ if (first_fullscreen_mode != CF_NONE) {
+ con_enable_fullscreen(first, first_fullscreen_mode);
+ }
+ if (second_fullscreen_mode != CF_NONE) {
+ con_enable_fullscreen(second, second_fullscreen_mode);
+ }
+
+ /* We don't actually need this since percentages-wise we haven't changed
+ * anything, but we'll better be safe than sorry and just make sure as we'd
+ * otherwise crash i3. */
+ con_fix_percent(first->parent);
+ con_fix_percent(second->parent);
+
+ /* We can get rid of the fake container again now. */
+ con_close(fake, DONT_KILL_WINDOW);
+
+ con_force_split_parents_redraw(first);
+ con_force_split_parents_redraw(second);
+
+ return result;
+}