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

dix: don't lose subpixel precision when scaling. 

Only scale x/y back from screen range if we have crossed screen, otherwise
leave it as it is.
This commit is contained in:
Peter Hutterer 2008-09-28 21:47:21 +09:30
parent 5ef5e89f0e
commit 93ef72fa26
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dix/getevents.c
View File

@ -919,17 +919,22 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
master->last.valuators[1] = pDev->last.valuators[1]; master->last.valuators[1] = pDev->last.valuators[1];
} }
/* Crossed screen? Scale back to device coordiantes */
if(cx != pDev->last.valuators[0]) if(cx != pDev->last.valuators[0])
{
scr = miPointerGetScreen(pDev);
x = rescaleValuatorAxis(pDev->last.valuators[0], NULL,
pDev->valuator->axes + 0, scr->width);
cx = pDev->last.valuators[0]; cx = pDev->last.valuators[0];
}
if(cy != pDev->last.valuators[1]) if(cy != pDev->last.valuators[1])
{
scr = miPointerGetScreen(pDev);
cy = pDev->last.valuators[1]; cy = pDev->last.valuators[1];
y = rescaleValuatorAxis(pDev->last.valuators[1], NULL,
pDev->valuator->axes + 1, scr->height);
}
/* scale x/y back to device coordinates */
scr = miPointerGetScreen(pDev);
x = rescaleValuatorAxis(pDev->last.valuators[0], NULL,
pDev->valuator->axes + 0, scr->width);
y = rescaleValuatorAxis(pDev->last.valuators[1], NULL,
pDev->valuator->axes + 1, scr->height);
updateMotionHistory(pDev, ms, first_valuator, num_valuators, updateMotionHistory(pDev, ms, first_valuator, num_valuators,
&pDev->last.valuators[first_valuator]); &pDev->last.valuators[first_valuator]);
@ -938,7 +943,6 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
&pDev->last.valuators[first_valuator]); &pDev->last.valuators[first_valuator]);
/* Update the valuators with the true value sent to the client*/ /* Update the valuators with the true value sent to the client*/
/* FIXME: we lose subpixel precision here. */
if(v0) *v0 = x; if(v0) *v0 = x;
if(v1) *v1 = y; if(v1) *v1 = y;