X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=eeb7e0fb26a7a7111b1b02c3a84da0de78694f43;hb=95b1cd01669f9867511f9a65ce01e4404e5800b3;hp=3d4db6f95ba7c989ec7617ef28240187436991ad;hpb=bd12517c615d661fa2823f85bbbcb48555f7c3db;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3d4db6f9..eeb7e0fb 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,20 +1,25 @@
 #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 "moveresize.h"
+#include "frame.h"
 #include "extensions.h"
 #include "parse.h"
 #include "grab.h"
-#include "engine.h"
 #include "plugin.h"
 #include "timer.h"
+#include "group.h"
+#include "config.h"
 #include "gettext.h"
-#include "../render/render.h"
-#include "../render/font.h"
+#include "render/render.h"
+#include "render/font.h"
+#include "render/theme.h"
 
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
@@ -62,6 +67,7 @@ int main(int argc, char **argv)
     struct sigaction action;
     sigset_t sigset;
     char *path;
+    char *theme;
 
     ob_state = State_Starting;
 
@@ -139,9 +145,12 @@ int main(int argc, char **argv)
        display we're using, so they open in the right place. */
     putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
 
-    ob_cursors.left_ptr = XCreateFontCursor(ob_display, XC_left_ptr);
-    ob_cursors.ll_angle = XCreateFontCursor(ob_display, XC_ll_angle);
-    ob_cursors.lr_angle = XCreateFontCursor(ob_display, XC_lr_angle);
+    ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
+    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);
+    ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner);
+    ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner);
 
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
@@ -155,23 +164,32 @@ int main(int argc, char **argv)
 	timer_startup();
 	render_startup();
 	font_startup();
+        theme_startup();
 	event_startup();
+        moveresize_startup();
         grab_startup();
-        engine_startup();
-	focus_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 engine specified in the rc */
-	engine_load();
+        /* 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();
 
         /* call startup for all the plugins */
@@ -189,13 +207,18 @@ int main(int argc, char **argv)
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
 	client_shutdown();
+        group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
-	engine_shutdown();
+        stacking_shutdown();
+        frame_shutdown();
+        menu_shutdown();
         grab_shutdown();
 	event_shutdown();
+        theme_shutdown();
 	render_shutdown();
 	timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();
@@ -301,3 +324,12 @@ void parse_args(int argc, char **argv)
         }
     }
 }
+
+gboolean ob_pointer_pos(int *x, int *y)
+{
+    Window w;
+    int i;
+    guint u;
+
+    return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
+}