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

dix: don't allow relative data in deviceValuators. 

In GPE, we don't care about the device mode. Let's put the absolute values
into the deviceValuator event and worry about relative valuators on the other
side of the EQ.
This commit is contained in:
Peter Hutterer 2008-05-23 13:23:02 +09:30
parent 75551a2ef9
commit 7eec1c23a3
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dix/getevents.c
View File

@ -833,23 +833,10 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators);
/* update the valuators based on the mode of the InputDevice */
if(pDev->valuator->mode == Absolute) {
/* Update the valuators with the true value sent to the client*/
if(v0) *v0 = x;
if(v1) *v1 = y;
/*TODO Ensure that valuator 2 and onward also are absolute */
} else {/* Relative mode */
/* If driver reported in absolute, calculate the relative valuator
* values as a delta from the old absolute values of the valuator
* values. If relative report, keep it as-is.*/
if (flags & POINTER_ABSOLUTE) {
int i;
for (i = 0; i < num_valuators && i < pDev->last.numValuators; i++)
valuators[i] = valuators[i] - pDev->last.valuators[i + first_valuator];
}
}
/* Update the valuators with the true value sent to the client*/
if(v0) *v0 = x;
if(v1) *v1 = y;
/* TODO: other axes */
/* dropy x/y (device coordinates) back into valuators for next event */
pDev->last.valuators[0] = x;