X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=b6a7a9392fb43c8a039bac6fe9425fa8a0a20bca;hb=3db93a6ab5801ad8f8b67c54cdc8942e08a540aa;hp=e7bd41d957deb1a75ee05587c9195a6a9681a41b;hpb=3595da62ca70f494f3341af744da627af414cb18;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index e7bd41d9..b6a7a939 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -18,6 +18,7 @@
 */
 
 #include "grab.h"
+#include "modkeys.h"
 #include "openbox.h"
 #include "event.h"
 #include "xerror.h"
@@ -42,7 +43,8 @@ static Time  grab_time = CurrentTime;
 static Time ungrab_time()
 {
     Time t = event_curtime;
-    if (!(t == CurrentTime || event_time_after(t, grab_time)))
+    if (grab_time == CurrentTime ||
+        !(t == CurrentTime || event_time_after(t, grab_time)))
         /* When the time moves backward on the server, then we can't use
            the grab time because that will be in the future. So instead we
            have to use CurrentTime.
@@ -135,17 +137,20 @@ gint grab_server(gboolean grab)
 void grab_startup(gboolean reconfig)
 {
     guint i = 0;
+    guint num, caps, scroll;
 
-    if (reconfig) return;
+    num = modkeys_key_to_mask(OB_MODKEY_KEY_NUMLOCK);
+    caps = modkeys_key_to_mask(OB_MODKEY_KEY_CAPSLOCK);
+    scroll = modkeys_key_to_mask(OB_MODKEY_KEY_SCROLLLOCK);
 
     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;
+    mask_list[i++] = num;
+    mask_list[i++] = caps;
+    mask_list[i++] = scroll;
+    mask_list[i++] = num | caps;
+    mask_list[i++] = num | scroll;
+    mask_list[i++] = caps | scroll;
+    mask_list[i++] = num | caps | scroll;
     g_assert(i == MASK_LIST_SIZE);
 }
 
@@ -166,18 +171,13 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
     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)
         ob_debug("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);
-}
-
 void ungrab_button(guint button, guint state, Window win)
 {
     guint i;