do not shadow parameter pls

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 24f192176ca6245e95039381f15bcfca45f7a7d1..eeb7e0fb26a7a7111b1b02c3a84da0de78694f43 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -7,6 +7,7 @@
 #include "prop.h"
 #include "screen.h"
 #include "focus.h"
+#include "moveresize.h"
 #include "frame.h"
 #include "extensions.h"
 #include "parse.h"
@@ -144,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 */
@@ -162,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 */
@@ -319,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);
+}