X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=cfbbbe1ae82fb31ca5a11f5684ab211a95e9d149;hb=32a92abf7578ea93d85741b7c89a0958082aa9ee;hp=ac91a6bcdb692f442c5aa3b9f9b565b2949061ad;hpb=9fcb2aa1d25ec9889b45d145939fb17160b1106a;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index ac91a6bc..cfbbbe1a 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -21,9 +21,9 @@
 #include "modkeys.h"
 #include "openbox.h"
 #include "event.h"
-#include "xerror.h"
 #include "screen.h"
 #include "debug.h"
+#include "obt/display.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -39,8 +39,9 @@ static guint kgrabs = 0;
 static guint pgrabs = 0;
 /*! The time at which the last grab was made */
 static Time  grab_time = CurrentTime;
+static gint passive_count = 0;
 
-static Time ungrab_time()
+static Time ungrab_time(void)
 {
     Time t = event_curtime;
     if (grab_time == CurrentTime ||
@@ -57,12 +58,12 @@ static Time ungrab_time()
     return t;
 }
 
-gboolean grab_on_keyboard()
+gboolean grab_on_keyboard(void)
 {
     return kgrabs > 0;
 }
 
-gboolean grab_on_pointer()
+gboolean grab_on_pointer(void)
 {
     return pgrabs > 0;
 }
@@ -78,8 +79,10 @@ gboolean grab_keyboard_full(gboolean grab)
                                 event_curtime) == Success;
             if (!ret)
                 --kgrabs;
-            else
+            else {
+                passive_count = 0;
                 grab_time = event_curtime;
+            }
         } else
             ret = TRUE;
     } else if (kgrabs > 0) {
@@ -171,13 +174,13 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 {
     guint i;
 
-    xerror_set_ignore(TRUE); /* can get BadAccess from these */
-    xerror_occured = FALSE;
+    /* can get BadAccess from these */
+    obt_display_ignore_errors(ob_display, TRUE);
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, False, mask,
                     pointer_mode, GrabModeAsync, None, ob_cursor(cur));
-    xerror_set_ignore(FALSE);
-    if (xerror_occured)
+    obt_display_ignore_errors(ob_display, FALSE);
+    if (obt_display_error_occured)
         ob_debug("Failed to grab button %d modifiers %d", button, state);
 }
 
@@ -193,13 +196,13 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
 {
     guint i;
 
-    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
-    xerror_occured = FALSE;
+    /* can get BadAccess' from these */
+    obt_display_ignore_errors(ob_display, TRUE);
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
                  GrabModeAsync, keyboard_mode);
-    xerror_set_ignore(FALSE);
-    if (xerror_occured)
+    obt_display_ignore_errors(ob_display, FALSE);
+    if (obt_display_error_occured)
         ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
 }
 
@@ -207,3 +210,20 @@ void ungrab_all_keys(Window win)
 {
     XUngrabKey(ob_display, AnyKey, AnyModifier, win);
 }
+
+void grab_key_passive_count(int change)
+{
+    if (grab_on_keyboard()) return;
+    passive_count += change;
+    if (passive_count < 0) passive_count = 0;
+}
+
+void ungrab_passive_key(void)
+{
+    /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
+    if (passive_count) {
+        /* kill out passive grab */
+        XUngrabKeyboard(ob_display, event_curtime);
+        passive_count = 0;
+    }
+}