X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=e2784a2d3d578a46e235b07121fad6df33a3ebf3;hb=c1d065243ad2d77aa27bd42de6bb7052c08fb8f9;hp=de2efd9afa1e36689193839f5583819f383e8692;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index de2efd9a..e2784a2d 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -32,18 +32,31 @@
 
 /*! A list of all possible combinations of keyboard lock masks */
 static unsigned int mask_list[MASK_LIST_SIZE];
+static guint kgrabs = 0;
+static guint pgrabs = 0;
+
+gboolean grab_on_keyboard()
+{
+    return kgrabs > 0;
+}
+
+gboolean grab_on_pointer()
+{
+    return pgrabs > 0;
+}
 
 gboolean grab_keyboard(gboolean grab)
 {
-    static guint kgrabs = 0;
     gboolean ret = FALSE;
 
     if (grab) {
-        if (kgrabs++ == 0)
+        if (kgrabs++ == 0) {
             ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
                                 FALSE, GrabModeAsync, GrabModeAsync,
                                 event_lasttime) == Success;
-        else
+            if (!ret)
+                --kgrabs;
+        } else
             ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
@@ -56,20 +69,22 @@ gboolean grab_keyboard(gboolean grab)
 
 gboolean grab_pointer(gboolean grab, ObCursor cur)
 {
-    static guint pgrabs = 0;
     gboolean ret = FALSE;
 
     if (grab) {
-        if (pgrabs++ == 0)
+        if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
                                GrabModeAsync, FALSE,
                                ob_cursor(cur), event_lasttime) == Success;
-        else
+            if (!ret)
+                --pgrabs;
+        } else
             ret = TRUE;
     } else if (pgrabs > 0) {
-        if (--pgrabs == 0)
+        if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
+        }
         ret = TRUE;
     }
     return ret;
@@ -77,20 +92,22 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
 
 gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
 {
-    static guint pgrabs = 0;
     gboolean ret = FALSE;
 
     if (grab) {
-        if (pgrabs++ == 0)
+        if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync, TRUE,
                                ob_cursor(cur),
                                event_lasttime) == Success;
-        else
+            if (!ret)
+                --pgrabs;
+        } else
             ret = TRUE;
     } else if (pgrabs > 0) {
-        if (--pgrabs == 0)
+        if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
+        }
         ret = TRUE;
     }
     return ret;