return FALSE if a grab fails

diff --git a/openbox/grab.c b/openbox/grab.c
index dc74302636dc79ee97c8cd1219896965fe7673a6..dd880c5f37e300d08600cfd6d98d7cd8fbb2822a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -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)

diff --git a/openbox/grab.h b/openbox/grab.h
index d6c149b3d702ea6d0695324ed51ec719771eb398..78d7d2641aedcb25828ee0f4f6e22f81f426d14e 100644 (file)
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -7,9 +7,9 @@
 void grab_startup();
 void grab_shutdown();
 
-int grab_keyboard(gboolean grab);
-void grab_pointer(gboolean grab, Cursor cur);
-void grab_pointer_window(gboolean grab, Cursor cur, Window win);
+gboolean grab_keyboard(gboolean grab);
+gboolean grab_pointer(gboolean grab, Cursor cur);
+gboolean grab_pointer_window(gboolean grab, Cursor cur, Window win);
 void grab_server(gboolean grab);
 
 void grab_button(guint button, guint state, Window win, guint mask);