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

Implement 'prev', extend testcase

This commit is contained in:
Michael Stapelberg 2010-05-10 09:08:31 +02:00
parent d8307f4b4a
commit 145ebc7584
3 changed files with 66 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmdparse.l
View File

@ -100,6 +100,9 @@ focus { return TOK_FOCUS; }
move { return TOK_MOVE; }
open { return TOK_OPEN; }
next { return TOK_NEXT; }
prev { return TOK_PREV; }
horizontal { return TOK_HORIZONTAL; }
vertical { return TOK_VERTICAL; }
class { BEGIN(WANT_QSTRING); return TOK_CLASS; }
id { BEGIN(WANT_QSTRING); return TOK_ID; }

22
src/cmdparse.y
View File

@ -112,6 +112,9 @@ void parse_cmd(const char *new) {
%token TOK_MOVE "move"
%token TOK_OPEN "open"
%token TOK_NEXT "next"
%token TOK_PREV "prev"
%token TOK_HORIZONTAL "horizontal"
%token TOK_VERTICAL "vertical"
%token TOK_CLASS "class"
%token TOK_ID "id"
@ -252,6 +255,7 @@ operation:
| open
| fullscreen
| next
| prev
;
exec:
@ -345,9 +349,17 @@ next:
}
;
direction:
'h' { $<chr>$ = 'h'; }
| 'horizontal' { $<chr>$ = 'h'; }
| 'v' { $<chr>$ = 'v'; }
| 'vertical' { $<chr>$ = 'v'; }
prev:
TOK_PREV WHITESPACE direction
{
printf("should select prev window in direction %c\n", $<chr>3);
tree_next('p', ($<chr>3 == 'v' ? VERT : HORIZ));
}
;
direction:
TOK_HORIZONTAL { $<chr>$ = 'h'; }
| 'h' { $<chr>$ = 'h'; }
| TOK_VERTICAL { $<chr>$ = 'v'; }
| 'v' { $<chr>$ = 'v'; }
;

54
testcases/t/21-next-prev.t
View File

@ -3,7 +3,7 @@
#
# Tests focus switching (next/prev)
#
use i3test tests => 4;
use i3test tests => 13;
use X11::XCB qw(:all);
use v5.10;
@ -31,22 +31,60 @@ is($focus->[0], $old_focused, 'focus did not change with only one con');
######################################################################
# Open another container, verify that 'next h' switches
######################################################################
$i3->command('open')->recv;
my $left = $old_focused;
$i3->command('open')->recv;
($nodes, $focus) = get_ws_content($tmp);
isnt($old_focused, $focus->[0], 'new container is focused');
$old_focused = $focus->[0];
my $mid = $focus->[0];
$i3->command('open')->recv;
($nodes, $focus) = get_ws_content($tmp);
isnt($old_focused, $focus->[0], 'new container is focused');
my $right = $focus->[0];
$i3->command('next h')->recv;
($nodes, $focus) = get_ws_content($tmp);
isnt($focus->[0], $old_focused, 'focus did change');
isnt($focus->[0], $right, 'focus did change');
is($focus->[0], $left, 'left container focused (wrapping)');
$i3->command('next h')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $mid, 'middle container focused');
$i3->command('next h')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $right, 'right container focused');
$i3->command('prev h')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $mid, 'middle container focused');
$i3->command('prev h')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $left, 'left container focused');
$i3->command('prev h')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $right, 'right container focused');
######################################################################
# Test synonyms (horizontal/vertical instead of h/v)
######################################################################
$i3->command('prev horizontal')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $mid, 'middle container focused');
$i3->command('next horizontal')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $right, 'right container focused');
#
# TODO: extend this test-case:
# - implement prev
# TODO: extend this test-case (as soon as splitting is implemented):
# - wrapping (no horizontal switch possible, goes level-up)
# - going level-up "manually"
# - different synonyms (horizontal/vertical)
diag( "Testing i3, Perl $], $^X" );