[Xfce4-commits] r26435 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-12-03 21:44:29 +0000 (Mon, 03 Dec 2007)
New Revision: 26435

Modified:
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/keyboard.c
Log:
Rework key grabbing and release events queued

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2007-12-03 21:43:32 UTC (rev 26434)
+++ xfwm4/trunk/src/events.c	2007-12-03 21:44:29 UTC (rev 26435)
@@ -343,7 +343,7 @@
     TRACE ("entering handleKeyEvent");
 
     /* Release queued events */
-    XAllowEvents (display_info->dpy, AsyncKeyboard, CurrentTime);
+    XAllowEvents (display_info->dpy, AsyncKeyboard, ev->time);
 
     status = EVENT_FILTER_PASS;
     ev_screen_info = myDisplayGetScreenFromRoot (display_info, ev->root);
@@ -1002,7 +1002,7 @@
                     clientRaise (c, None);
                 }
             }
-            XAllowEvents (display_info->dpy, ReplayPointer, CurrentTime);
+            XAllowEvents (display_info->dpy, ReplayPointer, ev->time);
         }
 
         return EVENT_FILTER_REMOVE;

Modified: xfwm4/trunk/src/keyboard.c
===================================================================
--- xfwm4/trunk/src/keyboard.c	2007-12-03 21:43:32 UTC (rev 26434)
+++ xfwm4/trunk/src/keyboard.c	2007-12-03 21:44:29 UTC (rev 26435)
@@ -175,35 +175,35 @@
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | ScrollLockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | NumLockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | LockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | ScrollLockMask | NumLockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | ScrollLockMask | LockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | LockMask | NumLockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
             status |=
                 XGrabKey (dpy, key->keycode,
                                         key->modifier | ScrollLockMask | LockMask | NumLockMask, w,
-                                        TRUE, GrabModeAsync, GrabModeSync);
+                                        TRUE, GrabModeAsync, GrabModeAsync);
         }
     }