implement 'next' in the new command parser (testcase unfinished)

diff --git a/src/cmdparse.l b/src/cmdparse.l
index 079aa8f91a9d86f6e203739796e8c9854a869044..318da934d67b585377a67f72f453d13b08385302 100644 (file)
--- a/src/cmdparse.l
+++ b/src/cmdparse.l
@@ -99,6 +99,7 @@ workspace                       { BEGIN(WANT_WS_STRING); return TOK_WORKSPACE; }
 focus                           { return TOK_FOCUS; }
 move                            { return TOK_MOVE; }
 open                            { return TOK_OPEN; }
+next                            { return TOK_NEXT; }
 
 class                           { BEGIN(WANT_QSTRING); return TOK_CLASS; }
 id                              { BEGIN(WANT_QSTRING); return TOK_ID; }

diff --git a/src/cmdparse.y b/src/cmdparse.y
index e9b2538c4ddbf224a104f914ba643f7cadc6cdae..c3b19686ae948e4684c04d62ed5622d4caf28762 100644 (file)
--- a/src/cmdparse.y
+++ b/src/cmdparse.y
@@ -86,6 +86,7 @@ void parse_cmd(const char *new) {
 
 %union {
     char *string;
+    char chr;
 }
 
 %token TOK_ATTACH "attach"
@@ -110,6 +111,7 @@ void parse_cmd(const char *new) {
 %token TOK_FOCUS "focus"
 %token TOK_MOVE "move"
 %token TOK_OPEN "open"
+%token TOK_NEXT "next"
 
 %token TOK_CLASS "class"
 %token TOK_ID "id"
@@ -249,6 +251,7 @@ operation:
     | kill
     | open
     | fullscreen
+    | next
     ;
 
 exec:
@@ -333,3 +336,18 @@ fullscreen:
 
     }
     ;
+
+next:
+    TOK_NEXT WHITESPACE direction
+    {
+        printf("should select next window in direction %c\n", $<chr>3);
+        tree_next('n', ($<chr>3 == 'v' ? VERT : HORIZ));
+    }
+    ;
+
+direction:
+    'h'             { $<chr>$ = 'h'; }
+    | 'horizontal'  { $<chr>$ = 'h'; }
+    | 'v'           { $<chr>$ = 'v'; }
+    | 'vertical'    { $<chr>$ = 'v'; }
+    ;

diff --git a/testcases/Makefile b/testcases/Makefile
index 0e78f6b2c131b3f11eda3664d47d72fec28b657f..f433546f44b8bd1c4cf0c0ab1cc301af8995e833 100644 (file)
--- a/testcases/Makefile
+++ b/testcases/Makefile
@@ -1,5 +1,5 @@
 test:
-       PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/03* t/05*
+       PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/21*
 
 all: test
 

diff --git a/testcases/t/21-next-prev.t b/testcases/t/21-next-prev.t
new file mode 100644 (file)
index 0000000..3759e25
--- /dev/null
+++ b/testcases/t/21-next-prev.t
@@ -0,0 +1,52 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+#
+# Tests focus switching (next/prev)
+#
+use i3test tests => 4;
+use X11::XCB qw(:all);
+use v5.10;
+
+my $i3 = i3("/tmp/nestedcons");
+
+my $tmp = get_unused_workspace();
+$i3->command("workspace $tmp")->recv;
+
+######################################################################
+# Open one container, verify that 'next v' and 'next h' do nothing
+######################################################################
+$i3->command('open')->recv;
+
+my ($nodes, $focus) = get_ws_content($tmp);
+my $old_focused = $focus->[0];
+
+$i3->command('next v')->recv;
+($nodes, $focus) = get_ws_content($tmp);
+is($focus->[0], $old_focused, 'focus did not change with only one con');
+
+$i3->command('next h')->recv;
+($nodes, $focus) = get_ws_content($tmp);
+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;
+
+($nodes, $focus) = get_ws_content($tmp);
+isnt($old_focused, $focus->[0], 'new container is focused');
+$old_focused = $focus->[0];
+
+$i3->command('next h')->recv;
+
+($nodes, $focus) = get_ws_content($tmp);
+isnt($focus->[0], $old_focused, 'focus did change');
+
+#
+# TODO: extend this test-case:
+# - implement prev
+# - wrapping (no horizontal switch possible, goes level-up)
+# - going level-up "manually"
+# - different synonyms (horizontal/vertical)
+
+diag( "Testing i3, Perl $], $^X" );

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index 68455bd2171a235987e2c70333d09ea03835a4d6..5ca84231fa488353574ddd67e4dc8a319d11a5ff 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -62,17 +62,18 @@ sub get_unused_workspace {
 
 #
 # returns the content (== tree, starting from the node of a workspace)
-# of a workspace
+# of a workspace. If called in array context, also includes the focus
+# stack of the workspace
 #
 sub get_ws_content {
     my ($name) = @_;
     my $i3 = i3("/tmp/nestedcons");
     my $tree = $i3->get_workspaces->recv;
     my @ws = map { @{$_->{nodes}} } @{$tree->{nodes}};
-    my @cons = map { $_->{nodes} } grep { $_->{name} eq $name } @ws;
+    my @cons = grep { $_->{name} eq $name } @ws;
     # as there can only be one workspace with this name, we can safely
     # return the first entry
-    return $cons[0];
+    return wantarray ? ($cons[0]->{nodes}, $cons[0]->{focus}) : $cons[0]->{nodes};
 }
 
 1