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

Input: Reset SD remainder when copying co-ords from MD 

In updateSlaveDeviceCoords, pDev->last.valuators was being copied from
the master, but pDev->last.remainder wasn't.  Make sure we copy both, to
avoid minor inconsistencies.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2011-03-02 14:52:42 +00:00 committed by Peter Hutterer
parent 23a7832789
commit e084ac30b3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/getevents.c
View File

@ -320,6 +320,8 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
* position of the pointer */ * position of the pointer */
pDev->last.valuators[0] = master->last.valuators[0]; pDev->last.valuators[0] = master->last.valuators[0];
pDev->last.valuators[1] = master->last.valuators[1]; pDev->last.valuators[1] = master->last.valuators[1];
pDev->last.remainder[0] = master->last.remainder[0];
pDev->last.remainder[1] = master->last.remainder[1];
if (!pDev->valuator) if (!pDev->valuator)
return; return;
@ -339,14 +341,19 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
if ((lastSlave = master->last.slave) && lastSlave->valuator) { if ((lastSlave = master->last.slave) && lastSlave->valuator) {
for (i = 2; i < pDev->valuator->numAxes; i++) { for (i = 2; i < pDev->valuator->numAxes; i++) {
if (i >= lastSlave->valuator->numAxes) if (i >= lastSlave->valuator->numAxes)
{
pDev->last.valuators[i] = 0; pDev->last.valuators[i] = 0;
pDev->last.remainder[i] = 0;
}
else else
{
pDev->last.valuators[i] = pDev->last.valuators[i] =
rescaleValuatorAxis(pDev->last.valuators[i], rescaleValuatorAxis(pDev->last.valuators[i],
pDev->last.remainder[i], pDev->last.remainder[i],
&pDev->last.remainder[i], &pDev->last.remainder[i],
lastSlave->valuator->axes + i, lastSlave->valuator->axes + i,
pDev->valuator->axes + i, 0); pDev->valuator->axes + i, 0);
}
} }
} }