nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use CurrentTime again?

Browse source
This commit is contained in:
Dana Jansens 2003-03-26 14:39:14 +00:00
parent 78424735f3
commit 1d5fa24e4b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openbox/grab.c
View file

@ -17,7 +17,7 @@ void grab_keyboard(gboolean grab)
if (kgrabs++ == 0) { if (kgrabs++ == 0) {
g_message("GRABBING KEYBOARD %d", kgrabs); g_message("GRABBING KEYBOARD %d", kgrabs);
XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync, XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync,
event_lasttime); CurrentTime);
} else } else
g_message("NOT GRABBING KEYBOARD %d", kgrabs); g_message("NOT GRABBING KEYBOARD %d", kgrabs);
} else if (kgrabs > 0) { } else if (kgrabs > 0) {
@ -34,7 +34,7 @@ void grab_pointer(gboolean grab, Cursor cur)
if (grab) { if (grab) {
if (pgrabs++ == 0) if (pgrabs++ == 0)
XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync, XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync,
GrabModeAsync, FALSE, cur, event_lasttime); GrabModeAsync, FALSE, cur, CurrentTime);
} else if (pgrabs > 0) { } else if (pgrabs > 0) {
if (--pgrabs == 0) if (--pgrabs == 0)
XUngrabPointer(ob_display, CurrentTime); XUngrabPointer(ob_display, CurrentTime);

6
plugins/keyboard/keyboard.c
View file

@ -6,6 +6,7 @@
#include "tree.h" #include "tree.h"
#include "keyboard.h" #include "keyboard.h"
#include "keysrc.h" #include "keysrc.h"
#include "translate.h"
#include <glib.h> #include <glib.h>
void plugin_setup_config() void plugin_setup_config()
@ -38,7 +39,8 @@ static void reset_chains()
if (grabbed) { if (grabbed) {
grabbed = FALSE; grabbed = FALSE;
grab_keyboard(FALSE); grab_keyboard(FALSE);
} } else
XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
} }
gboolean kbind(GList *keylist, Action *action) gboolean kbind(GList *keylist, Action *action)
@ -100,6 +102,7 @@ static void press(ObEvent *e, void *foo)
if (!grabbed) { if (!grabbed) {
grab_keyboard(TRUE); grab_keyboard(TRUE);
grabbed = TRUE; grabbed = TRUE;
XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
} }
curpos = p; curpos = p;
} else { } else {
@ -119,7 +122,6 @@ static void press(ObEvent *e, void *foo)
p = p->next_sibling; p = p->next_sibling;
} }
} }
XAllowEvents(ob_display, AsyncKeyboard, e->data.x.e->xkey.time);
} }
void plugin_startup() void plugin_startup()