2010-03-27 15:25:51 +01:00
|
|
|
|
/*
|
|
|
|
|
* vim:ts=4:sw=4:expandtab
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "all.h"
|
|
|
|
|
|
|
|
|
|
struct Con *croot;
|
|
|
|
|
struct Con *focused;
|
|
|
|
|
|
|
|
|
|
struct all_cons_head all_cons = TAILQ_HEAD_INITIALIZER(all_cons);
|
|
|
|
|
|
|
|
|
|
/*
|
2010-07-13 11:35:05 +02:00
|
|
|
|
* Loads tree from ~/.i3/_restart.json (used for in-place restarts).
|
2010-03-27 15:25:51 +01:00
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
bool tree_restore() {
|
|
|
|
|
char *globbed = glob_path("~/.i3/_restart.json");
|
|
|
|
|
|
|
|
|
|
if (!path_exists(globbed)) {
|
|
|
|
|
LOG("%s does not exist, not restoring tree\n", globbed);
|
|
|
|
|
free(globbed);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* TODO: refactor the following */
|
|
|
|
|
croot = con_new(NULL);
|
|
|
|
|
focused = croot;
|
|
|
|
|
|
|
|
|
|
tree_append_json(globbed);
|
|
|
|
|
char *old_restart = glob_path("~/.i3/_restart.json.old");
|
|
|
|
|
unlink(old_restart);
|
|
|
|
|
rename(globbed, old_restart);
|
|
|
|
|
free(globbed);
|
|
|
|
|
free(old_restart);
|
|
|
|
|
|
|
|
|
|
printf("appended tree, using new root\n");
|
|
|
|
|
croot = TAILQ_FIRST(&(croot->nodes_head));
|
|
|
|
|
printf("new root = %p\n", croot);
|
|
|
|
|
Con *out = TAILQ_FIRST(&(croot->nodes_head));
|
|
|
|
|
printf("out = %p\n", out);
|
|
|
|
|
Con *ws = TAILQ_FIRST(&(out->nodes_head));
|
|
|
|
|
printf("ws = %p\n", ws);
|
|
|
|
|
con_focus(ws);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Initializes the tree by creating the root node, adding all RandR outputs
|
|
|
|
|
* to the tree (that means randr_init() has to be called before) and
|
|
|
|
|
* assigning a workspace to each RandR output.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void tree_init() {
|
|
|
|
|
Output *output;
|
|
|
|
|
|
|
|
|
|
croot = con_new(NULL);
|
|
|
|
|
croot->name = "root";
|
|
|
|
|
croot->type = CT_ROOT;
|
|
|
|
|
|
|
|
|
|
Con *ws;
|
2010-11-12 17:33:59 +01:00
|
|
|
|
int c = 1;
|
2010-03-27 15:25:51 +01:00
|
|
|
|
/* add the outputs */
|
|
|
|
|
TAILQ_FOREACH(output, &outputs, outputs) {
|
|
|
|
|
if (!output->active)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
Con *oc = con_new(croot);
|
|
|
|
|
oc->name = strdup(output->name);
|
|
|
|
|
oc->type = CT_OUTPUT;
|
|
|
|
|
oc->rect = output->rect;
|
|
|
|
|
|
|
|
|
|
/* add a workspace to this output */
|
|
|
|
|
ws = con_new(oc);
|
2010-05-31 00:11:11 +02:00
|
|
|
|
ws->type = CT_WORKSPACE;
|
2010-11-12 17:33:59 +01:00
|
|
|
|
asprintf(&(ws->name), "%d", c);
|
|
|
|
|
c++;
|
2010-03-27 15:25:51 +01:00
|
|
|
|
ws->fullscreen_mode = CF_OUTPUT;
|
2010-06-01 22:45:18 +02:00
|
|
|
|
ws->orientation = HORIZ;
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con_focus(ws);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Opens an empty container in the current container
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
Con *tree_open_con(Con *con) {
|
|
|
|
|
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)
|
|
|
|
|
con = focused;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert(con != NULL);
|
|
|
|
|
|
|
|
|
|
/* 3: re-calculate child->percent for each child */
|
|
|
|
|
con_fix_percent(con, WINDOW_ADD);
|
|
|
|
|
|
|
|
|
|
/* 4: add a new container leaf to this con */
|
|
|
|
|
Con *new = con_new(con);
|
|
|
|
|
con_focus(new);
|
|
|
|
|
|
|
|
|
|
return new;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-01 21:34:47 +02:00
|
|
|
|
/*
|
|
|
|
|
* vanishing is the container that is about to be closed (so any floating
|
|
|
|
|
* client which has old_parent == vanishing needs to be "re-parented").
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
static void fix_floating_parent(Con *con, Con *vanishing) {
|
|
|
|
|
Con *child;
|
|
|
|
|
|
|
|
|
|
if (con->old_parent == vanishing) {
|
|
|
|
|
LOG("Fixing vanishing old_parent (%p) of container %p to be %p\n",
|
|
|
|
|
vanishing, con, vanishing->parent);
|
|
|
|
|
con->old_parent = vanishing->parent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TAILQ_FOREACH(child, &(con->floating_head), floating_windows)
|
|
|
|
|
fix_floating_parent(child, vanishing);
|
|
|
|
|
|
|
|
|
|
TAILQ_FOREACH(child, &(con->nodes_head), nodes)
|
|
|
|
|
fix_floating_parent(child, vanishing);
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-27 15:25:51 +01:00
|
|
|
|
/*
|
|
|
|
|
* Closes the given container including all children
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-05-15 00:16:59 +02:00
|
|
|
|
void tree_close(Con *con, bool kill_window) {
|
2010-07-17 00:54:03 +02:00
|
|
|
|
Con *parent = con->parent;
|
|
|
|
|
|
2010-06-01 21:34:47 +02:00
|
|
|
|
/* check floating clients and adjust old_parent if necessary */
|
|
|
|
|
fix_floating_parent(croot, con);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
|
|
|
|
|
/* Get the container which is next focused */
|
2010-07-17 13:27:34 +02:00
|
|
|
|
Con *next = con_next_focused(con);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
|
2010-06-02 17:04:26 +02:00
|
|
|
|
DLOG("closing %p, kill_window = %d\n", con, kill_window);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
Con *child;
|
|
|
|
|
/* 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));
|
2010-05-15 00:16:59 +02:00
|
|
|
|
tree_close(child, kill_window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (con->window != NULL) {
|
|
|
|
|
if (kill_window)
|
|
|
|
|
x_window_kill(con->window->id);
|
|
|
|
|
else {
|
|
|
|
|
/* un-parent the window */
|
|
|
|
|
xcb_reparent_window(conn, con->window->id, root, 0, 0);
|
|
|
|
|
/* TODO: client_unmap to set state to withdrawn */
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
free(con->window);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* kill the X11 part of this container */
|
|
|
|
|
x_con_kill(con);
|
|
|
|
|
|
|
|
|
|
con_detach(con);
|
2010-07-17 00:54:03 +02:00
|
|
|
|
con_fix_percent(parent, WINDOW_REMOVE);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
|
2010-06-28 22:37:35 +02:00
|
|
|
|
if (con_is_floating(con)) {
|
|
|
|
|
DLOG("Container was floating, killing floating container\n");
|
|
|
|
|
|
2010-07-17 00:54:03 +02:00
|
|
|
|
TAILQ_REMOVE(&(parent->parent->floating_head), parent, floating_windows);
|
|
|
|
|
TAILQ_REMOVE(&(parent->parent->focus_head), parent, focused);
|
|
|
|
|
tree_close(parent, false);
|
2010-06-30 22:37:57 +02:00
|
|
|
|
next = NULL;
|
2010-06-28 22:37:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-27 15:25:51 +01:00
|
|
|
|
free(con->name);
|
|
|
|
|
TAILQ_REMOVE(&all_cons, con, all_cons);
|
|
|
|
|
free(con);
|
|
|
|
|
|
2010-06-30 22:37:57 +02:00
|
|
|
|
/* in the case of floating windows, we already focused another container
|
|
|
|
|
* when closing the parent, so we can exit now. */
|
|
|
|
|
if (!next)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
DLOG("focusing %p / %s\n", next, next->name);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
/* TODO: check if the container (or one of its children) was focused */
|
|
|
|
|
con_focus(next);
|
2010-07-17 00:54:47 +02:00
|
|
|
|
|
|
|
|
|
/* check if the parent container is empty now and close it */
|
|
|
|
|
if (parent->type != CT_WORKSPACE &&
|
|
|
|
|
TAILQ_EMPTY(&(parent->nodes_head))) {
|
|
|
|
|
DLOG("Closing empty parent container\n");
|
|
|
|
|
/* TODO: check if this container would swallow any other client and
|
|
|
|
|
* don’t close it automatically. */
|
|
|
|
|
tree_close(parent, false);
|
|
|
|
|
}
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Closes the current container using tree_close().
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void tree_close_con() {
|
|
|
|
|
assert(focused != NULL);
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (focused->type == CT_WORKSPACE) {
|
2010-03-27 15:25:51 +01:00
|
|
|
|
LOG("Cannot close workspace\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Kill con */
|
2010-05-15 00:16:59 +02:00
|
|
|
|
tree_close(focused, true);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Splits (horizontally or vertically) the given container by creating a new
|
|
|
|
|
* container which contains the old one and the future ones.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void tree_split(Con *con, orientation_t orientation) {
|
2010-05-10 09:33:10 +02:00
|
|
|
|
/* for a workspace, we just need to change orientation */
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (con->type == CT_WORKSPACE) {
|
2010-06-02 23:32:05 +02:00
|
|
|
|
DLOG("Workspace, simply changing orientation to %d\n", orientation);
|
2010-05-10 09:33:10 +02:00
|
|
|
|
con->orientation = orientation;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-06-01 22:45:18 +02:00
|
|
|
|
|
|
|
|
|
Con *parent = con->parent;
|
|
|
|
|
/* if we are in a container whose parent contains only one
|
|
|
|
|
* child and has the same orientation like we are trying to
|
|
|
|
|
* set, this operation is a no-op to not confuse the user */
|
|
|
|
|
if (parent->orientation == orientation &&
|
2010-06-02 23:32:05 +02:00
|
|
|
|
TAILQ_NEXT(con, nodes) == TAILQ_END(&(parent->nodes_head))) {
|
|
|
|
|
DLOG("Not splitting the same way again\n");
|
2010-06-01 22:45:18 +02:00
|
|
|
|
return;
|
2010-06-02 23:32:05 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DLOG("Splitting in orientation %d\n", orientation);
|
2010-06-01 22:45:18 +02:00
|
|
|
|
|
2010-03-27 15:25:51 +01:00
|
|
|
|
/* 2: replace it with a new Con */
|
|
|
|
|
Con *new = con_new(NULL);
|
|
|
|
|
TAILQ_REPLACE(&(parent->nodes_head), con, new, nodes);
|
|
|
|
|
TAILQ_REPLACE(&(parent->focus_head), con, new, focused);
|
|
|
|
|
new->parent = parent;
|
|
|
|
|
new->orientation = orientation;
|
|
|
|
|
|
|
|
|
|
/* 3: add it as a child to the new Con */
|
|
|
|
|
con_attach(con, new);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Moves focus one level up.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void level_up() {
|
|
|
|
|
/* We can focus up to the workspace, but not any higher in the tree */
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (focused->parent->type != CT_CON &&
|
|
|
|
|
focused->parent->type != CT_WORKSPACE) {
|
2010-03-27 15:25:51 +01:00
|
|
|
|
printf("cannot go up\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
con_focus(focused->parent);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Moves focus one level down.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void level_down() {
|
|
|
|
|
/* Go down the focus stack of the current node */
|
|
|
|
|
Con *next = TAILQ_FIRST(&(focused->focus_head));
|
|
|
|
|
if (next == TAILQ_END(&(focused->focus_head))) {
|
|
|
|
|
printf("cannot go down\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
con_focus(next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mark_unmapped(Con *con) {
|
|
|
|
|
Con *current;
|
|
|
|
|
|
|
|
|
|
con->mapped = false;
|
|
|
|
|
TAILQ_FOREACH(current, &(con->nodes_head), nodes)
|
|
|
|
|
mark_unmapped(current);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Renders the tree, that is rendering all outputs using render_con() and
|
|
|
|
|
* pushing the changes to X11 using x_push_changes().
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void tree_render() {
|
|
|
|
|
if (croot == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
printf("-- BEGIN RENDERING --\n");
|
|
|
|
|
/* Reset map state for all nodes in tree */
|
|
|
|
|
/* TODO: a nicer method to walk all nodes would be good, maybe? */
|
|
|
|
|
mark_unmapped(croot);
|
|
|
|
|
croot->mapped = true;
|
|
|
|
|
|
|
|
|
|
/* We start rendering at an output */
|
|
|
|
|
Con *output;
|
|
|
|
|
TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
|
|
|
|
|
printf("output %p / %s\n", output, output->name);
|
|
|
|
|
render_con(output);
|
|
|
|
|
}
|
|
|
|
|
x_push_changes(croot);
|
|
|
|
|
printf("-- END RENDERING --\n");
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Changes focus in the given way (next/previous) and given orientation
|
|
|
|
|
* (horizontal/vertical).
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void tree_next(char way, orientation_t orientation) {
|
|
|
|
|
/* 1: get the first parent with the same orientation */
|
|
|
|
|
Con *parent = focused->parent;
|
2010-07-17 01:56:16 +02:00
|
|
|
|
while (focused->type != CT_WORKSPACE &&
|
|
|
|
|
con_orientation(parent) != orientation) {
|
2010-03-27 15:25:51 +01:00
|
|
|
|
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 */
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (parent->type == CT_WORKSPACE)
|
2010-03-27 15:25:51 +01:00
|
|
|
|
return;
|
|
|
|
|
parent = parent->parent;
|
|
|
|
|
}
|
|
|
|
|
Con *current = TAILQ_FIRST(&(parent->focus_head));
|
|
|
|
|
assert(current != TAILQ_END(&(parent->focus_head)));
|
|
|
|
|
|
|
|
|
|
/* 2: chose next (or previous) */
|
|
|
|
|
Con *next;
|
|
|
|
|
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)))
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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 */
|
2010-04-13 16:41:23 +02:00
|
|
|
|
while (!TAILQ_EMPTY(&(next->focus_head)))
|
2010-03-27 15:25:51 +01:00
|
|
|
|
next = TAILQ_FIRST(&(next->focus_head));
|
|
|
|
|
|
|
|
|
|
con_focus(next);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-13 11:35:05 +02:00
|
|
|
|
/*
|
|
|
|
|
* Moves the current container in the given way (next/previous) and given
|
|
|
|
|
* orientation (horizontal/vertical).
|
|
|
|
|
*
|
|
|
|
|
*/
|
2010-03-27 15:25:51 +01:00
|
|
|
|
void tree_move(char way, orientation_t orientation) {
|
|
|
|
|
/* 1: get the first parent with the same orientation */
|
|
|
|
|
Con *parent = focused->parent;
|
2010-11-13 14:55:11 +01:00
|
|
|
|
Con *old_parent = parent;
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (focused->type == CT_WORKSPACE)
|
2010-05-11 22:46:49 +02:00
|
|
|
|
return;
|
2010-03-27 15:25:51 +01:00
|
|
|
|
bool level_changed = false;
|
2010-07-17 01:27:47 +02:00
|
|
|
|
while (con_orientation(parent) != orientation) {
|
2010-03-27 15:25:51 +01:00
|
|
|
|
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 */
|
2010-05-31 00:11:11 +02:00
|
|
|
|
if (parent->type == CT_WORKSPACE)
|
2010-03-27 15:25:51 +01:00
|
|
|
|
return;
|
|
|
|
|
parent = parent->parent;
|
|
|
|
|
level_changed = true;
|
|
|
|
|
}
|
|
|
|
|
Con *current = TAILQ_FIRST(&(parent->focus_head));
|
|
|
|
|
assert(current != TAILQ_END(&(parent->focus_head)));
|
|
|
|
|
|
|
|
|
|
/* 2: chose next (or previous) */
|
|
|
|
|
Con *next = current;
|
|
|
|
|
if (way == 'n') {
|
|
|
|
|
LOG("i would insert it after %p / %s\n", next, next->name);
|
|
|
|
|
if (!level_changed) {
|
|
|
|
|
next = TAILQ_NEXT(next, nodes);
|
|
|
|
|
if (next == TAILQ_END(&(next->parent->nodes_head))) {
|
|
|
|
|
LOG("cannot move further to the right\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-06-29 19:05:31 +02:00
|
|
|
|
|
|
|
|
|
/* if this is a split container, we need to go down */
|
|
|
|
|
while (!TAILQ_EMPTY(&(next->focus_head)))
|
|
|
|
|
next = TAILQ_FIRST(&(next->focus_head));
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con_detach(focused);
|
|
|
|
|
focused->parent = next->parent;
|
|
|
|
|
|
|
|
|
|
TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, focused, nodes);
|
|
|
|
|
TAILQ_INSERT_HEAD(&(next->parent->focus_head), focused, focused);
|
|
|
|
|
/* TODO: don’t influence focus handling? */
|
|
|
|
|
} else {
|
|
|
|
|
LOG("i would insert it before %p / %s\n", current, current->name);
|
2010-06-29 19:05:31 +02:00
|
|
|
|
bool gone_down = false;
|
2010-03-27 15:25:51 +01:00
|
|
|
|
if (!level_changed) {
|
|
|
|
|
next = TAILQ_PREV(next, nodes_head, nodes);
|
|
|
|
|
if (next == TAILQ_END(&(next->parent->nodes_head))) {
|
|
|
|
|
LOG("cannot move further\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-06-29 19:05:31 +02:00
|
|
|
|
|
|
|
|
|
/* if this is a split container, we need to go down */
|
|
|
|
|
while (!TAILQ_EMPTY(&(next->focus_head))) {
|
|
|
|
|
gone_down = true;
|
|
|
|
|
next = TAILQ_FIRST(&(next->focus_head));
|
|
|
|
|
}
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con_detach(focused);
|
|
|
|
|
focused->parent = next->parent;
|
|
|
|
|
|
2010-06-29 19:05:31 +02:00
|
|
|
|
/* After going down in the tree, we insert the container *after*
|
|
|
|
|
* the currently focused one even though the command used "before".
|
|
|
|
|
* This is to keep the user experience clear, since the before/after
|
|
|
|
|
* only signifies the direction of the movement on top-level */
|
|
|
|
|
if (gone_down)
|
|
|
|
|
TAILQ_INSERT_AFTER(&(next->parent->nodes_head), next, focused, nodes);
|
|
|
|
|
else TAILQ_INSERT_BEFORE(next, focused, nodes);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
TAILQ_INSERT_HEAD(&(next->parent->focus_head), focused, focused);
|
|
|
|
|
/* TODO: don’t influence focus handling? */
|
|
|
|
|
}
|
2010-11-13 14:55:11 +01:00
|
|
|
|
|
|
|
|
|
if (con_num_children(old_parent) == 0) {
|
|
|
|
|
DLOG("Old container empty after moving. Let's close it\n");
|
|
|
|
|
tree_close(old_parent, false);
|
|
|
|
|
}
|
2010-03-27 15:25:51 +01:00
|
|
|
|
}
|