BREAKS CONFIG: rename 'level up' to 'focus parent'

…and 'level down' to 'focus child'. More intuitive than the old command names.
This commit is contained in:
Michael Stapelberg
2011-06-10 01:36:33 +02:00
parent adb6d9630c
commit 9bbb37bb55
9 changed files with 35 additions and 36 deletions

View File

@ -144,11 +144,12 @@ char *parse_cmd(const char *new) {
%token TOK_SPLIT "split"
%token TOK_HORIZONTAL "horizontal"
%token TOK_VERTICAL "vertical"
%token TOK_LEVEL "level"
%token TOK_UP "up"
%token TOK_DOWN "down"
%token TOK_LEFT "left"
%token TOK_RIGHT "right"
%token TOK_PARENT "parent"
%token TOK_CHILD "child"
%token TOK_RESTORE "restore"
%token TOK_MARK "mark"
%token TOK_RESIZE "resize"
@ -168,7 +169,7 @@ char *parse_cmd(const char *new) {
%token <number> NUMBER "<number>"
%type <number> direction
%type <chr> level_direction
%type <number> level
%type <number> window_mode
%type <number> border_style
%type <number> layout_mode
@ -345,7 +346,6 @@ operation:
| fullscreen
| split
| mode
| level
| mark
| resize
| nop
@ -441,6 +441,19 @@ focus:
tree_render();
}
| TOK_FOCUS level
{
if ($2 == TOK_PARENT)
level_up();
else level_down();
tree_render();
}
;
level:
TOK_PARENT { $$ = TOK_PARENT; }
| TOK_CHILD { $$ = TOK_CHILD; }
;
kill:
@ -582,24 +595,6 @@ border_style:
| TOK_1PIXEL { $$ = BS_1PIXEL; }
;
level:
TOK_LEVEL level_direction
{
printf("level %c\n", $2);
if ($2 == 'u')
level_up();
else level_down();
tree_render();
}
;
level_direction:
TOK_UP { $$ = 'u'; }
| TOK_DOWN { $$ = 'd'; }
;
move:
TOK_MOVE direction
{