xserver: Branch 'server-1.5-branch'
Adam Jackson
ajax at kemper.freedesktop.org
Tue Mar 25 09:33:05 PDT 2008
dix/getevents.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff99a3aa2b6f3918c7692f360a3df30cf5a541ec
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date: Tue Mar 25 12:32:33 2008 -0400
Fix getValuatorEvents to compute number of valuators correctly.
(cherry picked from commit e7a364425547103a98acabfc67d16e1ae0c2967f)
diff --git a/dix/getevents.c b/dix/getevents.c
index 3e6fe5a..6a2f7ba 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:
More information about the xorg-commit
mailing list