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

dix: store all valuators as they come from the device in the valuator events. 

The event's sequenceNumber is mis-used to determine whether the values are
relative or absolute.
This commit is contained in:
Peter Hutterer 2008-04-28 16:56:22 +09:30
parent 53dba5381f
commit f2a20294fe
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dix/getevents.c
View File

@ -386,13 +386,15 @@ clipValuators(DeviceIntPtr pDev, int first_valuator, int num_valuators,
* Fills events with valuator events for pDev, as given by the other * Fills events with valuator events for pDev, as given by the other
* parameters. * parameters.
* *
* Note that we mis-use the sequence number to store the absolute bit.
*
* FIXME: Need to fix ValuatorClassRec to store all the valuators as * FIXME: Need to fix ValuatorClassRec to store all the valuators as
* last posted, not just x and y; otherwise relative non-x/y * last posted, not just x and y; otherwise relative non-x/y
* valuators, though a very narrow use case, will be broken. * valuators, though a very narrow use case, will be broken.
*/ */
static EventList * static EventList *
getValuatorEvents(EventList *events, DeviceIntPtr pDev, int first_valuator, getValuatorEvents(EventList *events, DeviceIntPtr pDev, int absolute,
int num_valuators, int *valuators) { int first_valuator, int num_valuators, int *valuators) {
deviceValuator *xv; deviceValuator *xv;
int i = 0, final_valuator = first_valuator + num_valuators; int i = 0, final_valuator = first_valuator + num_valuators;
@ -419,6 +421,8 @@ getValuatorEvents(EventList *events, DeviceIntPtr pDev, int first_valuator,
if (i + 6 < final_valuator) if (i + 6 < final_valuator)
xv->deviceid |= MORE_EVENTS; xv->deviceid |= MORE_EVENTS;
xv->sequenceNumber = (absolute) ? Absolute : Relative;
} }
return events; return events;
@ -561,8 +565,8 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
if (num_valuators) { if (num_valuators) {
kbp->deviceid |= MORE_EVENTS; kbp->deviceid |= MORE_EVENTS;
clipValuators(pDev, first_valuator, num_valuators, valuators); clipValuators(pDev, first_valuator, num_valuators, valuators);
events = getValuatorEvents(events, pDev, first_valuator, events = getValuatorEvents(events, pDev, FALSE /* relative */,
num_valuators, valuators); first_valuator, num_valuators, valuators);
} }
return numEvents; return numEvents;
@ -751,14 +755,6 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
* to the current screen. Right now, we only have one history buffer, * to the current screen. Right now, we only have one history buffer,
* so we don't set this for both the device and core.*/ * so we don't set this for both the device and core.*/
miPointerSetPosition(pDev, &x, &y, ms); miPointerSetPosition(pDev, &x, &y, ms);
/* Drop x and y back into the valuators list, if they were originally
* present. */
if (first_valuator == 0 && num_valuators >= 1)
valuators[0] = x;
if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
valuators[1 - first_valuator] = y;
updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators);
pDev->lastx = x; pDev->lastx = x;
@ -791,8 +787,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
if (num_valuators) { if (num_valuators) {
kbp->deviceid |= MORE_EVENTS; kbp->deviceid |= MORE_EVENTS;
clipValuators(pDev, first_valuator, num_valuators, valuators); clipValuators(pDev, first_valuator, num_valuators, valuators);
events = getValuatorEvents(events, pDev, first_valuator, events = getValuatorEvents(events, pDev, (flags & POINTER_ABSOLUTE),
num_valuators, valuators); first_valuator, num_valuators, valuators);
} }
return num_events; return num_events;
@ -859,8 +855,8 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
kbp->deviceid |= MORE_EVENTS; kbp->deviceid |= MORE_EVENTS;
events++; events++;
clipValuators(pDev, first_valuator, num_valuators, valuators); clipValuators(pDev, first_valuator, num_valuators, valuators);
events = getValuatorEvents(events, pDev, first_valuator, events = getValuatorEvents(events, pDev, False /* relative */,
num_valuators, valuators); first_valuator, num_valuators, valuators);
} }
return num_events; return num_events;