Implemented config key 'new_container'

This commit is contained in:
Simon Kampe
2011-03-23 16:11:46 +01:00
committed by Michael Stapelberg
parent 21c7a69812
commit 650eebc347
4 changed files with 26 additions and 9 deletions

View File

@ -235,7 +235,9 @@ void parse_file(const char *f) {
%token TOK_1PIXEL "1pixel"
%token TOKFOCUSFOLLOWSMOUSE "focus_follows_mouse"
%token TOKWORKSPACEBAR "workspace_bar"
%token TOKCONTAINERMODE "default/stacking/tabbed"
%token TOK_DEFAULT "default"
%token TOK_STACKING "stacking"
%token TOK_TABBED "tabbed"
%token TOKSTACKLIMIT "stack-limit"
%token TOK_POPUP_DURING_FULLSCREEN "popup_during_fullscreen"
%token TOK_IGNORE "ignore"
@ -393,10 +395,10 @@ direction:
;
new_container:
TOKNEWCONTAINER WHITESPACE TOKCONTAINERMODE
TOKNEWCONTAINER WHITESPACE layout_mode
{
DLOG("new containers will be in mode %d\n", $<number>3);
config.container_mode = $<number>3;
config.default_layout = $<number>3;
#if 0
/* We also need to change the layout of the already existing
@ -437,6 +439,12 @@ new_container:
}
;
layout_mode:
TOK_DEFAULT { $<number>$ = L_DEFAULT; }
| TOK_STACKING { $<number>$ = L_STACKED; }
| TOK_TABBED { $<number>$ = L_TABBED; }
;
new_window:
TOKNEWWINDOW WHITESPACE border_style
{