diff options
| author | Simon Thum <simon.thum@gmx.de> | 2009-05-28 16:43:42 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-07 09:31:08 +1000 |
| commit | bb1c131b785ca30cf40041db3513b7669beebd34 (patch) | |
| tree | 05b6ad5cdd1ee1092448ceb0dd6a732d92c18b65 /dix | |
| parent | 707b1241681c33401d5e0eb6edeace33f5970928 (diff) | |
dix: suppress pointer acceleration on xtest devices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 8 |
1 files 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){ |