group next/prev commands together

[chaz/openbox] / util / epist / epist.l

diff --git a/util/epist/epist.l b/util/epist/epist.l
index 6e3914cbcc7e46dea498e404ec97608f3af3b742..146d4b0eb71d1796bb591e0b8a7bf53b27fe9022 100644 (file)
--- a/util/epist/epist.l
+++ b/util/epist/epist.l
@@ -1,6 +1,10 @@
 %{
 #include <stdio.h>
+#include <string.h>
 #include "yacc_parser.hh"
+
+extern YYSTYPE yylval;
+    
 %}
 
 %%
@@ -9,54 +13,15 @@
 \}                  return EBRACE;
 ;                   return SEMICOLON;
 -                   return DASH;
-noaction |
-execute |
-iconify |
-raise |
-lower |
-close |
-toggleshade |
-toggleomnipresent |
-moveWindowUp |
-moveWindowDown |
-moveWindowLeft |
-moveWindowRight |
-resizeWindowWidth |
-resizeWindowHeight |
-toggleMaximizeFull |
-toggleMaximizeVertical |
-toggleMaximizeHorizontal |
-sendToWorkspace |
-nextWindow |
-prevWindow |
-nextWindowOnAllWorkspaces |
-prevWindowOnAllWorkspaces |
-nextWindowOnAllScreens |
-prevWindowOnAllScreens |
-nextWindowOfClass |
-prevWindowOfClass |
-nextWindowOfClassOnAllWorkspaces |
-prevWindowOfClassOnAllWorkspaces |
-changeWorkspace |
-nextWorkspace |
-prevWorkspace |
-nextScreen |
-prevScreen |
-showRootMenu |
-showWorkspaceMenu |
-stringChain |
-keyChain |
-numberChain |
-cancel              yylval = strdup(yytext); return ACTION;
 Mod1 |
 Mod2 |
 Mod3 |
 Mod4 |
 Control |
-Shift               yylval = strdup(yytext); return BINDING;
-[0-9]+              yylval = strdup(yytext); return NUMBER;
-\".+\"              yylval = strdup(yytext); return QUOTES;
-[a-zA-Z_0-9]+       yylval = strdup(yytext); return WORD;
+Shift               yylval = (int) strdup(yytext); return BINDING;
+[0-9]+              yylval = (int) strdup(yytext); return NUMBER;
+\".+\"              yylval = (int) strdup(yytext); return QUOTES;
+[a-zA-Z_0-9]+       yylval = (int) strdup(yytext); return WORD;
 #.+\n               /* ignore */
 \n                  /* ignore */
 [ \t]+              /* */