X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=6cde2c0e0d70dce042e27a8ad8ee89572e4521a6;hb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;hp=2b4dddced71679ae56163f53bcb2b0c0fd55bce8;hpb=d2857b11944146e2e6973b7f7280cb57e1ee260b;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 2b4dddce..6cde2c0e 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -12,13 +12,13 @@
 #include "moveresize.h"
 #include "frame.h"
 #include "extensions.h"
-#include "parse.h"
 #include "grab.h"
 #include "plugin.h"
 #include "timer.h"
 #include "group.h"
 #include "config.h"
 #include "gettext.h"
+#include "parser/parse.h"
 #include "render/render.h"
 #include "render/font.h"
 #include "render/theme.h"
@@ -45,17 +45,18 @@
 
 #include <X11/cursorfont.h>
 
-Display *ob_display  = NULL;
-int      ob_screen;
-Window   ob_root;
-State    ob_state;
-gboolean ob_shutdown = FALSE;
-gboolean ob_restart  = FALSE;
-char    *ob_restart_path = NULL;
-gboolean ob_remote   = TRUE;
-gboolean ob_sync     = FALSE;
-Cursors  ob_cursors;
-char    *ob_rc_path  = NULL;
+RrInstance *ob_rr_inst = NULL;
+Display    *ob_display = NULL;
+int         ob_screen;
+Window      ob_root;
+State       ob_state;
+gboolean    ob_shutdown = FALSE;
+gboolean    ob_restart  = FALSE;
+char       *ob_restart_path = NULL;
+gboolean    ob_remote   = TRUE;
+gboolean    ob_sync     = FALSE;
+Cursors     ob_cursors;
+char       *ob_rc_path  = NULL;
 
 void signal_handler(const ObEvent *e, void *data);
 void parse_args(int argc, char **argv);
@@ -66,6 +67,8 @@ int main(int argc, char **argv)
     sigset_t sigset;
     char *path;
     char *theme;
+    xmlDocPtr doc;
+    xmlNodePtr node;
 
     ob_state = State_Starting;
 
@@ -126,6 +129,12 @@ int main(int argc, char **argv)
     ob_screen = DefaultScreen(ob_display);
     ob_root = RootWindow(ob_display, ob_screen);
 
+    ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
+    if (ob_rr_inst == NULL) {
+        g_critical("Failed to initialize the render library.");
+        exit(1);
+    }
+
     /* XXX fork self onto other screens */
      
     XSynchronize(ob_display, ob_sync);
@@ -168,9 +177,8 @@ int main(int argc, char **argv)
         /* anything that is going to read data from the rc file needs to be 
            in this group */
 	timer_startup();
-	render_startup();
 	font_startup();
-        theme_startup();
+        theme_startup(ob_rr_inst);
 	event_startup();
         grab_startup();
         plugin_startup();
@@ -180,7 +188,8 @@ int main(int argc, char **argv)
         /* set up the kernel config shit */
         config_startup();
         /* parse/load user options */
-        parse_config();
+        if (parse_load_rc(&doc, &node))
+            parse_tree(doc, node->xmlChildrenNode, NULL);
         /* we're done with parsing now, kill it */
         parse_shutdown();
 
@@ -226,13 +235,13 @@ int main(int argc, char **argv)
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();
-	render_shutdown();
 	timer_shutdown();
         config_shutdown();
     }
 
     dispatch_shutdown();
 
+    RrInstanceFree(ob_rr_inst);
     XCloseDisplay(ob_display);
 
     if (ob_restart) {