X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=0455e88c523406e929a1aba28a4745d89550b72a;hb=05e52e3c8e7d694b2ec977279655d467db4c07c6;hp=93e91a59816d0a64f2980e992fa511df5d51e5b2;hpb=b77e40e1c7710323aa59a778338d8e18b591f718;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 93e91a59..0455e88c 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"
@@ -66,6 +66,8 @@ int main(int argc, char **argv)
     sigset_t sigset;
     char *path;
     char *theme;
+    xmlDocPtr doc;
+    xmlNodePtr node;
 
     ob_state = State_Starting;
 
@@ -118,7 +120,11 @@ int main(int argc, char **argv)
 	g_critical("Failed to set display as close-on-exec.");
 	exit(1);
     }
-	  
+
+#ifdef USE_LIBSN
+    ob_sn_display = sn_display_new(ob_display, NULL, NULL);
+#endif
+
     ob_screen = DefaultScreen(ob_display);
     ob_root = RootWindow(ob_display, ob_screen);
 
@@ -140,6 +146,7 @@ int main(int argc, char **argv)
     putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
 
     ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
+    ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch);
     ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur);
     ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner);
     ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
@@ -175,7 +182,8 @@ int main(int argc, char **argv)
         /* set up the kernel config shit */
         config_startup();
         /* parse/load user options */
-        parse_rc();
+        if (parse_load_rc(&doc, &node))
+            parse_tree(doc, node->xmlChildrenNode, NULL);
         /* we're done with parsing now, kill it */
         parse_shutdown();