summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-11-26 09:37:37 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-12-07 08:07:53 +1000
commit5d31c3e705dfd9f38f0fffcd07a6d8d06644735c (patch)
treeb24a15ba42f67c17bc0b409053bd38f16f47a286
parent311cad33155c64ed996418808727fc417168592e (diff)
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 <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--dix/eventconvert.c8
1 files changed, 0 insertions, 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;