X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fparse.h;h=abd5bb2d7ef718c41ba9c1a72f6e05b639ed9e83;hb=6e42b65bda1706887f3b2a7f9d79ba20f7611a06;hp=bd6c03f8bfe01ad2866edd824097bbdafd6e3b03;hpb=5da148530ee8931c8ed7771c373146afaf2b14e1;p=chaz%2Fopenbox

diff --git a/openbox/parse.h b/openbox/parse.h
index bd6c03f8..abd5bb2d 100644
--- a/openbox/parse.h
+++ b/openbox/parse.h
@@ -2,18 +2,19 @@
 #define __parse_h
 
 #include <glib.h>
+#ifndef NO_TAB_H
 #include "parse.tab.h"
+#endif
 
 typedef enum {
     TOKEN_REAL       = REAL,
     TOKEN_INTEGER    = INTEGER,
     TOKEN_STRING     = STRING,
     TOKEN_IDENTIFIER = IDENTIFIER,
-    TOKEN_BOOL       = BOOL,
+    TOKEN_BOOL       = BOOLEAN,
     TOKEN_LIST,
     TOKEN_LBRACE     = '{',
     TOKEN_RBRACE     = '}',
-    TOKEN_EQUALS     = '=',
     TOKEN_COMMA      = ',',
     TOKEN_NEWLINE    = '\n'
 } ParseTokenType;
@@ -24,6 +25,7 @@ typedef struct {
 } ParseToken;
 
 typedef void (*ParseFunc)(ParseToken *token);
+typedef void (*AssignParseFunc)(char *name, ParseToken *value);
 
 void parse_startup();
 void parse_shutdown();
@@ -33,7 +35,7 @@ void parse_shutdown();
 */
 void parse_rc();
 
-void parse_reg_section(char *section, ParseFunc func);
+void parse_reg_section(char *section, ParseFunc func, AssignParseFunc afunc);
 
 
 /* Free a parsed token's allocated memory */