From bb1c131b785ca30cf40041db3513b7669beebd34 Mon Sep 17 00:00:00 2001 From: Simon Thum Date: Thu, 28 May 2009 16:43:42 +0200 Subject: [PATCH] dix: suppress pointer acceleration on xtest devices Signed-off-by: Peter Hutterer --- dix/devices.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 6266b63f5..eb54e0aff 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1194,7 +1194,9 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int 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); else InitPointerAccelerationScheme(dev, PtrAccelDefault); @@ -1226,8 +1228,8 @@ InitPointerAccelerationScheme(DeviceIntPtr dev, if(!val) return FALSE; - if(IsMaster(dev) && (scheme != PtrAccelNoOp)) - scheme = PtrAccelNoOp; /* no accel for master devices */ + if(IsMaster(dev) && scheme != PtrAccelNoOp) + return FALSE; for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) { if(pointerAccelerationScheme[x].number == scheme){