xserver: Branch 'server-1.11-branch' - 3 commits

[Jeremy Huddleston]

 Xi/exevents.c   |    2 +-
 dix/getevents.c |    2 +-
 include/input.h |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a1925f08790083a5c00f9f4ba766cbb8749240f3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Apr 15 13:32:10 2011 +1000

    include: export GetProximityEvents and QueueProximityEvents
    
    This is mainly needed for consistency with GetPointerEvents and friend.
    No-one seems to actually need this function from outside the usual DDXs.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit fc16917ad6f0d2722bfb5c5eeca955dd3bc4125a)

diff --git a/include/input.h b/include/input.h
index 5377a0c..0d995f5 100644
--- a/include/input.h
+++ b/include/input.h
@@ -464,13 +464,13 @@ extern _X_EXPORT void QueueKeyboardEvents(
     int key_code,
     const ValuatorMask *mask);
 
-extern int GetProximityEvents(
+extern _X_EXPORT int GetProximityEvents(
     InternalEvent *events,
     DeviceIntPtr pDev,
     int type,
     const ValuatorMask *mask);
 
-extern void QueueProximityEvents(
+extern _X_EXPORT void QueueProximityEvents(
     DeviceIntPtr pDev,
     int type,
     const ValuatorMask *mask);
commit a6a21f84bbdd4e3c6218f7b4c04a2d947a784f9f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Nov 3 08:58:58 2011 +1000

    dix: Don't let a driver without a ProximityClassRec post events
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit 11840595a1be9f2df7390bcc708cc176e60d3ef2)

diff --git a/dix/getevents.c b/dix/getevents.c
index a12462a..058fa8a 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1309,7 +1309,7 @@ GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type, const Val
     /* Sanity checks. */
     if ((type != ProximityIn && type != ProximityOut) || !mask_in)
         return 0;
-    if (!pDev->valuator)
+    if (!pDev->valuator || !pDev->proximity)
         return 0;
 
     valuator_mask_copy(&mask, mask_in);
commit 2f2d871ccdfb256831ae487c5916054a3d29d126
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Oct 27 11:03:39 2011 +1000

    Xi: allow passive keygrabs on the XIAll(Master)Devices fake devices
    
    They don't have a KeyClassRec, but we must still allow passive grabs on
    them.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Tested-by: Bastien Nocera <hadess at hadess.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 22715e465b415b3351b83b8279a4f44157f63199)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 3e3c67b..dcb496f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1441,7 +1441,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     rc = CheckGrabValues(client, param);
     if (rc != Success)
         return rc;
-    if (k == NULL)
+    if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
 	return BadMatch;
     if (grabtype == GRABTYPE_XI)
     {