add a NONE user action, for internal stuff, ie running actions without direct user...

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index de2efd9afa1e36689193839f5583819f383e8692..34fd2302811db7d8b3c0313dffe696622590890a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -32,10 +32,21 @@
 
 /*! 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) {
@@ -56,7 +67,6 @@ gboolean grab_keyboard(gboolean grab)
 
 gboolean grab_pointer(gboolean grab, ObCursor cur)
 {
-    static guint pgrabs = 0;
     gboolean ret = FALSE;
 
     if (grab) {
@@ -68,8 +78,9 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
         else
             ret = TRUE;
     } else if (pgrabs > 0) {
-        if (--pgrabs == 0)
+        if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
+        }
         ret = TRUE;
     }
     return ret;
@@ -77,7 +88,6 @@ 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) {
@@ -89,8 +99,9 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
         else
             ret = TRUE;
     } else if (pgrabs > 0) {
-        if (--pgrabs == 0)
+        if (--pgrabs == 0) {
             XUngrabPointer(ob_display, event_lasttime);
+        }
         ret = TRUE;
     }
     return ret;