oops extra menu_layout

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 67863d17dfded474f33af7c078a0d67f7e68e25f..58c5b2e5943754bf050f18cdc086a1a94f1adc9d 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -257,7 +257,7 @@ void screen_resize()
     PROP_SETA32(RootWindow(ob_display, ob_screen),
                 net_desktop_geometry, cardinal, geometry, 2);
 
-    if (ob_state == OB_STATE_STARTING)
+    if (ob_state() == OB_STATE_STARTING)
        return;
 
     dock_configure();
@@ -807,3 +807,13 @@ static void sn_event_func(SnMonitorEvent *ev, void *data)
         set_root_cursor();
 }
 #endif
+
+gboolean screen_pointer_pos(int *x, int *y)
+{
+    Window w;
+    int i;
+    guint u;
+
+    return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
+                           &w, &w, x, y, &i, &i, &u);
+}