From e7a364425547103a98acabfc67d16e1ae0c2967f Mon Sep 17 00:00:00 2001 From: Sascha Hlusiak Date: Tue, 25 Mar 2008 12:32:33 -0400 Subject: [PATCH 1/2] Fix getValuatorEvents to compute number of valuators correctly. --- dix/getevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/getevents.c b/dix/getevents.c index 3e6fe5ae0..6a2f7baf6 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -349,7 +349,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator, for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) { xv->type = DeviceValuator; xv->first_valuator = i; - xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); + xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (final_valuator - i); xv->deviceid = pDev->id; switch (final_valuator - i) { case 6: From 333e7123dc484888d79c0f5aa3977bd72f1eb341 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 25 Mar 2008 12:48:22 -0400 Subject: [PATCH 2/2] Fix that last commit. I can apply patches, really. --- dix/getevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/getevents.c b/dix/getevents.c index 6a2f7baf6..bf9331eae 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -349,7 +349,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator, for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) { xv->type = DeviceValuator; xv->first_valuator = i; - xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (final_valuator - i); + xv->num_valuators = ((final_valuator - i) > 6) ? 6 : (final_valuator - i); xv->deviceid = pDev->id; switch (final_valuator - i) { case 6: