Attachment 119527 Details for Bug 92856 – 0001-Only-map-x-and-y-to-axes-0-and-1.patch

[patch] 0001-Only-map-x-and-y-to-axes-0-and-1.patch

0001-Only-map-x-and-y-to-axes-0-and-1.patch (text/plain), 1.82 KB, created by Peter Hutterer on 2015-11-10 04:48:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2015-11-10 04:48:23 UTC

Size: 1.82 KB

patch

obsolete

>From 4d3ec24b0a9cc336188f54dfe1816fbe003c2df3 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Tue, 10 Nov 2015 14:35:51 +1000
>Subject: [PATCH evdev] Only map x and y to axes 0 and 1
>
>The Logitech G600 has one device with all axes north of ABS_MISC. The current
>code assigns ABS_MISC as first axis to map to axis 0, i.e. x. On button press,
>one node sends the BTN_LEFT but the other node sends an ABS_MISC with a 1 0
>value. ABS_MISC is mapped to axis 0, this moves the pointer to (0, y) on
>every button click.
>
>Avoid this by simply mapping any axis other than x/y to at least axis 3, and
>make sure we only override the MT 0/1 axes when we actually have MT axes.
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> src/evdev.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/src/evdev.c b/src/evdev.c
>index 17d9d61..3176660 100644
>--- 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;
>-- 
>2.4.3
>

Actions: View | Splinter Review

Attachments on bug 92856: 119514 | 119515 | 119516 | 119517 | 119527 | 119539

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.