X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fgrab.c;h=2d8877841fd1145de68b7eb59fbceb21291f460a;hb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;hp=7cb553a21078f6010e53d77b1dfa22603bf01619;hpb=f6b19a1dc415b522850df324ee5148cab0a15e9b;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 7cb553a2..2d887784 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -20,8 +20,9 @@ gboolean grab_keyboard(gboolean grab)
 
     if (grab) {
         if (kgrabs++ == 0)
-            ret = XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
-                                GrabModeAsync, event_lasttime) == Success;
+            ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
+                                FALSE, GrabModeAsync, GrabModeAsync,
+                                event_lasttime) == Success;
         else
             ret = TRUE;
     } else if (kgrabs > 0) {
@@ -32,16 +33,17 @@ gboolean grab_keyboard(gboolean grab)
     return ret;
 }
 
-gboolean grab_pointer(gboolean grab, Cursor cur)
+gboolean grab_pointer(gboolean grab, ObCursor cur)
 {
     static guint pgrabs = 0;
     gboolean ret = FALSE;
 
     if (grab) {
         if (pgrabs++ == 0)
-            ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, FALSE, cur,
-                               event_lasttime) == Success;
+            ret = XGrabPointer(ob_display, RootWindow(ob_display, ob_screen),
+                               False, GRAB_PTR_MASK, GrabModeAsync,
+                               GrabModeAsync, FALSE,
+                               ob_cursor(cur), event_lasttime) == Success;
         else
             ret = TRUE;
     } else if (pgrabs > 0) {
@@ -52,7 +54,7 @@ gboolean grab_pointer(gboolean grab, Cursor cur)
     return ret;
 }
 
-gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
 {
     static guint pgrabs = 0;
     gboolean ret = FALSE;
@@ -60,7 +62,8 @@ gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win)
     if (grab) {
         if (pgrabs++ == 0)
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE, cur,
+                               GrabModeAsync, GrabModeAsync, TRUE,
+                               ob_cursor(cur),
                                event_lasttime) == Success;
         else
             ret = TRUE;
@@ -113,13 +116,13 @@ void grab_shutdown()
 }
 
 void grab_button_full(guint button, guint state, Window win, guint mask,
-                      int pointer_mode, Cursor cursor)
+                      int pointer_mode, ObCursor cur)
 {
     guint i;
 
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask,
-                    pointer_mode, GrabModeSync, None, cursor);
+                    pointer_mode, GrabModeSync, None, ob_cursor(cur));
 }
 
 void grab_button(guint button, guint state, Window win, guint mask)