diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-22 14:01:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-22 16:18:59 +1000 |
| commit | ea567b675f814ac41e75f1ed8ded0ac3e9d552a8 (patch) | |
| tree | 169c626b746a25adf9a71766227bf0c50c4fea8c | |
| parent | 4381b70f5aa293400735e9b4e5a792408afa25a2 (diff) | |
dix: populate motion history only if the mode matches the first axis.
XI1 doesn't cater for mixed mode devices, so bail out on the first valuator
that has a different mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | dix/getevents.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 1d41fb7d9..bbad692d1 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -378,8 +378,7 @@ AllocateMotionHistory(DeviceIntPtr pDev) int numAxes; /* XI1 doesn't understand mixed mode devices */ for (numAxes = 0; numAxes < v->numAxes; numAxes++) - if ((v->axes[numAxes].mode & DeviceMode) != - (v->mode & DeviceMode)) + if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0)) break; size = sizeof(INT32) * numAxes; } @@ -564,8 +563,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask, for (i = 0; i < v->numAxes; i++) { /* XI1 doesn't support mixed mode devices */ - if ((pDev->valuator->axes[i].mode & DeviceMode) != - (pDev->valuator->mode & DeviceMode)) + if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0)) break; if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i)) { |