create a generic tokenizer/sectionizer for the config file. pass off the token to...

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index fa31204fc9e178494840a15b3ef2255dccd9e210..a7357b2ffe2ff3b2513383b73b01864d66e4dd3d 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -9,6 +9,7 @@
 #include "extensions.h"
 #include "gettext.h"
 #include "config.h"
+#include "parse.h"
 #include "grab.h"
 #include "engine.h"
 #include "plugin.h"
@@ -98,6 +99,11 @@ int main(int argc, char **argv)
     mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
                  S_IROTH | S_IWOTH | S_IXOTH));
     g_free(path);
+    /* create the ~/.openbox/themes dir */
+    path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL);
+    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
+                 S_IROTH | S_IWOTH | S_IXOTH));
+    g_free(path);
      
     /* parse out command line args */
     parse_args(argc, argv);
@@ -140,7 +146,7 @@ int main(int argc, char **argv)
 
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
-     
+
     if (screen_annex()) { /* it will be ours! */
        timer_startup();
         config_startup();
@@ -148,10 +154,16 @@ int main(int argc, char **argv)
        font_startup();
         plugin_startup();
 
+        /* startup the parsing so plugins can register sections of the rc */
+        parse_startup();
+
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
         /* parse/load user options */
-        config_parse();
+        parse_rc();
+
+        /* we're done with parsing now, kill it */
+        parse_shutdown();
 
        engine_startup();
        event_startup();