summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-29 12:03:07 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-29 12:03:41 +1000
commit68d86adbe8d84099812c37a04098f2ab5ccc45a4 (patch)
treeda0e4a3ea0bb0eadac7f6b12fabe610444767ff6
parentd7aef3f663f4b5d861799f8615dcd301d5ce2906 (diff)
dix: GetProximityEvents doesn't need extra events for valuators.
With internal events, we only have one event for all the data, no need to calculate for extra events. Reported-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/getevents.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 9c7ac441b..83aedbe35 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1138,12 +1138,6 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
if ((pDev->valuator->mode & 1) == Relative)
num_valuators = 0;
- if (num_valuators) {
- if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS)
- num_valuators = MAX_VALUATOR_EVENTS * 6;
- num_events += ((num_valuators - 1) / 6) + 1;
- }
-
/* You fail. */
if (first_valuator < 0 ||
(num_valuators + first_valuator) > pDev->valuator->numAxes)