[PATCH] dix: suppress pointer acceleration on xtest devices

[Simon Thum]

---
 dix/devices.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 6f464e7..948a712 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1152,7 +1152,8 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
     }
 
     dev->last.numValuators = numAxes;
-    if(dev->isMaster) /* master devs do not accelerate */
+    if (dev->isMaster || /* do not accelerate master or xtest devices */
+	dixLookupPrivate(&dev->devPrivates, XTstDevicePrivateKey ))
 	InitPointerAccelerationScheme(dev, PtrAccelNoOp);
     else
 	InitPointerAccelerationScheme(dev, PtrAccelDefault);
@@ -1184,8 +1185,8 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
     if(!val)
 	return FALSE;
 
-    if(dev->isMaster && (scheme != PtrAccelNoOp))
-        scheme = PtrAccelNoOp; /* no accel for master devices */
+    if(dev->isMaster && scheme != PtrAccelNoOp)
+        return FALSE;
 
     for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
         if(pointerAccelerationScheme[x].number == scheme){
-- 
1.6.0.6


--------------020508030303000306080902--