[PATCH] dix: don't stop processing valuators when the mode changes.

Peter Hutterer peter.hutterer at who-t.net
Thu Nov 25 15:37:37 PST 2010


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 <peter.hutterer at who-t.net>
---
 dix/eventconvert.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index dd17898..7b894f0 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;
-- 
1.7.3.2


More information about the xorg-devel mailing list