move config option loading for the kernel into config.c/h

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 117349f23972910cb05c2f7d3844deb0e94473e2..c4784aff5ef96dab4a887c173998e51fbf5cffa3 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -7,12 +7,14 @@
 #include "screen.h"
 #include "focus.h"
 #include "extensions.h"
-#include "gettext.h"
-#include "config.h"
+#include "parse.h"
 #include "grab.h"
 #include "engine.h"
 #include "plugin.h"
 #include "timer.h"
+#include "group.h"
+#include "config.h"
+#include "gettext.h"
 #include "../render/render.h"
 #include "../render/font.h"
 
@@ -68,9 +70,9 @@ int main(int argc, char **argv)
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
        g_warning("Couldn't set locale from environment.\n");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    bind_textdomain_codeset(PACKAGE, "UTF-8");
-    textdomain(PACKAGE);
+    bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+    bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+    textdomain(PACKAGE_NAME);
 
     /* start our event dispatcher and register for signals */
     dispatch_startup();
@@ -145,25 +147,37 @@ 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! */
+        /* startup the parsing so everything can register sections of the rc */
+        parse_startup();
+
+        /* anything that is going to read data from the rc file needs to be 
+           in this group */
        timer_startup();
-        config_startup();
        render_startup();
        font_startup();
+       event_startup();
+        grab_startup();
+        engine_startup();
         plugin_startup();
-
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
+
+        /* set up the kernel config shit */
+        config_startup();
         /* parse/load user options */
-        config_parse();
+        parse_rc();
+        /* we're done with parsing now, kill it */
+        parse_shutdown();
+
+        /* load the engine specified in the rc */
+       engine_load();
 
-       engine_startup();
-       event_startup();
-       screen_startup();
        focus_startup();
+       screen_startup();
+        group_startup();
        client_startup();
-        grab_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -179,15 +193,16 @@ int main(int argc, char **argv)
        client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
-        grab_shutdown();
        client_shutdown();
-       focus_shutdown();
+        group_shutdown();
        screen_shutdown();
-       event_shutdown();
+       focus_shutdown();
        engine_shutdown();
+        grab_shutdown();
+       event_shutdown();
        render_shutdown();
-        config_shutdown();
        timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();
@@ -249,7 +264,7 @@ void signal_handler(const ObEvent *e, void *data)
 
 void print_version()
 {
-    g_print("Openbox %s\n\n", VERSION);
+    g_print("Openbox %s\n\n", PACKAGE_VERSION);
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");
@@ -265,7 +280,7 @@ void print_help()
     g_print("  -version     Display the version and exit\n");
     g_print("  -sync        Run in synchronous mode (this is slow and meant\n"
             "               for debugging X routines)\n");
-    g_print("\nPlease report bugs at %s\n", BUGURL);
+    g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
 }
 
 void parse_args(int argc, char **argv)