nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Fix parsing symbols which contain numbers, like F1 or 1 for bindsym (Thanks Rasi)

This commit is contained in:
Michael Stapelberg 2009-09-29 11:32:57 +02:00
parent 095de9eaab
commit ff0e9bb954
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cfgparse.l
View File

@ -13,7 +13,9 @@
%} %}
%Start BIND_COND %Start BIND_COND
%Start BINDSYM_COND
%Start BIND_AWS_COND %Start BIND_AWS_COND
%Start BINDSYM_AWS_COND
%Start BIND_A2WS_COND %Start BIND_A2WS_COND
%Start ASSIGN_COND %Start ASSIGN_COND
%Start COLOR_COND %Start COLOR_COND
@ -27,7 +29,7 @@
[0-9]+ { yylval.number = atoi(yytext); return NUMBER; } [0-9]+ { yylval.number = atoi(yytext); return NUMBER; }
mode { return TOKMODE; } mode { return TOKMODE; }
bind { BEGIN(BIND_COND); return TOKBIND; } bind { BEGIN(BIND_COND); return TOKBIND; }
bindsym { BEGIN(BIND_COND); return TOKBINDSYM; } bindsym { BEGIN(BINDSYM_COND); return TOKBINDSYM; }
floating_modifier { return TOKFLOATING_MODIFIER; } floating_modifier { return TOKFLOATING_MODIFIER; }
workspace { BEGIN(INITIAL); return TOKWORKSPACE; } workspace { BEGIN(INITIAL); return TOKWORKSPACE; }
screen { BEGIN(SCREEN_COND); return TOKSCREEN; } screen { BEGIN(SCREEN_COND); return TOKSCREEN; }
@ -64,7 +66,9 @@ shift { return TOKSHIFT; }
\n /* ignore end of line */; \n /* ignore end of line */;
<SCREEN_AWS_COND>x { return (int)yytext[0]; } <SCREEN_AWS_COND>x { return (int)yytext[0]; }
<BIND_COND>[ \t]+ { BEGIN(BIND_AWS_COND); return WHITESPACE; } <BIND_COND>[ \t]+ { BEGIN(BIND_AWS_COND); return WHITESPACE; }
<BINDSYM_COND>[ \t]+ { BEGIN(BINDSYM_AWS_COND); return WHITESPACE; }
<BIND_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; } <BIND_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
<BINDSYM_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
<SCREEN_COND>[ \t]+ { BEGIN(SCREEN_AWS_COND); return WHITESPACE; } <SCREEN_COND>[ \t]+ { BEGIN(SCREEN_AWS_COND); return WHITESPACE; }
<SCREEN_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; } <SCREEN_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
[ \t]+ { return WHITESPACE; } [ \t]+ { return WHITESPACE; }
@ -78,6 +82,7 @@ shift { return TOKSHIFT; }
return QUOTEDSTRING; return QUOTEDSTRING;
} }
<ASSIGN_COND>[^ \t]+ { BEGIN(INITIAL); yylval.string = strdup(yytext); return STR_NG; } <ASSIGN_COND>[^ \t]+ { BEGIN(INITIAL); yylval.string = strdup(yytext); return STR_NG; }
<BINDSYM_AWS_COND>[a-zA-Z0-9]+ { yylval.string = strdup(yytext); return WORD; }
[a-zA-Z]+ { yylval.string = strdup(yytext); return WORD; } [a-zA-Z]+ { yylval.string = strdup(yytext); return WORD; }
. { return (int)yytext[0]; } . { return (int)yytext[0]; }
%% %%

14
src/cfgparse.y
View File

@ -250,12 +250,12 @@ bind:
; ;
bindsym: bindsym:
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>1, $2, $<string>4); printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>1, $<string>2, $<string>4);
Binding *new = scalloc(sizeof(Binding)); Binding *new = scalloc(sizeof(Binding));
new->symbol = sstrdup($2); new->symbol = sstrdup($<string>2);
new->mods = $<number>1; new->mods = $<number>1;
new->command = sstrdup($<string>4); new->command = sstrdup($<string>4);
@ -263,6 +263,14 @@ bindsym:
} }
; ;
word_or_number:
WORD
| NUMBER
{
asprintf(&$<string>$, "%d", $1);
}
;
mode: mode:
TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}' TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}'
{ {