return FALSE if a grab fails

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index e934959ddf794e82c3a7b64a5d35bfd95488d29d..dd880c5f37e300d08600cfd6d98d7cd8fbb2822a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -5,7 +5,7 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
 #define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
 
 #define MASK_LIST_SIZE 8
@@ -13,47 +13,54 @@
 /*! A list of all possible combinations of keyboard lock masks */
 static unsigned int mask_list[MASK_LIST_SIZE];
 
-int grab_keyboard(gboolean grab)
+gboolean grab_keyboard(gboolean grab)
 {
     static guint kgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (kgrabs++ == 0)
-            XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
-                          GrabModeAsync, event_lasttime);
+            ret = XGrabKeyboard(ob_display, ob_root, FALSE, GrabModeAsync,
+                                GrabModeAsync, event_lasttime) == Success;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
             XUngrabKeyboard(ob_display, event_lasttime);
     }
-    return kgrabs;
+    return ret;
 }
 
-int grab_pointer(gboolean grab, Cursor cur)
+gboolean grab_pointer(gboolean grab, Cursor cur)
 {
     static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
-                         GrabModeAsync, GrabModeAsync, FALSE, cur,
-                         event_lasttime);
+            ret = XGrabPointer(ob_display, ob_root, False, GRAB_PTR_MASK,
+                               GrabModeAsync, GrabModeAsync, FALSE, cur,
+                               event_lasttime) == Success;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
             XUngrabPointer(ob_display, event_lasttime);
     }
-    return pgrabs;
+    return ret;
 }
 
-int grab_pointer_window(gboolean grab, Cursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win)
 {
     static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, GrabModeAsync,
-                         GrabModeAsync, TRUE, cur, event_lasttime);
+            ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+                               GrabModeAsync, GrabModeAsync, TRUE, cur,
+                               event_lasttime) == Success;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
             XUngrabPointer(ob_display, event_lasttime);
     }
-    return pgrabs;
+    return ret;
 }
 
 int grab_server(gboolean grab)