Implement special value 'current' for output. (#2483)

This commit introduces the special 'current' value for outputs in both of

* move con to output current
* move workspace to output current

fixes #2357
This commit is contained in:
Ingo Bürk
2016-09-30 17:28:02 +02:00
committed by Michael Stapelberg
parent 6a8fb69eff
commit c71f6f8f7c
7 changed files with 63 additions and 42 deletions

View File

@ -19,9 +19,6 @@
use List::Util qw(first);
use i3test i3_autostart => 0;
# TODO:
# introduce 'move workspace 3 to output <output>' with synonym 'move workspace 3 to <output>'
# Ensure the pointer is at (0, 0) so that we really start on the first
# (the left) workspace.
$x->root->warp_pointer(0, 0);
@ -163,6 +160,26 @@ ok(!($empty_ws ~~ @$x0), 'empty_ws not on fake-0');
ok(!($empty_ws ~~ @$x1), 'empty_ws not on fake-1');
ok($other_output_ws ~~ @$x0, 'other_output_ws on fake-0');
exit_gracefully($pid);
################################################################################
# Verify that the special word 'current' can be used for the output.
################################################################################
my $ws1 = fresh_workspace(output => 1);
open_window;
cmd 'mark marked';
my $ws0 = fresh_workspace(output => 0);
($x0, $x1) = workspaces_per_screen();
ok($ws0 ~~ @$x0, 'ws0 on fake-0');
ok($ws1 ~~ @$x1, 'ws1 on fake-1');
cmd '[con_mark=marked] move workspace to output current';
($x0, $x1) = workspaces_per_screen();
ok($ws1 ~~ @$x0, 'ws1 on fake-0');
################################################################################
exit_gracefully($pid);
done_testing;