frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Simon Thum 2008-09-28 22:32:44 +09:30 committed by Peter Hutterer
parent 036d424827
commit 5ef5e89f0e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dix/devices.c
View File

@ -1262,7 +1262,9 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
} }
dev->last.numValuators = 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); InitPointerAccelerationScheme(dev, PtrAccelDefault);
return TRUE; return TRUE;
} }
@ -1289,9 +1291,12 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
val = dev->valuator; val = dev->valuator;
if(!val || dev->isMaster) /* bail out if called for master devs */ if(!val)
return FALSE; return FALSE;
if(dev->isMaster && (scheme != PtrAccelNoOp))
scheme = PtrAccelNoOp; /* no accel for master devices */
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){
i = x; i = x;