extern int yylex(void);
extern FILE *yyin;
+static struct bindings_head *current_bindings;
+
int yydebug = 1;
void yyerror(const char *str) {
/* Then, allocate a new buffer and copy the file over to the new one,
* but replace occurences of our variables */
char *walk = buf, *destwalk;
- char *new = smalloc((stbuf.st_size + extra_bytes) * sizeof(char));
+ char *new = smalloc((stbuf.st_size + extra_bytes + 1) * sizeof(char));
destwalk = new;
while (walk < (buf + stbuf.st_size)) {
/* Find the next variable */
int number;
char *string;
struct Colortriple *color;
- struct Assignment *assignment;
+ struct Assignment *assignment;
+ struct Binding *binding;
}
%token <number>NUMBER
%token TOKEXEC
%token TOKCOLOR
%token TOKARROW
+%token TOKMODE
+%token TOKNEWCONTAINER
+%token TOKCONTAINERMODE
+%token TOKSTACKLIMIT
%%
;
line:
- bind
- | bindsym
+ bindline
+ | mode
| floating_modifier
+ | new_container
| workspace
| assign
| ipcsocket
STR
;
+bindline:
+ binding
+ {
+ TAILQ_INSERT_TAIL(bindings, $<binding>1, bindings);
+ }
+ ;
+
+binding:
+ TOKBIND WHITESPACE bind { $<binding>$ = $<binding>3; }
+ | TOKBINDSYM WHITESPACE bindsym { $<binding>$ = $<binding>3; }
+ ;
+
bind:
- TOKBIND WHITESPACE binding_modifiers NUMBER WHITESPACE command
+ binding_modifiers NUMBER WHITESPACE command
{
- printf("\tFound binding mod%d with key %d and command %s\n", $<number>3, $4, $<string>6);
+ printf("\tFound binding mod%d with key %d and command %s\n", $<number>1, $2, $<string>4);
Binding *new = scalloc(sizeof(Binding));
- new->keycode = $<number>4;
- new->mods = $<number>3;
- new->command = sstrdup($<string>6);
+ new->keycode = $<number>2;
+ new->mods = $<number>1;
+ new->command = sstrdup($<string>4);
- TAILQ_INSERT_TAIL(&bindings, new, bindings);
+ $<binding>$ = new;
}
;
bindsym:
- TOKBINDSYM WHITESPACE binding_modifiers WORD WHITESPACE command
+ binding_modifiers word_or_number WHITESPACE command
{
- printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>3, $4, $<string>6);
+ printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>1, $<string>2, $<string>4);
Binding *new = scalloc(sizeof(Binding));
- new->symbol = sstrdup($4);
- new->mods = $<number>3;
- new->command = sstrdup($<string>6);
+ new->symbol = sstrdup($<string>2);
+ new->mods = $<number>1;
+ new->command = sstrdup($<string>4);
+
+ $<binding>$ = new;
+ }
+ ;
+
+word_or_number:
+ WORD
+ | NUMBER
+ {
+ asprintf(&$<string>$, "%d", $1);
+ }
+ ;
+
+mode:
+ TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}'
+ {
+ if (strcasecmp($<string>3, "default") == 0) {
+ printf("You cannot use the name \"default\" for your mode\n");
+ exit(1);
+ }
+ printf("\t now in mode %s\n", $<string>3);
+ printf("\t current bindings = %p\n", current_bindings);
+ Binding *binding;
+ TAILQ_FOREACH(binding, current_bindings, bindings) {
+ printf("got binding on mods %d, keycode %d, symbol %s, command %s\n",
+ binding->mods, binding->keycode, binding->symbol, binding->command);
+ }
+
+ struct Mode *mode = scalloc(sizeof(struct Mode));
+ mode->name = strdup($<string>3);
+ mode->bindings = current_bindings;
+ current_bindings = NULL;
+ SLIST_INSERT_HEAD(&modes, mode, modes);
+ }
+ ;
+
+modelines:
+ /* empty */
+ | modelines WHITESPACE modeline
+ | modelines modeline
+ ;
+
+modeline:
+ comment
+ | binding
+ {
+ if (current_bindings == NULL) {
+ current_bindings = scalloc(sizeof(struct bindings_head));
+ TAILQ_INIT(current_bindings);
+ }
- TAILQ_INSERT_TAIL(&bindings, new, bindings);
+ TAILQ_INSERT_TAIL(current_bindings, $<binding>1, bindings);
}
;
}
;
+new_container:
+ TOKNEWCONTAINER WHITESPACE TOKCONTAINERMODE
+ {
+ LOG("new containers will be in mode %d\n", $<number>3);
+ config.container_mode = $<number>3;
+
+ /* We also need to change the layout of the already existing
+ * workspaces here. Workspaces may exist at this point because
+ * of the other directives which are modifying workspaces
+ * (setting the preferred screen or name). While the workspace
+ * objects are already created, they have never been used.
+ * Thus, the user very likely awaits the default container mode
+ * to trigger in this case, regardless of where it is inside
+ * his configuration file. */
+ Workspace *ws;
+ TAILQ_FOREACH(ws, workspaces, workspaces) {
+ if (ws->table == NULL)
+ continue;
+ switch_layout_mode(global_conn,
+ ws->table[0][0],
+ config.container_mode);
+ }
+ }
+ | TOKNEWCONTAINER WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
+ {
+ LOG("stack-limit %d with val %d\n", $<number>5, $<number>7);
+ config.container_stack_limit = $<number>5;
+ config.container_stack_limit_value = $<number>7;
+
+ /* See the comment above */
+ Workspace *ws;
+ TAILQ_FOREACH(ws, workspaces, workspaces) {
+ if (ws->table == NULL)
+ continue;
+ Container *con = ws->table[0][0];
+ con->stack_limit = config.container_stack_limit;
+ con->stack_limit_value = config.container_stack_limit_value;
+ }
+ }
+ ;
+
workspace:
TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen workspace_name
{
int ws_num = $<number>3;
- if (ws_num < 1 || ws_num > 10) {
+ if (ws_num < 1) {
LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else {
- workspaces[ws_num - 1].preferred_screen = sstrdup($<string>7);
+ Workspace *ws = workspace_get(ws_num - 1);
+ ws->preferred_screen = sstrdup($<string>7);
if ($<string>8 != NULL)
- workspace_set_name(&(workspaces[ws_num - 1]), $<string>8);
+ workspace_set_name(ws, $<string>8);
}
}
- | TOKWORKSPACE WHITESPACE NUMBER workspace_name
- {
+ | TOKWORKSPACE WHITESPACE NUMBER workspace_name
+ {
int ws_num = $<number>3;
- if (ws_num < 1 || ws_num > 10) {
+ if (ws_num < 1) {
LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else {
- if ($<string>4 != NULL)
- workspace_set_name(&(workspaces[ws_num - 1]), $<string>4);
- }
- }
+ if ($<string>4 != NULL)
+ workspace_set_name(workspace_get(ws_num - 1), $<string>4);
+ }
+ }
;
workspace_name:
{
printf("assignment of %s to %d\n", $<string>3, $<number>6);
- struct Assignment *new = $<assignment>6;
- new->windowclass_title = strdup($<string>3);
- TAILQ_INSERT_TAIL(&assignments, new, assignments);
+
struct Assignment *new = $<assignment>6;
+ new->windowclass_title = strdup($<string>3);
+ TAILQ_INSERT_TAIL(&assignments, new, assignments);
}
;
assign_target:
- NUMBER
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->workspace = $<number>1;
- new->floating = ASSIGN_FLOATING_NO;
- $<assignment>$ = new;
- }
- | '~'
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->floating = ASSIGN_FLOATING_ONLY;
- $<assignment>$ = new;
- }
- | '~' NUMBER
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->workspace = $<number>2;
- new->floating = ASSIGN_FLOATING;
- $<assignment>$ = new;
- }
- ;
+ NUMBER
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->workspace = $<number>1;
+ new->floating = ASSIGN_FLOATING_NO;
+ }
+ | '~'
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->floating = ASSIGN_FLOATING_ONLY;
+ }
+ | '~' NUMBER
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->workspace = $<number>2;
+ new->floating = ASSIGN_FLOATING;
+ }
+ ;
window_class:
QUOTEDSTRING
projects / i3 / i3 / blobdiff