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

Clean up getValuatorEvents using array loop logic 

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas 2011-03-28 16:04:47 -04:00 committed by Peter Hutterer
parent 633b81e8ba
commit ac00ab77d5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dix/eventconvert.c
View File

@ -397,25 +397,17 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
/* FIXME: non-continuous valuator data in internal events*/ /* FIXME: non-continuous valuator data in internal events*/
for (i = 0; i < num_valuators; i += 6, xv++) { for (i = 0; i < num_valuators; i += 6, xv++) {
INT32 *valuators = &xv->valuator0; // Treat all 6 vals as an array
int j;
xv->type = DeviceValuator; xv->type = DeviceValuator;
xv->first_valuator = first_valuator + i; xv->first_valuator = first_valuator + i;
xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i);
xv->deviceid = ev->deviceid; xv->deviceid = ev->deviceid;
xv->device_state = state; xv->device_state = state;
switch (xv->num_valuators) {
case 6: for (j = 0; j < xv->num_valuators; j++)
xv->valuator5 = ev->valuators.data[xv->first_valuator + 5]; valuators[j] = ev->valuators.data[xv->first_valuator + j];
case 5:
xv->valuator4 = ev->valuators.data[xv->first_valuator + 4];
case 4:
xv->valuator3 = ev->valuators.data[xv->first_valuator + 3];
case 3:
xv->valuator2 = ev->valuators.data[xv->first_valuator + 2];
case 2:
xv->valuator1 = ev->valuators.data[xv->first_valuator + 1];
case 1:
xv->valuator0 = ev->valuators.data[xv->first_valuator + 0];
}
if (i + 6 < num_valuators) if (i + 6 < num_valuators)
xv->deviceid |= MORE_EVENTS; xv->deviceid |= MORE_EVENTS;