Update to new theme

1 files changed, 13 insertions, 4 deletions

diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l
index 90e66b39..8a747545 100644
--- a/lexer/theme-lexer.l
+++ b/lexer/theme-lexer.l
@@ -24,13 +24,22 @@ int yylex(void);
 (true|false)        { yylval.bval= g_strcmp0(yytext, "true") == 0; return T_BOOLEAN;}
 [_\-a-zA-Z0-9]+        { yylval.sval = g_strdup(yytext); return N_STRING;}
 \"[_\-a-zA-Z0-9 \t]+\"    { yytext[yyleng-1] = '\0'; yylval.sval = g_strdup(&yytext[1]); return T_STRING;}
-#[0-9A-Fa-f]+       {
-    union {  unsigned int val; struct { unsigned char a,r,g,b;};} val;
+#[0-9A-Fa-f]{8}       {
+    union {  unsigned int val; struct { unsigned char b,g,r,a;};} val;
     val.val = (unsigned int)strtoull ( &yytext[1], NULL, 16);
     yylval.colorval.alpha = val.a/255.0;
-    yylval.colorval.red = val.r/255.0;
+    yylval.colorval.red   = val.r/255.0;
     yylval.colorval.green = val.g/255.0;
-    yylval.colorval.blue = val.b/255.0;
+    yylval.colorval.blue  = val.b/255.0;
+    return T_COLOR;
+}
+#[0-9A-Fa-f]{6}       {
+    union {  unsigned int val; struct { unsigned char b,g,r,a;};} val;
+    val.val = (unsigned int)strtoull ( &yytext[1], NULL, 16);
+    yylval.colorval.alpha = 1.0; 
+    yylval.colorval.red   = val.r/255.0;
+    yylval.colorval.green = val.g/255.0;
+    yylval.colorval.blue  = val.b/255.0;
     return T_COLOR;
 }
     [\r\n]+		;