X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=97a1a3db2acb631f86351fc16b59bbd64b5ced48;hb=04cfdd261dd6b8030cd7618aee5df588f25ef4d2;hp=c6beee746bba2d8f6b6972385e1010ff1a030731;hpb=7d215bd255d0744101b9ceb52c235bdc985fa034;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index c6beee74..97a1a3db 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,18 +1,26 @@
 #include "openbox.h"
+#include "event.h"
+#include "xerror.h"
+
 #include <glib.h>
 #include <X11/Xlib.h>
 
 static guint kgrabs, pgrabs, sgrabs;
 
+#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)
 {
     if (grab) {
         if (kgrabs++ == 0)
             XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync,
-                          CurrentTime);
+                          event_lasttime);
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
-            XUngrabKeyboard(ob_display, CurrentTime);
+            XUngrabKeyboard(ob_display, event_lasttime);
     }
 }
 
@@ -21,10 +29,10 @@ void grab_pointer(gboolean grab, Cursor cur)
     if (grab) {
         if (pgrabs++ == 0)
             XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync,
-                         GrabModeSync, FALSE, cur, CurrentTime);
+                         GrabModeAsync, FALSE, cur, event_lasttime);
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
-            XUngrabPointer(ob_display, CurrentTime);
+            XUngrabPointer(ob_display, event_lasttime);
     }
 }
 
@@ -45,7 +53,19 @@ void grab_server(gboolean grab)
 
 void grab_startup()
 {
+    guint i = 0;
+
     kgrabs = pgrabs = sgrabs = 0;
+
+    mask_list[i++] = 0;
+    mask_list[i++] = LockMask;
+    mask_list[i++] = NumLockMask;
+    mask_list[i++] = LockMask | NumLockMask;
+    mask_list[i++] = ScrollLockMask;
+    mask_list[i++] = ScrollLockMask | LockMask;
+    mask_list[i++] = ScrollLockMask | NumLockMask;
+    mask_list[i++] = ScrollLockMask | LockMask | NumLockMask;
+    g_assert(i == MASK_LIST_SIZE);
 }
 
 void grab_shutdown()
@@ -54,3 +74,40 @@ void grab_shutdown()
     while (pgrabs) grab_pointer(FALSE, None);
     while (sgrabs) grab_server(FALSE);
 }
+
+void grab_button(guint button, guint state, Window win, guint mask,
+                 int pointer_mode)
+{
+    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);
+}
+
+void ungrab_button(guint button, guint state, Window win)
+{
+    guint i;
+
+    for (i = 0; i < MASK_LIST_SIZE; ++i)
+        XUngrabButton(ob_display, button, state | mask_list[i], win);
+}
+
+void grab_key(guint keycode, guint state, 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,
+                 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()
+{
+    XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
+}