use CurrentTime again?

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index edabe350da91ca91d9a0c5705d55c069aef48b25..fa31204fc9e178494840a15b3ef2255dccd9e210 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -8,9 +8,9 @@
 #include "focus.h"
 #include "extensions.h"
 #include "gettext.h"
+#include "config.h"
 #include "grab.h"
 #include "engine.h"
-#include "themerc.h"
 #include "plugin.h"
 #include "timer.h"
 #include "../render/render.h"
@@ -49,7 +49,7 @@ State    ob_state;
 gboolean ob_shutdown = FALSE;
 gboolean ob_restart  = FALSE;
 char    *ob_restart_path = NULL;
-gboolean ob_remote   = FALSE;
+gboolean ob_remote   = TRUE;
 gboolean ob_sync     = FALSE;
 Cursors  ob_cursors;
 char    *ob_rc_path  = NULL;
@@ -143,23 +143,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();
@@ -178,8 +180,8 @@ int main(int argc, char **argv)
        screen_shutdown();
        event_shutdown();
        engine_shutdown();
-       themerc_shutdown();
        render_shutdown();
+        config_shutdown();
        timer_shutdown();
     }