dix: suppress pointer acceleration on xtest devices

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Simon Thum 2009-05-28 16:43:42 +02:00 committed by Peter Hutterer
parent 707b124168
commit bb1c131b78

View File

@ -1194,7 +1194,9 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
} }
dev->last.numValuators = numAxes; dev->last.numValuators = numAxes;
if(IsMaster(dev)) /* master devs do not accelerate */
if (IsMaster(dev) || /* do not accelerate master or xtest devices */
dixLookupPrivate(&dev->devPrivates, XTstDevicePrivateKey ))
InitPointerAccelerationScheme(dev, PtrAccelNoOp); InitPointerAccelerationScheme(dev, PtrAccelNoOp);
else else
InitPointerAccelerationScheme(dev, PtrAccelDefault); InitPointerAccelerationScheme(dev, PtrAccelDefault);
@ -1226,8 +1228,8 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
if(!val) if(!val)
return FALSE; return FALSE;
if(IsMaster(dev) && (scheme != PtrAccelNoOp)) if(IsMaster(dev) && scheme != PtrAccelNoOp)
scheme = PtrAccelNoOp; /* no accel for master devices */ return FALSE;
for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) { for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
if(pointerAccelerationScheme[x].number == scheme){ if(pointerAccelerationScheme[x].number == scheme){