evdev 2.10.6

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Fix generation of proximity-in/out events.
2026-04-14 11:44:16 +00:00 · 2018-05-29 10:05:22 +10:00 · 2018-05-29 10:00:26 +10:00 · 2018-05-29 10:00:05 +10:00 · 2018-01-30 13:37:57 +10:00 · 2018-01-16 16:30:59 +10:00
3 changed files with 23 additions and 8 deletions
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,14 +1,17 @@
 #! /bin/sh

-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.

 ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"

 autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
+
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+    git config --local format.subjectPrefix "PATCH xf86-input-evdev"

 if test -z "$NOCONFIGURE"; then
-    $srcdir/configure "$@"
+    exec "$srcdir"/configure "$@"
 fi
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-        [2.10.5],
+        [2.10.6],
        [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
@@ -551,6 +551,16 @@ EvdevProcessProximityState(InputInfoPtr pInfo)
        }
    }

+    /* Wacom's last frame resets all values to 0, including x/y.
+       Skip over this. */
+    if (prox_state == 0) {
+        int v;
+        if (valuator_mask_fetch(pEvdev->abs_vals, 0, &v) && v == 0)
+            valuator_mask_unset(pEvdev->abs_vals, 0);
+        if (valuator_mask_fetch(pEvdev->abs_vals, 1, &v) && v == 0)
+            valuator_mask_unset(pEvdev->abs_vals, 1);
+    }
+
    if ((prox_state && !pEvdev->in_proximity) ||
        (!prox_state && pEvdev->in_proximity))
    {
@@ -905,7 +915,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which)
                break;
            case EV_QUEUE_PROXIMITY:
                if (pEvdev->queue[i].val == which)
-                    xf86PostProximityEvent(pInfo->dev, which, 0, 0);
+                    xf86PostProximityEventM(pInfo->dev, which, pEvdev->old_vals);
                break;
        }
    }
@@ -2353,8 +2363,10 @@ EvdevProbe(InputInfoPtr pInfo)
            pInfo->type_name = XI_TOUCHSCREEN;
 	} else {
            if (!libevdev_has_event_code(pEvdev->dev, EV_REL, REL_X) ||
-                !libevdev_has_event_code(pEvdev->dev, EV_REL, REL_Y))
+                !libevdev_has_event_code(pEvdev->dev, EV_REL, REL_Y)) {
+                pEvdev->flags |= EVDEV_RELATIVE_EVENTS;
                EvdevForceXY(pInfo, Relative);
+            }
 	    xf86IDrvMsg(pInfo, X_INFO, "Configuring as mouse\n");
 	    pInfo->type_name = XI_MOUSE;
 	}
@@ -2485,7 +2497,7 @@ EvdevOpenDevice(InputInfoPtr pInfo)
    }

    if (pInfo->fd < 0) {
-        xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\".\n", device);
+        xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\" (%s).\n", device, strerror(errno));
        return BadValue;
    }
Author	SHA1	Message	Date
Peter Hutterer	67a97afbc0	evdev 2.10.6 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2018-05-29 10:05:22 +10:00
Andrey Zabolotnyi	2fb95783e0	Fix generation of proximity-in/out events. Invoking xf86PostProximityEvent with no valuators does nothing, so we have to provide a valid valuator set to the call. https://bugs.freedesktop.org/show_bug.cgi?id=104562 [whot: slight change from 104562 abs_vals is reset on every frame but old_vals is kept around to remember the last value of the valuator (and is updated to the current values before processing the frame). We expect the prox in to have x/y, so let's just unconditionally use old_vals for proximity events.] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2018-05-29 10:00:26 +10:00
Peter Hutterer	456f23cbbd	Ignore x/y axis changes on proximity out Wacom tablets send a farewell reset to 0 on all axes when the tool goes out of proximity. Ignore those so we can rely on our various valuator masks always having the correct coordinates. Possible false positive if you manage to go out of proximity right above the zero datum but meh. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2018-05-29 10:00:05 +10:00
Christian Gmeiner	ab1d9adfd3	Print cause of a failed open(..) call This is quite helpful for debugging. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2018-01-30 13:37:57 +10:00
Andrey Zabolotnyi	192fdb0690	Fix handling of devices with only buttons (e.g. tablet pads). When transforming 'only buttons' device into a pseudo-mouse by adding relative X and Y axes, EVDEV_RELATIVE_EVENTS flag must be set on device, otherwise it gets classified as a keyboard by X11. https://bugs.freedesktop.org/show_bug.cgi?id=104630 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2018-01-16 16:30:59 +10:00
Mihail Konev	8c1058f2eb	autogen: add default patch prefix Signed-off-by: Mihail Konev <k.mvc@ya.ru>	2017-01-26 14:00:21 +10:00
Emil Velikov	4921912374	autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2017-01-26 11:13:25 +10:00
Peter Hutterer	67681097b8	autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>	2017-01-26 11:13:25 +10:00