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

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; }

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'; }
;