X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=117349f23972910cb05c2f7d3844deb0e94473e2;hb=506c1aa005d0328d4d32e123d437c6afe92b8ea4;hp=b32977b13d7260ed8352eb121938208a14961ac5;hpb=9f68b12062bfa5e68c00db8a74ca58998661a13b;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index b32977b1..117349f2 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -11,7 +11,6 @@
 #include "config.h"
 #include "grab.h"
 #include "engine.h"
-#include "themerc.h"
 #include "plugin.h"
 #include "timer.h"
 #include "../render/render.h"
@@ -50,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;
@@ -99,6 +98,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);
@@ -147,23 +151,22 @@ int main(int argc, char **argv)
         config_startup();
 	render_startup();
 	font_startup();
-	themerc_startup();
+        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");
-
-        config_parse();
+        /* call startup for all the plugins */
+        plugin_startall();
 
 	/* get all the existing windows */
 	client_manage_all();
@@ -182,7 +185,6 @@ int main(int argc, char **argv)
 	screen_shutdown();
 	event_shutdown();
 	engine_shutdown();
-	themerc_shutdown();
 	render_shutdown();
         config_shutdown();
 	timer_shutdown();