X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=134070ade73c111a05b27092ab6a1757fb52e894;hb=5a9578626392cd579ec3065c802dda2cbc7d0bf3;hp=e2a4de3fdbd2cc528af3cb3aa5302b21757ed7b4;hpb=d77ac21a62d4e57dd39de6a707ca1d278cbb1e0a;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index e2a4de3f..134070ad 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -6,16 +6,18 @@
 #include "prop.h"
 #include "screen.h"
 #include "focus.h"
+#include "frame.h"
 #include "extensions.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"
+#include "render/render.h"
+#include "render/font.h"
+#include "render/theme.h"
 
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
@@ -63,6 +65,7 @@ int main(int argc, char **argv)
     struct sigaction action;
     sigset_t sigset;
     char *path;
+    char *theme;
 
     ob_state = State_Starting;
 
@@ -148,28 +151,37 @@ int main(int argc, char **argv)
     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();
+        theme_startup();
 	event_startup();
         grab_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();
+
+        /* set up the kernel config shit */
+        config_startup();
         /* parse/load user options */
         parse_rc();
-
         /* we're done with parsing now, kill it */
         parse_shutdown();
 
-	engine_startup();
-	screen_startup();
+        /* load the theme specified in the rc file */
+        theme = theme_load(config_theme);
+        g_free(theme);
+        if (!theme) return 1;
+
+        frame_startup();
 	focus_startup();
+	screen_startup();
+        group_startup();
 	client_startup();
 
         /* call startup for all the plugins */
@@ -187,14 +199,16 @@ int main(int argc, char **argv)
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
 	client_shutdown();
-	focus_shutdown();
+        group_shutdown();
 	screen_shutdown();
-	engine_shutdown();
+	focus_shutdown();
+        frame_shutdown();
         grab_shutdown();
 	event_shutdown();
+        theme_shutdown();
 	render_shutdown();
-        config_shutdown();
 	timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();