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

[Olivier Fourdan]

Author: olivier
Date: 2006-08-15 15:18:21 +0000 (Tue, 15 Aug 2006)
New Revision: 22776

Modified:
   xfwm4/trunk/src/events.c
Log:
Apply patch from Darren Salt <linux at youmustbejoking.demon.co.uk> focus transition (bug #2090), release key/mouse events using current time as several reports of key/mouse lokup have raised on the mailing list (and on bugzilla, #2136 and #2146)

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2006-08-15 13:54:19 UTC (rev 22775)
+++ xfwm4/trunk/src/events.c	2006-08-15 15:18:21 UTC (rev 22776)
@@ -542,7 +542,7 @@
         default:
             break;
     }
-    XAllowEvents (display_info->dpy, SyncKeyboard, ev->time);
+    XAllowEvents (display_info->dpy, SyncKeyboard, CurrentTime);
 }
 
 /* User has clicked on an edge or corner.
@@ -986,11 +986,11 @@
 
         if (replay)
         {
-            XAllowEvents (display_info->dpy, ReplayPointer, ev->time);
+            XAllowEvents (display_info->dpy, ReplayPointer, CurrentTime);
         }
         else
         {
-            XAllowEvents (display_info->dpy, SyncPointer, ev->time);
+            XAllowEvents (display_info->dpy, SyncPointer, CurrentTime);
         }
 
         return;
@@ -1581,6 +1581,10 @@
                 "NotifyNormal" :
                 (ev->mode == NotifyWhileGrabbed) ?
                 "NotifyWhileGrabbed" :
+                (ev->mode == NotifyGrab) ?
+                "NotifyGrab" :
+                (ev->mode == NotifyUngrab) ?
+                "NotifyUngrab" :
                 "(unknown)");
     TRACE ("handleFocusIn (0x%lx) detail = %s",
                 ev->window,
@@ -1606,7 +1610,7 @@
     last_raised = NULL;
 
     if (screen_info && (ev->window == screen_info->xroot) && (ev->mode == NotifyNormal) && 
-        (ev->detail == NotifyDetailNone))
+        (ev->detail == NotifyDetailNone || ev->detail == NotifyInferior))
     {
         /* Handle focus transition to root (means that an unknown
            window has vanished and the focus is returned to the root