From 5d31c3e705dfd9f38f0fffcd07a6d8d06644735c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 26 Nov 2010 09:37:37 +1000 Subject: [PATCH] dix: don't stop processing valuators when the mode changes. XI 1.x events still contain absolute coordinates anyway. By the time we get to the InternalEvent to XI event conversion, the valuators are already absolute. Stopping because of a different mode on a valuator is not necessary. Signed-off-by: Peter Hutterer Reviewed-by: Adam Jackson Reviewed-by: Chase Douglas --- dix/eventconvert.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dix/eventconvert.c b/dix/eventconvert.c index dd17898b7..7b894f016 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -326,14 +326,6 @@ countValuators(DeviceEvent *ev, int *first) { if (BitIsOn(ev->valuators.mask, i)) { - /* Assume mode of first_valuator matches XI1 device mode. Stop when the - * event mode changes since XI1 can't handle mixed mode devices. - */ - if (first_valuator > -1 && - BitIsOn(ev->valuators.mode, i) != - BitIsOn(ev->valuators.mode, first_valuator)) - break; - if (first_valuator == -1) first_valuator = i; last_valuator = i;