koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make command move [direction] work with criteria

Browse Source 
A container selected with criteria should be moved with the `move
[direction]` command, instead of this command always acting on the
focused container.
This commit is contained in:
Tony Crisci
2014-06-19 08:09:31 -04:00
committed by Michael Stapelberg
parent c936232545
commit c2b6b06da7
4 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands.c
View File

@ -1545,26 +1545,36 @@ void cmd_move_direction(I3_CMD, char *direction, char *move_px) {
// TODO: We could either handle this in the parser itself as a separate token (and make the stack typed) or we need a better way to convert a string to a number with error checking
int px = atoi(move_px);
/* TODO: make 'move' work with criteria. */
DLOG("moving in direction %s, px %s\n", direction, move_px);
if (con_is_floating(focused)) {
DLOG("floating move with %d pixels\n", px);
Rect newrect = focused->parent->rect;
if (strcmp(direction, "left") == 0) {
newrect.x -= px;
} else if (strcmp(direction, "right") == 0) {
newrect.x += px;
} else if (strcmp(direction, "up") == 0) {
newrect.y -= px;
} else if (strcmp(direction, "down") == 0) {
newrect.y += px;
owindow *current;
HANDLE_EMPTY_MATCH;
Con *initially_focused = focused;
TAILQ_FOREACH (current, &owindows, owindows) {
DLOG("moving in direction %s, px %s\n", direction, move_px);
if (con_is_floating(current->con)) {
DLOG("floating move with %d pixels\n", px);
Rect newrect = current->con->parent->rect;
if (strcmp(direction, "left") == 0) {
newrect.x -= px;
} else if (strcmp(direction, "right") == 0) {
newrect.x += px;
} else if (strcmp(direction, "up") == 0) {
newrect.y -= px;
} else if (strcmp(direction, "down") == 0) {
newrect.y += px;
}
floating_reposition(current->con->parent, newrect);
} else {
tree_move(current->con, (strcmp(direction, "right") == 0 ? D_RIGHT : (strcmp(direction, "left") == 0 ? D_LEFT : (strcmp(direction, "up") == 0 ? D_UP : D_DOWN))));
cmd_output->needs_tree_render = true;
}
floating_reposition(focused->parent, newrect);
} else {
tree_move((strcmp(direction, "right") == 0 ? D_RIGHT : (strcmp(direction, "left") == 0 ? D_LEFT : (strcmp(direction, "up") == 0 ? D_UP : D_DOWN))));
cmd_output->needs_tree_render = true;
}
/* the move command should not disturb focus */
if (focused != initially_focused)
con_focus(initially_focused);
// XXX: default reply for now, make this a better reply
ysuccess(true);
}

5
src/move.c
View File

@ -132,18 +132,17 @@ static void move_to_output_directed(Con *con, direction_t direction) {
}
/*
* 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");