dix: fix non-initialization of pointer accel in master devices.
Init MDs always with PtrAccelNoOp. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
This commit is contained in:
parent
036d424827
commit
5ef5e89f0e
|
@ -1262,7 +1262,9 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
|
|||
}
|
||||
|
||||
dev->last.numValuators = numAxes;
|
||||
if(!dev->isMaster) /* master devs do not accelerate */
|
||||
if(dev->isMaster) /* master devs do not accelerate */
|
||||
InitPointerAccelerationScheme(dev, PtrAccelNoOp);
|
||||
else
|
||||
InitPointerAccelerationScheme(dev, PtrAccelDefault);
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -1289,9 +1291,12 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
|
|||
|
||||
val = dev->valuator;
|
||||
|
||||
if(!val || dev->isMaster) /* bail out if called for master devs */
|
||||
if(!val)
|
||||
return FALSE;
|
||||
|
||||
if(dev->isMaster && (scheme != PtrAccelNoOp))
|
||||
scheme = PtrAccelNoOp; /* no accel for master devices */
|
||||
|
||||
for(x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
|
||||
if(pointerAccelerationScheme[x].number == scheme){
|
||||
i = x;
|
||||
|
|
Loading…
Reference in New Issue
Block a user