evdev 2.10.1

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Only map x and y to axes 0 and 1
2026-04-14 11:44:16 +00:00 · 2016-01-08 15:11:59 +10:00 · 2015-11-13 06:50:28 +10:00
2 changed files with 9 additions and 4 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-        [2.10.0],
+        [2.10.1],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1377,7 +1377,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int num_scroll_axes)
    }
    atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom));

-    i = 0;
+    i = 2;
    for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) {
        int j;
        pEvdev->abs_axis_map[axis] = -1;
@@ -1385,9 +1385,14 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int num_scroll_axes)
            is_blacklisted_axis(axis))
            continue;

-        mapping = i;
+        if (axis == ABS_X)
+            mapping = 0;
+        else if (axis == ABS_Y)
+            mapping = 1;
+        else
+            mapping = i;

-        for (j = 0; j < ArrayLength(mt_axis_mappings); j++)
+        for (j = 0; !pEvdev->fake_mt && j < ArrayLength(mt_axis_mappings); j++)
        {
            if (mt_axis_mappings[j].code == axis)
                mt_axis_mappings[j].mapping = mapping;