diff options
| -rw-r--r-- | openbox/grab.c | 4 | ||||
| -rw-r--r-- | plugins/keyboard/keyboard.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/openbox/grab.c b/openbox/grab.c index 0f21a40f..ab38f27b 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -17,7 +17,7 @@ void grab_keyboard(gboolean grab) if (kgrabs++ == 0) { g_message("GRABBING KEYBOARD %d", kgrabs); XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync, - event_lasttime); + CurrentTime); } else g_message("NOT GRABBING KEYBOARD %d", kgrabs); } else if (kgrabs > 0) { @@ -34,7 +34,7 @@ void grab_pointer(gboolean grab, Cursor cur) if (grab) { if (pgrabs++ == 0) XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync, - GrabModeAsync, FALSE, cur, event_lasttime); + GrabModeAsync, FALSE, cur, CurrentTime); } else if (pgrabs > 0) { if (--pgrabs == 0) XUngrabPointer(ob_display, CurrentTime); diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index cf48b2e9..22ea5556 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -6,6 +6,7 @@ #include "tree.h" #include "keyboard.h" #include "keysrc.h" +#include "translate.h" #include <glib.h> void plugin_setup_config() @@ -38,7 +39,8 @@ static void reset_chains() if (grabbed) { grabbed = FALSE; grab_keyboard(FALSE); - } + } else + XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } gboolean kbind(GList *keylist, Action *action) @@ -100,6 +102,7 @@ static void press(ObEvent *e, void *foo) if (!grabbed) { grab_keyboard(TRUE); grabbed = TRUE; + XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } curpos = p; } else { @@ -119,7 +122,6 @@ static void press(ObEvent *e, void *foo) p = p->next_sibling; } } - XAllowEvents(ob_display, AsyncKeyboard, e->data.x.e->xkey.time); } void plugin_startup() |