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 b2426b9da51df569b854cfb3148fb94e03044b64..2d8877841fd1145de68b7eb59fbceb21291f460a 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -5,54 +5,74 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+#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];
 
-int 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,
-                          event_lasttime);
+            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, event_lasttime);
+        ret = TRUE;
     }
-    return kgrabs;
+    return ret;
 }
 
-int 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, GRAB_PTR_MASK,
-                         GrabModeAsync, GrabModeAsync, FALSE, cur,
-                         event_lasttime);
+            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, event_lasttime);
+        ret = TRUE;
     }
-    return pgrabs;
+    return ret;
 }
 
-int grab_pointer_window(gboolean grab, Cursor cur, Window win)
+gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
 {
     static guint pgrabs = 0;
+    gboolean ret = FALSE;
+
     if (grab) {
         if (pgrabs++ == 0)
-            XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, GrabModeAsync,
-                         GrabModeAsync, TRUE, cur, event_lasttime);
+            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 pgrabs;
+    return ret;
 }
 
 int grab_server(gboolean grab)
@@ -95,14 +115,19 @@ void grab_shutdown()
     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, GrabModeSync, 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)
@@ -113,21 +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,
+        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);
 }