From: Michael Stapelberg Date: Fri, 10 Jun 2011 00:15:31 +0000 (+0200) Subject: CONFIG BREAK: Rename 'restore' to 'append_layout' X-Git-Tag: tree-pr4~89 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f1385ba3d522d069d616aa5c824c5a5ed84505e0;p=i3%2Fi3 CONFIG BREAK: Rename 'restore' to 'append_layout' --- diff --git a/i3.config b/i3.config index 1ce396de..a594ea24 100644 --- a/i3.config +++ b/i3.config @@ -50,7 +50,7 @@ bindsym Mod1+u focus parent bindsym Mod1+c kill # 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 bindsym Mod1+Shift+j reload diff --git a/src/cmdparse.l b/src/cmdparse.l index 6c57984e..bc83b026 100644 --- a/src/cmdparse.l +++ b/src/cmdparse.l @@ -137,7 +137,7 @@ px { return TOK_PX; } or { return TOK_OR; } ppt { return TOK_PPT; } 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; } enable { return TOK_ENABLE; } diff --git a/src/cmdparse.y b/src/cmdparse.y index 0738d0c9..61903398 100644 --- a/src/cmdparse.y +++ b/src/cmdparse.y @@ -152,7 +152,7 @@ char *parse_cmd(const char *new) { %token TOK_RIGHT "right" %token TOK_PARENT "parent" %token TOK_CHILD "child" -%token TOK_RESTORE "restore" +%token TOK_APPEND_LAYOUT "append_layout" %token TOK_MARK "mark" %token TOK_RESIZE "resize" %token TOK_GROW "grow" @@ -339,7 +339,7 @@ operation: | reload | border | layout - | restore + | append_layout | move | workspace | focus @@ -625,8 +625,8 @@ move: } ; -restore: - TOK_RESTORE STR +append_layout: + TOK_APPEND_LAYOUT STR { printf("restoring \"%s\"\n", $2); tree_append_json($2);