/*
* vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * move.c: Moving containers into some direction.
+ *
*/
-
#include "all.h"
-#include "cmdparse.tab.h"
typedef enum { BEFORE, AFTER } position_t;
}
/*
- * Moves the current container in the given direction (TOK_LEFT, TOK_RIGHT,
- * TOK_UP, TOK_DOWN from cmdparse.l)
+ * Moves the current container in the given direction (D_LEFT, D_RIGHT,
+ * D_UP, D_DOWN).
*
*/
void tree_move(int direction) {
return;
}
- orientation_t o = (direction == TOK_LEFT || direction == TOK_RIGHT ? HORIZ : VERT);
+ orientation_t o = (direction == D_LEFT || direction == D_RIGHT ? HORIZ : VERT);
Con *same_orientation = con_parent_with_orientation(con, o);
/* The do {} while is used to 'restart' at this point with a different
if (same_orientation == con->parent) {
DLOG("We are in the same container\n");
Con *swap;
- if ((swap = (direction == TOK_LEFT || direction == TOK_UP ?
+ 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);
goto end;
}
- if (direction == TOK_LEFT || direction == TOK_UP)
+ 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);
while (above->parent != same_orientation)
above = above->parent;
+ /* Enforce the fullscreen focus restrictions. */
+ if (!con_fullscreen_permits_focusing(above->parent)) {
+ LOG("Cannot move out of fullscreen container\n");
+ return;
+ }
+
DLOG("above = %p\n", above);
Con *next;
position_t position;
- if (direction == TOK_UP || direction == TOK_LEFT) {
+ if (direction == D_UP || direction == D_LEFT) {
position = BEFORE;
next = TAILQ_PREV(above, nodes_head, nodes);
} else {
* container(s) would still point to the old container(s)). */
con_focus(con);
+ /* force re-painting the indicators */
+ FREE(con->deco_render_params);
+
tree_flatten(croot);
}