From 5cfbe97cd797d8f78ece208bb5114704b83d8aab Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 13 Jan 2012 16:54:57 +0100
Subject: libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012

---
 xorg-server/dix/events.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'xorg-server/dix/events.c')

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 536026716..04d7fb59b 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -1368,7 +1368,7 @@ ScreenRestructured (ScreenPtr pScreen)
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
     {
-        if (!DevHasCursor(pDev))
+        if (!IsFloating(pDev) && !DevHasCursor(pDev))
             continue;
 
         /* GrabDevice doesn't have a confineTo field, so we don't need to
@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
         }
     }
 
-    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
+    (*grabinfo->ActivateGrab)(device, grab,
+                              ClientTimeToServerTime(event->any.time), TRUE);
 
     if (xE)
     {
-- 
cgit v1.2.3