koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONFIG BREAK: kick the 'next'/'prev' commands, introduce 'focus left' etc.

Browse Source 
Instead of the cryptic next/prev commands, we now provide an argument to the
focus command. Userguide and default config is updated.
This commit is contained in:
Michael Stapelberg
2011-06-08 20:49:49 +02:00
parent 30501e7c8a
commit d68e4710fe
11 changed files with 66 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cmdparse.y
View File

@ -140,7 +140,6 @@ char *parse_cmd(const char *new) {
%token TOK_FOCUS "focus"
%token TOK_MOVE "move"
%token TOK_OPEN "open"
%token TOK_NEXT "next"
%token TOK_PREV "prev"
%token TOK_SPLIT "split"
%token TOK_HORIZONTAL "horizontal"
@ -333,8 +332,6 @@ operation:
| kill
| open
| fullscreen
| next
| prev
| split
| mode
| level
@ -400,6 +397,33 @@ focus:
tree_render();
}
| TOK_FOCUS direction
{
int direction = $2;
switch (direction) {
case TOK_LEFT:
LOG("Focusing left\n");
tree_next('p', HORIZ);
break;
case TOK_RIGHT:
LOG("Focusing right\n");
tree_next('n', HORIZ);
break;
case TOK_UP:
LOG("Focusing up\n");
tree_next('p', VERT);
break;
case TOK_DOWN:
LOG("Focusing down\n");
tree_next('n', VERT);
break;
default:
ELOG("Invalid focus direction (%d)\n", direction);
break;
}
tree_render();
}
;
kill:
@ -469,28 +493,6 @@ fullscreen:
}
;
next:
TOK_NEXT direction
{
/* TODO: use matches */
printf("should select next window in direction %c\n", $2);
tree_next('n', ($2 == 'v' ? VERT : HORIZ));
tree_render();
}
;
prev:
TOK_PREV direction
{
/* TODO: use matches */
printf("should select prev window in direction %c\n", $2);
tree_next('p', ($2 == 'v' ? VERT : HORIZ));
tree_render();
}
;
split:
TOK_SPLIT direction
{