X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=6645f5bbf8bf9e2d899fbe8f51675a42d6bb9e67;hb=3cc402bd567974c99edf8e3334d3c48103d06fc7;hp=edabe350da91ca91d9a0c5705d55c069aef48b25;hpb=78aa056eeb1dc2900cc18b8f8c6baabf453fd370;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index edabe350..6645f5bb 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -8,6 +8,7 @@
 #include "focus.h"
 #include "extensions.h"
 #include "gettext.h"
+#include "config.h"
 #include "grab.h"
 #include "engine.h"
 #include "themerc.h"
@@ -143,23 +144,25 @@ int main(int argc, char **argv)
      
     if (screen_annex()) { /* it will be ours! */
 	timer_startup();
+        config_startup();
 	render_startup();
 	font_startup();
-	themerc_startup();
-	engine_startup(themerc_engine);
+        plugin_startup();
+
+        /* load the plugins specified in the pluginrc */
+        plugin_loadall();
+        /* parse/load user options */
+        config_parse();
+
+	engine_startup();
 	event_startup();
 	screen_startup();
 	focus_startup();
 	client_startup();
         grab_startup();
-        plugin_startup();
 
-        /* XXX load all plugins!! */
-        plugin_open("focus");
-        plugin_open("keyboard");
-        plugin_open("mouse");
-        plugin_open("placement");
-        plugin_open("resistance");
+        /* call startup for all the plugins */
+        plugin_startall();
 
 	/* get all the existing windows */
 	client_manage_all();
@@ -180,6 +183,7 @@ int main(int argc, char **argv)
 	engine_shutdown();
 	themerc_shutdown();
 	render_shutdown();
+        config_shutdown();
 	timer_shutdown();
     }