xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 Xext/xtest.c    |    2 +-
 Xi/exevents.c   |    2 +-
 dix/getevents.c |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9bf77569cc8f9b0cc25c99487672d375d7c32f99
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 8 16:32:24 2009 +1000

    Xi: call CheckMotion for floating SDs too.
    
    CheckMotion updates the sprite position so we need to call it for all devices
    that have a sprite - including floating SDs (which have an invisible sprite).

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 6a1f1bb..5ab9d66 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1040,7 +1040,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
     b = device->button;
     k = device->key;
 
-    if (device->isMaster)
+    if (device->isMaster || !device->u.master)
         CheckMotion(xE, device);
 
     if (xE->u.u.type != DeviceValuator && xE->u.u.type != GenericEvent) {
commit 83eb863e3cfcd62549b836f3195107d8908b36d0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 9 11:39:02 2009 +1000

    Xext: don't accept DeviceValuator if the dev doesn't have valuators (in xtest)
    
    Reported by Chris Ball.

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 8793640..c775b7b 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -213,7 +213,7 @@ ProcXTestFakeInput(client)
         } else
             firstValuator = 0;
 
-        if (nev == 1 && type == XI_DeviceMotionNotify && !dev->valuator)
+        if (nev > 1 && !dev->valuator)
         {
             client->errorValue = dv->first_valuator;
             return BadValue;
commit a3f9e887d9ff5fdee6c35ccc0f7b324723a83a46
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 9 11:40:18 2009 +1000

    dix: don't accept Button 0 presses in GPE.

diff --git a/dix/getevents.c b/dix/getevents.c
index 40d7b84..1189d0b 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -987,6 +987,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
         ((num_valuators + first_valuator) > pDev->valuator->numAxes) ||
         (type != MotionNotify && type != ButtonPress && type != ButtonRelease) ||
         (type != MotionNotify && !pDev->button) ||
+        ((type == ButtonPress || type == ButtonRelease) && !buttons) ||
         (type == MotionNotify && num_valuators <= 0))
         return 0;