count the EnterNotify events and tell openbox to ignore them when ungrabbing the...

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index f42ea67348fdc5562eab75b822d3fb58b8ac8f0e..9c6065a745fb92b980f953558bc76a7a8b098241 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -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,38 @@ 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);
+
+            /* ignore all enter events caused by ungrabbing the pointer */
+            {
+                GSList *saved = NULL, *it;
+                XEvent *e;
+                guint n = 0;
+                
+                XSync(ob_display, FALSE);
+
+                /* count the events */
+                while (TRUE) {
+                    e = g_new(XEvent, 1);
+                    if (XCheckTypedEvent(ob_display, EnterNotify, e)) {
+                        saved = g_slist_append(saved, e);
+                        ++n;
+                    } else {
+                        g_free(e);
+                        break;
+                    }
+                }
+                /* put the events back */
+                for (it = saved; it; it = g_slist_next(it)) {
+                    XPutBackEvent(ob_display, it->data);
+                    g_free(it->data);
+                }
+                g_slist_free(saved);
+                /* ignore the events */
+                event_ignore_enter_focus(n);
+            }
+        }
         ret = TRUE;
     }
     return ret;
@@ -77,7 +117,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) {