X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmove.c;h=3ecc69e4c762c7c63e2e38ab6a9ceadaeb91edf0;hb=480f688b44f962fa57fd6d44dc2e204724416cdb;hp=0b3ab66011d4d9d189badcebcf1ea11ae81e180e;hpb=9f955a1e012f5e6c3bf5428924c778e9cac346e0;p=i3%2Fi3 diff --git a/src/move.c b/src/move.c index 0b3ab660..3ecc69e4 100644 --- a/src/move.c +++ b/src/move.c @@ -1,17 +1,16 @@ -#undef I3__FILE__ -#define I3__FILE__ "move.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * move.c: Moving containers into some direction. * */ #include "all.h" -typedef enum { BEFORE, AFTER } position_t; +typedef enum { BEFORE, + AFTER } position_t; /* * This function detaches 'con' from its parent and inserts it either before or @@ -99,8 +98,8 @@ static void attach_to_workspace(Con *con, Con *ws, direction_t direction) { * */ static void move_to_output_directed(Con *con, direction_t direction) { - Con *current_output_con = con_get_output(con); - Output *current_output = get_output_by_name(current_output_con->name); + Con *old_ws = con_get_workspace(con); + Output *current_output = get_output_for_con(con); Output *output = get_output_next(direction, current_output, CLOSEST_OUTPUT); if (!output) { @@ -117,17 +116,30 @@ static void move_to_output_directed(Con *con, direction_t direction) { } attach_to_workspace(con, ws, direction); + + /* fix the focus stack */ + con_focus(con); + + /* force re-painting the indicators */ + FREE(con->deco_render_params); + + tree_flatten(croot); + + ipc_send_workspace_event("focus", ws, old_ws); } /* - * Moves the current container in the given direction (D_LEFT, D_RIGHT, + * Moves the given container in the given direction (D_LEFT, D_RIGHT, * D_UP, D_DOWN). * */ -void tree_move(int direction) { +void tree_move(Con *con, int direction) { + position_t position; + Con *target; + DLOG("Moving in direction %d\n", direction); + /* 1: get the first parent with the same orientation */ - Con *con = focused; if (con->type == CT_WORKSPACE) { DLOG("Not moving workspace\n"); @@ -137,7 +149,7 @@ void tree_move(int direction) { if (con->parent->type == CT_WORKSPACE && con_num_children(con->parent) == 1) { /* This is the only con on this workspace */ move_to_output_directed(con, direction); - goto end; + return; } orientation_t o = (direction == D_LEFT || direction == D_RIGHT ? HORIZ : VERT); @@ -169,21 +181,29 @@ void tree_move(int direction) { if (same_orientation == con->parent) { DLOG("We are in the same container\n"); Con *swap; - if ((swap = (direction == D_LEFT || direction == D_UP ? - TAILQ_PREV(con, nodes_head, nodes) : - TAILQ_NEXT(con, nodes)))) { + if ((swap = (direction == D_LEFT || direction == D_UP ? TAILQ_PREV(con, nodes_head, nodes) : TAILQ_NEXT(con, nodes)))) { if (!con_is_leaf(swap)) { - insert_con_into(con, con_descend_focused(swap), AFTER); + DLOG("Moving into our bordering branch\n"); + target = con_descend_direction(swap, direction); + position = (con_orientation(target->parent) != o || + direction == D_UP || + direction == D_LEFT + ? AFTER + : BEFORE); + insert_con_into(con, target, position); goto end; } if (direction == D_LEFT || direction == D_UP) TAILQ_SWAP(swap, con, &(swap->parent->nodes_head), nodes); - else TAILQ_SWAP(con, swap, &(swap->parent->nodes_head), nodes); + else + TAILQ_SWAP(con, swap, &(swap->parent->nodes_head), nodes); TAILQ_REMOVE(&(con->parent->focus_head), con, focused); TAILQ_INSERT_HEAD(&(swap->parent->focus_head), con, focused); DLOG("Swapped.\n"); + ipc_send_window_event("move", con); + ewmh_update_wm_desktop(); return; } @@ -191,7 +211,9 @@ void tree_move(int direction) { /* If we couldn't find a place to move it on this workspace, * try to move it to a workspace on a different output */ move_to_output_directed(con, direction); - goto end; + ipc_send_window_event("move", con); + ewmh_update_wm_desktop(); + return; } /* If there was no con with which we could swap the current one, @@ -214,22 +236,32 @@ void tree_move(int direction) { } DLOG("above = %p\n", above); - Con *next; - position_t position; - if (direction == D_UP || direction == D_LEFT) { - position = BEFORE; - next = TAILQ_PREV(above, nodes_head, nodes); - } else { - position = AFTER; - next = TAILQ_NEXT(above, nodes); - } - /* special case: there is a split container in the direction we are moving - * to, so descend and append */ - if (next && !con_is_leaf(next)) - insert_con_into(con, con_descend_focused(next), AFTER); - else + Con *next = (direction == D_UP || direction == D_LEFT ? TAILQ_PREV(above, nodes_head, nodes) : TAILQ_NEXT(above, nodes)); + + if (next && !con_is_leaf(next)) { + DLOG("Moving into the bordering branch of our adjacent container\n"); + target = con_descend_direction(next, direction); + position = (con_orientation(target->parent) != o || + direction == D_UP || + direction == D_LEFT + ? AFTER + : BEFORE); + insert_con_into(con, target, position); + } else if (!next && + con->parent->parent->type == CT_WORKSPACE && + con->parent->layout != L_DEFAULT && + con_num_children(con->parent) == 1) { + /* Con is the lone child of a non-default layout container at the edge + * of the workspace. Treat it as though the workspace is its parent + * and move it to the next output. */ + DLOG("Grandparent is workspace\n"); + move_to_output_directed(con, direction); + } else { + DLOG("Moving into container above\n"); + position = (direction == D_UP || direction == D_LEFT ? BEFORE : AFTER); insert_con_into(con, above, position); + } end: /* We need to call con_focus() to fix the focus stack "above" the container @@ -241,4 +273,6 @@ end: FREE(con->deco_render_params); tree_flatten(croot); + ipc_send_window_event("move", con); + ewmh_update_wm_desktop(); }