X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fopenbox.c;h=24f192176ca6245e95039381f15bcfca45f7a7d1;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=04e07ab628fc1e8d73e70e2d30fbcfced47234bc;hpb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 04e07ab6..24f19217 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,20 +1,24 @@
 #include "openbox.h"
 #include "event.h"
+#include "menu.h"
 #include "client.h"
 #include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
 #include "screen.h"
 #include "focus.h"
+#include "frame.h"
 #include "extensions.h"
-#include "gettext.h"
+#include "parse.h"
 #include "grab.h"
-#include "engine.h"
-#include "themerc.h"
 #include "plugin.h"
 #include "timer.h"
-#include "../render/render.h"
-#include "../render/font.h"
+#include "group.h"
+#include "config.h"
+#include "gettext.h"
+#include "render/render.h"
+#include "render/font.h"
+#include "render/theme.h"
 
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
@@ -35,6 +39,10 @@
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
+#ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+#  include <sys/types.h>
+#endif
 
 #include <X11/cursorfont.h>
 
@@ -45,7 +53,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;
@@ -57,15 +65,17 @@ int main(int argc, char **argv)
 {
     struct sigaction action;
     sigset_t sigset;
+    char *path;
+    char *theme;
 
     ob_state = State_Starting;
 
     /* 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();
@@ -87,6 +97,17 @@ int main(int argc, char **argv)
 
     /* anything that died while we were restarting won't give us a SIGCHLD */
     while (waitpid(-1, NULL, WNOHANG) > 0);
+
+    /* create the ~/.openbox dir */
+    path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
+    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);
@@ -129,26 +150,45 @@ 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();
 	render_startup();
 	font_startup();
-	themerc_startup();
-	engine_startup(themerc_engine);
+        theme_startup();
 	event_startup();
-	screen_startup();
-	focus_startup();
-	client_startup();
         grab_startup();
         plugin_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();
+
+        /* load the theme specified in the rc file */
+        theme = theme_load(config_theme);
+        g_free(theme);
+        if (!theme) return 1;
+
+        menu_startup();
+        frame_startup();
+        stacking_startup();
+	focus_startup();
+	screen_startup();
+        group_startup();
+	client_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();
@@ -161,15 +201,19 @@ 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();
+	focus_shutdown();
+        stacking_shutdown();
+        frame_shutdown();
+        menu_shutdown();
+        grab_shutdown();
 	event_shutdown();
-	engine_shutdown();
-	themerc_shutdown();
+        theme_shutdown();
 	render_shutdown();
 	timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();
@@ -231,7 +275,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");
@@ -247,7 +291,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)