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

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 134070ad..eeb7e0fb 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,11 +1,13 @@
 #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"
@@ -143,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 */
@@ -161,6 +166,7 @@ int main(int argc, char **argv)
 	font_startup();
         theme_startup();
 	event_startup();
+        moveresize_startup();
         grab_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
@@ -178,7 +184,9 @@ int main(int argc, char **argv)
         g_free(theme);
         if (!theme) return 1;
 
+        menu_startup();
         frame_startup();
+        stacking_startup();
 	focus_startup();
 	screen_startup();
         group_startup();
@@ -202,7 +210,9 @@ int main(int argc, char **argv)
         group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
+        stacking_shutdown();
         frame_shutdown();
+        menu_shutdown();
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();
@@ -314,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);
+}