remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 719d3301c6bb1bef2069f580a370f291a1a4084b..2d8877841fd1145de68b7eb59fbceb21291f460a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,42 +1,83 @@
 #include "openbox.h"
 #include "event.h"
+#include "xerror.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
 
-static guint kgrabs, pgrabs, sgrabs;
+#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
+#define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask)
 
 #define MASK_LIST_SIZE 8
 
 /*! A list of all possible combinations of keyboard lock masks */
 static unsigned int mask_list[MASK_LIST_SIZE];
 
-void grab_keyboard(gboolean grab)
+gboolean grab_keyboard(gboolean grab)
 {
+    static guint kgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (kgrabs++ == 0)
-            XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync,
-                          CurrentTime);
+            ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
+                                FALSE, GrabModeAsync, GrabModeAsync,
+                                event_lasttime) == Success;
+        else
+            ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
-            XUngrabKeyboard(ob_display, CurrentTime);
+            XUngrabKeyboard(ob_display, event_lasttime);
+        ret = TRUE;
     }
+    return ret;
 }
 
-void grab_pointer(gboolean grab, Cursor cur)
+gboolean grab_pointer(gboolean grab, ObCursor cur)
 {
+    static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync,
-                         GrabModeAsync, FALSE, cur, CurrentTime);
+            ret = XGrabPointer(ob_display, RootWindow(ob_display, ob_screen),
+                               False, GRAB_PTR_MASK, GrabModeAsync,
+                               GrabModeAsync, FALSE,
+                               ob_cursor(cur), event_lasttime) == Success;
+        else
+            ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
-            XUngrabPointer(ob_display, CurrentTime);
+            XUngrabPointer(ob_display, event_lasttime);
+        ret = TRUE;
     }
+    return ret;
 }
 
-void grab_server(gboolean grab)
+gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
 {
+    static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
+    if (grab) {
+        if (pgrabs++ == 0)
+            ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
+                               GrabModeAsync, GrabModeAsync, TRUE,
+                               ob_cursor(cur),
+                               event_lasttime) == Success;
+        else
+            ret = TRUE;
+    } else if (pgrabs > 0) {
+        if (--pgrabs == 0)
+            XUngrabPointer(ob_display, event_lasttime);
+        ret = TRUE;
+    }
+    return ret;
+}
+
+int grab_server(gboolean grab)
+{
+    static guint sgrabs = 0;
     if (grab) {
         if (sgrabs++ == 0) {
             XGrabServer(ob_display);
@@ -48,14 +89,13 @@ void grab_server(gboolean grab)
             XFlush(ob_display);
         }
     }
+    return sgrabs;
 }
 
 void grab_startup()
 {
     guint i = 0;
 
-    kgrabs = pgrabs = sgrabs = 0;
-
     mask_list[i++] = 0;
     mask_list[i++] = LockMask;
     mask_list[i++] = NumLockMask;
@@ -69,19 +109,25 @@ void grab_startup()
 
 void grab_shutdown()
 {
-    while (kgrabs) grab_keyboard(FALSE);
-    while (pgrabs) grab_pointer(FALSE, None);
-    while (sgrabs) grab_server(FALSE);
+    while (grab_keyboard(FALSE));
+    while (grab_pointer(FALSE, None));
+    while (grab_pointer_window(FALSE, None, None));
+    while (grab_server(FALSE));
 }
 
-void grab_button(guint button, guint state, Window win, guint mask,
-                 int pointer_mode)
+void grab_button_full(guint button, guint state, Window win, guint mask,
+                      int pointer_mode, ObCursor cur)
 {
     guint i;
 
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask,
-                    pointer_mode, GrabModeAsync, None, None);
+                    pointer_mode, GrabModeSync, None, ob_cursor(cur));
+}
+
+void grab_button(guint button, guint state, Window win, guint mask)
+{
+    grab_button_full(button, state, win, mask, GrabModeAsync, None);
 }
 
 void ungrab_button(guint button, guint state, Window win)
@@ -92,16 +138,21 @@ void ungrab_button(guint button, guint state, Window win)
         XUngrabButton(ob_display, button, state | mask_list[i], win);
 }
 
-void grab_key(guint keycode, guint state, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
 {
     guint i;
 
+    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
+    xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
-        XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE,
-                 GrabModeAsync, keyboard_mode);
+        XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
+                 GrabModeSync, keyboard_mode);
+    xerror_set_ignore(FALSE);
+    if (xerror_occured)
+        g_warning("failed to grab keycode %d modifiers %d", keycode, state);
 }
 
-void ungrab_all_keys()
+void ungrab_all_keys(Window win)
 {
-    XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
+    XUngrabKey(ob_display, AnyKey, AnyModifier, win);
 }