mirrors
/
i3
mirror of https://github.com/i3/i3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CONFIG BREAK: Rename 'restore' to 'append_layout'

This commit is contained in:
Michael Stapelberg 2011-06-10 02:15:31 +02:00
parent bd49c80d5f
commit f1385ba3d5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3.config
View File

@ -50,7 +50,7 @@ bindsym Mod1+u focus parent
bindsym Mod1+c kill bindsym Mod1+c kill
# Restore saved JSON layout # Restore saved JSON layout
bindsym Mod1+y restore /home/michael/i3/layout.json bindsym Mod1+y append_layout /home/michael/i3/layout.json
# Reload the configuration file # Reload the configuration file
bindsym Mod1+Shift+j reload bindsym Mod1+Shift+j reload

2
src/cmdparse.l
View File

@ -137,7 +137,7 @@ px { return TOK_PX; }
or { return TOK_OR; } or { return TOK_OR; }
ppt { return TOK_PPT; } ppt { return TOK_PPT; }
nop { WS_STRING; return TOK_NOP; } nop { WS_STRING; return TOK_NOP; }
restore { WS_STRING; return TOK_RESTORE; } append_layout { WS_STRING; return TOK_APPEND_LAYOUT; }
mark { WS_STRING; return TOK_MARK; } mark { WS_STRING; return TOK_MARK; }
enable { return TOK_ENABLE; } enable { return TOK_ENABLE; }

8
src/cmdparse.y
View File

@ -152,7 +152,7 @@ char *parse_cmd(const char *new) {
%token TOK_RIGHT "right" %token TOK_RIGHT "right"
%token TOK_PARENT "parent" %token TOK_PARENT "parent"
%token TOK_CHILD "child" %token TOK_CHILD "child"
%token TOK_RESTORE "restore" %token TOK_APPEND_LAYOUT "append_layout"
%token TOK_MARK "mark" %token TOK_MARK "mark"
%token TOK_RESIZE "resize" %token TOK_RESIZE "resize"
%token TOK_GROW "grow" %token TOK_GROW "grow"
@ -339,7 +339,7 @@ operation:
| reload | reload
| border | border
| layout | layout
| restore | append_layout
| move | move
| workspace | workspace
| focus | focus
@ -625,8 +625,8 @@ move:
} }
; ;
restore: append_layout:
TOK_RESTORE STR TOK_APPEND_LAYOUT STR
{ {
printf("restoring \"%s\"\n", $2); printf("restoring \"%s\"\n", $2);
tree_append_json($2); tree_append_json($2);