Make command `move [direction]` work with criteria

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

View File

@ -10,8 +10,8 @@
#pragma once #pragma once
/** /**
* Moves the current container in the given direction (TOK_LEFT, TOK_RIGHT, * Moves the given container in the given direction (TOK_LEFT, TOK_RIGHT,
* TOK_UP, TOK_DOWN from cmdparse.l) * TOK_UP, TOK_DOWN from cmdparse.l)
* *
*/ */
void tree_move(int direction); void tree_move(Con *con, int direction);

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 // 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); int px = atoi(move_px);
/* TODO: make 'move' work with criteria. */ owindow *current;
DLOG("moving in direction %s, px %s\n", direction, move_px); HANDLE_EMPTY_MATCH;
if (con_is_floating(focused)) {
DLOG("floating move with %d pixels\n", px); Con *initially_focused = focused;
Rect newrect = focused->parent->rect;
if (strcmp(direction, "left") == 0) { TAILQ_FOREACH (current, &owindows, owindows) {
newrect.x -= px; DLOG("moving in direction %s, px %s\n", direction, move_px);
} else if (strcmp(direction, "right") == 0) { if (con_is_floating(current->con)) {
newrect.x += px; DLOG("floating move with %d pixels\n", px);
} else if (strcmp(direction, "up") == 0) { Rect newrect = current->con->parent->rect;
newrect.y -= px; if (strcmp(direction, "left") == 0) {
} else if (strcmp(direction, "down") == 0) { newrect.x -= px;
newrect.y += 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 // XXX: default reply for now, make this a better reply
ysuccess(true); ysuccess(true);
} }

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). * D_UP, D_DOWN).
* *
*/ */
void tree_move(int direction) { void tree_move(Con *con, int direction) {
position_t position; position_t position;
Con *target; Con *target;
DLOG("Moving in direction %d\n", direction); DLOG("Moving in direction %d\n", direction);
/* 1: get the first parent with the same orientation */ /* 1: get the first parent with the same orientation */
Con *con = focused;
if (con->type == CT_WORKSPACE) { if (con->type == CT_WORKSPACE) {
DLOG("Not moving workspace\n"); DLOG("Not moving workspace\n");

View File

@ -0,0 +1,37 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • http://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • http://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • http://build.i3wm.org/docs/ipc.html
# (or docs/ipc)
#
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
# (unless you are already familiar with Perl)
#
# Test that the `move [direction]` command works with criteria
# Bug still in: 4.8-16-g6888a1f
use i3test;
my $ws = fresh_workspace;
my $win1 = open_window;
my $win2 = open_window;
my $win3 = open_window;
# move win1 from the left to the right
cmd '[id="' . $win1->{id} . '"] move right';
# now they should be switched, with win2 still being focused
my $ws_con = get_ws($ws);
# win2 should be on the left
is($ws_con->{nodes}[0]->{window}, $win2->{id}, 'the `move [direction]` command should work with criteria');
is($x->input_focus, $win3->{id}, 'it should not disturb focus');
done_testing;