playing a bit with grabs

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index dfff9570e3c6dab1aa8a9e4e2590f7236fca58a9..eaf65f6be9765b8ec539158b86500df581a75027 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -2,7 +2,7 @@
 
    grab.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include "event.h"
 #include "xerror.h"
 #include "screen.h"
+#include "debug.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -114,33 +115,6 @@ gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur)
     return ret;
 }
 
-gboolean grab_pointer_window(gboolean grab, gboolean owner_events,
-                             ObCursor cur, Window win)
-{
-    gboolean ret = FALSE;
-
-    if (grab) {
-        if (pgrabs++ == 0) {
-            ret = XGrabPointer(ob_display, win, owner_events,
-                               GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, None,
-                               ob_cursor(cur),
-                               event_curtime) == Success;
-            if (!ret)
-                --pgrabs;
-            else
-                grab_time = event_curtime;
-        } else
-            ret = TRUE;
-    } else if (pgrabs > 0) {
-        if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, ungrab_time());
-        }
-        ret = TRUE;
-    }
-    return ret;
-}
-
 gint grab_server(gboolean grab)
 {
     static guint sgrabs = 0;
@@ -181,7 +155,6 @@ void grab_shutdown(gboolean reconfig)
 
     while (grab_keyboard(FALSE));
     while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE));
-    while (grab_pointer_window(FALSE, FALSE, OB_CURSOR_NONE, None));
     while (grab_server(FALSE));
 }
 
@@ -190,19 +163,14 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 {
     guint i;
 
-    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
+    xerror_set_ignore(TRUE); /* can get BadAccess from these */
     xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
-        XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask,
-                    pointer_mode, GrabModeSync, None, ob_cursor(cur));
+        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)
-        g_warning("failed to grab button %d modifiers %d", button, state);
-}
-
-void grab_button(guint button, guint state, Window win, guint mask)
-{
-    grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE);
+        ob_debug("Failed to grab button %d modifiers %d", button, state);
 }
 
 void ungrab_button(guint button, guint state, Window win)
@@ -224,7 +192,7 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
                  GrabModeAsync, keyboard_mode);
     xerror_set_ignore(FALSE);
     if (xerror_occured)
-        g_warning("failed to grab keycode %d modifiers %d", keycode, state);
+        ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
 }
 
 void ungrab_all_keys(Window win)