nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make absolute floating move work with criteria 

Make commands of type `move [window|container] [to] [absolute] position
<px> [px] <px> [px]` work with command selection criteria.

fixes #1301
This commit is contained in:
Tony Crisci 2014-07-01 02:12:28 -04:00 committed by Michael Stapelberg
parent 5cbe2d63c0
commit 7381b50587
2 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/commands.c
View File

@ -1810,34 +1810,46 @@ void cmd_focus_output(I3_CMD, char *name) {
void cmd_move_window_to_position(I3_CMD, char *method, char *cx, char *cy) { void cmd_move_window_to_position(I3_CMD, char *method, char *cx, char *cy) {
int x = atoi(cx); int x = atoi(cx);
int y = atoi(cy); int y = atoi(cy);
bool has_error = false;
if (!con_is_floating(focused)) { owindow *current;
ELOG("Cannot change position. The window/container is not floating\n"); HANDLE_EMPTY_MATCH;
yerror("Cannot change position. The window/container is not floating.");
return;
}
if (strcmp(method, "absolute") == 0) { TAILQ_FOREACH(current, &owindows, owindows) {
focused->parent->rect.x = x; if (!con_is_floating(current->con)) {
focused->parent->rect.y = y; ELOG("Cannot change position. The window/container is not floating\n");
DLOG("moving to absolute position %d %d\n", x, y); if (!has_error) {
floating_maybe_reassign_ws(focused->parent); yerror("Cannot change position of a window/container because it is not floating.");
cmd_output->needs_tree_render = true; has_error = true;
} }
if (strcmp(method, "position") == 0) { continue;
Rect newrect = focused->parent->rect; }
DLOG("moving to position %d %d\n", x, y); if (strcmp(method, "absolute") == 0) {
newrect.x = x; current->con->parent->rect.x = x;
newrect.y = y; current->con->parent->rect.y = y;
floating_reposition(focused->parent, newrect); DLOG("moving to absolute position %d %d\n", x, y);
floating_maybe_reassign_ws(current->con->parent);
cmd_output->needs_tree_render = true;
}
if (strcmp(method, "position") == 0) {
Rect newrect = current->con->parent->rect;
DLOG("moving to position %d %d\n", x, y);
newrect.x = x;
newrect.y = y;
floating_reposition(current->con->parent, newrect);
}
} }
// XXX: default reply for now, make this a better reply // XXX: default reply for now, make this a better reply
ysuccess(true); if (!has_error)
ysuccess(true);
} }
/* /*

16
testcases/t/124-move.t
View File

@ -245,4 +245,20 @@ my $center_y = int($x->root->rect->height/2) - int($floatcon[0]->{rect}->{height
is($floatcon[0]->{rect}->{x}, $center_x, "moved to center at position $center_x x"); is($floatcon[0]->{rect}->{x}, $center_x, "moved to center at position $center_x x");
is($floatcon[0]->{rect}->{y}, $center_y, "moved to center at position $center_y y"); is($floatcon[0]->{rect}->{y}, $center_y, "moved to center at position $center_y y");
# Make sure the command works with criteria
open_floating_window;
@floatcon = @{get_ws($tmp)->{floating_nodes}};
cmd '[con_id="' . $floatcon[0]->{nodes}[0]->{id} . '"] move position 25 px 30 px';
cmd '[con_id="' . $floatcon[1]->{nodes}[0]->{id} . '"] move position 35 px 40 px';
@floatcon = @{get_ws($tmp)->{floating_nodes}};
is($floatcon[0]->{rect}->{x}, 25, 'moved to position 25 x with criteria');
is($floatcon[0]->{rect}->{y}, 30, 'moved to position 30 y with criteria');
is($floatcon[1]->{rect}->{x}, 35, 'moved to position 35 x with criteria');
is($floatcon[1]->{rect}->{y}, 40, 'moved to position 40 y with criteria');
done_testing; done_testing;