put the render theme into a struct

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 304d52c6f27abe3c7332458bdec5a82bd509af0b..d63c67b8bbbc9c9a784360eea11f417ad0d5a105 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,5 @@
 #include "openbox.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -11,15 +12,14 @@
 #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"
 
 #ifdef HAVE_FCNTL_H
@@ -44,17 +44,19 @@
 
 #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;
+RrTheme    *ob_rr_theme = 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);
@@ -64,7 +66,8 @@ int main(int argc, char **argv)
     struct sigaction action;
     sigset_t sigset;
     char *path;
-    char *theme;
+    xmlDocPtr doc;
+    xmlNodePtr node;
 
     ob_state = State_Starting;
 
@@ -117,10 +120,20 @@ 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);
 
+    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);
@@ -139,6 +152,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);
@@ -162,9 +176,7 @@ 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();
        event_startup();
         grab_startup();
         plugin_startup();
@@ -174,23 +186,27 @@ 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();
 
         /* load the theme specified in the rc file */
-        theme = theme_load(config_theme);
-        g_free(theme);
-        if (!theme) return 1;
+        ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+        if (ob_rr_theme == NULL) {
+            g_critical("Unable to load a theme.");
+            exit(1);
+        }
 
+        window_startup();
         menu_startup();
         frame_startup();
-        stacking_startup();
         moveresize_startup();
        focus_startup();
        screen_startup();
         group_startup();
        client_startup();
+        dock_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -203,27 +219,29 @@ int main(int argc, char **argv)
            event_loop();
        ob_state = State_Exiting;
 
+        dock_remove_all();
        client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        dock_shutdown();
        client_shutdown();
         group_shutdown();
        screen_shutdown();
        focus_shutdown();
         moveresize_shutdown();
-        stacking_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
        event_shutdown();
-        theme_shutdown();
-       render_shutdown();
        timer_shutdown();
         config_shutdown();
     }
 
     dispatch_shutdown();
 
+    RrThemeFree(ob_rr_theme);
+    RrInstanceFree(ob_rr_inst);
     XCloseDisplay(ob_display);
 
     if (ob_restart) {
@@ -271,7 +289,8 @@ void signal_handler(const ObEvent *e, void *data)
 
     case SIGFPE:
     case SIGSEGV:
-       g_error("Caught signal %d. Aborting and dumping core.", s);
+       g_message("Caught signal %d. Aborting and dumping core.", s);
+        abort();
     }
 }