X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcfgparse.l;h=a80329fddf2b84e631bffb943d11910c77875d44;hb=a74fdc64f9647bbc12ab36a6ff4a03f7d9523869;hp=c319137bc6c3c4be6fda971e3fc6b4243f2b87ab;hpb=0ed2d62263c28dd263fa9f161c415368a26d9782;p=i3%2Fi3

diff --git a/src/cfgparse.l b/src/cfgparse.l
index c319137b..a80329fd 100644
--- a/src/cfgparse.l
+++ b/src/cfgparse.l
@@ -1,5 +1,13 @@
+%option nounput
+%option noinput
+
 %{
+/*
+ * vim:ts=8:expandtab
+ *
+ */
 #include <stdio.h>
+#include <string.h>
 #include "cfgparse.tab.h"
 #include <xcb/xcb.h>
 
@@ -8,7 +16,9 @@
 %}
 
 %Start BIND_COND
+%Start BINDSYM_COND
 %Start BIND_AWS_COND
+%Start BINDSYM_AWS_COND
 %Start BIND_A2WS_COND
 %Start ASSIGN_COND
 %Start COLOR_COND
@@ -17,11 +27,12 @@
 
 %%
 <BIND_A2WS_COND>[^\n]+          { BEGIN(INITIAL); yylval.string = strdup(yytext); return STR; }
-^#[^\n]*                        { return TOKCOMMENT; }
+^[ \t]*#[^\n]*                  { return TOKCOMMENT; }
 <COLOR_COND>[0-9a-fA-F]+        { yylval.string = strdup(yytext); return HEX; }
 [0-9]+                          { yylval.number = atoi(yytext); return NUMBER; }
+mode                            { return TOKMODE; }
 bind                            { BEGIN(BIND_COND); return TOKBIND; }
-bindsym                         { BEGIN(BIND_COND); return TOKBINDSYM; }
+bindsym                         { BEGIN(BINDSYM_COND); return TOKBINDSYM; }
 floating_modifier               { return TOKFLOATING_MODIFIER; }
 workspace                       { BEGIN(INITIAL); return TOKWORKSPACE; }
 screen                          { BEGIN(SCREEN_COND); return TOKSCREEN; }
@@ -30,14 +41,23 @@ font                            { BEGIN(BIND_AWS_COND); return TOKFONT; }
 assign                          { BEGIN(ASSIGN_COND); return TOKASSIGN; }
 set[^\n]*                       { return TOKCOMMENT; }
 ipc-socket                      { BEGIN(BIND_AWS_COND); return TOKIPCSOCKET; }
+ipc_socket                      { BEGIN(BIND_AWS_COND); return TOKIPCSOCKET; }
+new_container                   { return TOKNEWCONTAINER; }
+new_window                      { return TOKNEWWINDOW; }
+default                         { yylval.number = MODE_DEFAULT; return TOKCONTAINERMODE; }
+stacking                        { yylval.number = MODE_STACK; return TOKCONTAINERMODE; }
+tabbed                          { yylval.number = MODE_TABBED; return TOKCONTAINERMODE; }
+stack-limit                     { return TOKSTACKLIMIT; }
+cols                            { yylval.number = STACK_LIMIT_COLS; return TOKSTACKLIMIT; }
+rows                            { yylval.number = STACK_LIMIT_ROWS; return TOKSTACKLIMIT; }
 exec                            { BEGIN(BIND_AWS_COND); return TOKEXEC; }
 client.focused                  { BEGIN(COLOR_COND); yylval.color = &config.client.focused; return TOKCOLOR; }
 client.focused_inactive         { BEGIN(COLOR_COND); yylval.color = &config.client.focused_inactive; return TOKCOLOR; }
 client.unfocused                { BEGIN(COLOR_COND); yylval.color = &config.client.unfocused; return TOKCOLOR; }
 client.urgent                   { BEGIN(COLOR_COND); yylval.color = &config.client.urgent; return TOKCOLOR; }
-bar.focused                     { BEGIN(COLOR_COND); yylval.color = &config.client.focused; return TOKCOLOR; }
-bar.unfocused                   { BEGIN(COLOR_COND); yylval.color = &config.client.unfocused; return TOKCOLOR; }
-bar.urgent                      { BEGIN(COLOR_COND); yylval.color = &config.client.urgent; return TOKCOLOR; }
+bar.focused                     { BEGIN(COLOR_COND); yylval.color = &config.bar.focused; return TOKCOLOR; }
+bar.unfocused                   { BEGIN(COLOR_COND); yylval.color = &config.bar.unfocused; return TOKCOLOR; }
+bar.urgent                      { BEGIN(COLOR_COND); yylval.color = &config.bar.urgent; return TOKCOLOR; }
 Mod1                            { yylval.number = BIND_MOD1; return MODIFIER; }
 Mod2                            { yylval.number = BIND_MOD2; return MODIFIER; }
 Mod3                            { yylval.number = BIND_MOD3; return MODIFIER; }
@@ -50,7 +70,9 @@ shift                           { return TOKSHIFT; }
 \n                              /* ignore end of line */;
 <SCREEN_AWS_COND>x              { return (int)yytext[0]; }
 <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; }
+<BINDSYM_AWS_COND>[ \t]+        { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
 <SCREEN_COND>[ \t]+             { BEGIN(SCREEN_AWS_COND); return WHITESPACE; }
 <SCREEN_AWS_COND>[ \t]+         { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
 [ \t]+                          { return WHITESPACE; }
@@ -64,6 +86,7 @@ shift                           { return TOKSHIFT; }
                                   return QUOTEDSTRING;
                                 }
 <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; }
 .                               { return (int)yytext[0]; }
 %%