evdev 2.7.3

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Fix broken ButtonMapping option (#53168 )
2026-04-14 11:44:16 +00:00 · 2012-08-13 16:22:00 +10:00 · 2012-08-13 16:21:38 +10:00 · 2012-08-07 08:17:07 +10:00 · 2012-08-07 08:17:06 +10:00
3 changed files with 5 additions and 9 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-        [2.7.2],
+        [2.7.3],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ AM_CPPFLAGS =-I$(top_srcdir)/include

@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS)
+@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS)
@DRIVER_NAME@_drv_ladir = @inputdir@

@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1107,12 +1107,8 @@ EvdevReadInput(InputInfoPtr pInfo)
        if (len <= 0)
        {
            if (errno == ENODEV) /* May happen after resume */
-            {
-                EvdevMBEmuFinalize(pInfo);
-                Evdev3BEmuFinalize(pInfo);
                xf86RemoveEnabledDevice(pInfo);
-                EvdevCloseDevice(pInfo);
-            } else if (errno != EAGAIN)
+            else if (errno != EAGAIN)
            {
                /* We use X_NONE here because it doesn't alloc */
                xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name,
@@ -1669,7 +1665,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)

        xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);
        map = mapping;
-        while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS)
+        do
        {
            btn = strtol(map, &s, 10);

@@ -1683,7 +1679,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)

            pEvdev->btnmap[nbuttons++] = btn;
            map = s;
-        }
+        } while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS);
        free(mapping);
    }
Author	SHA1	Message	Date
Peter Hutterer	777cfa148f	evdev 2.7.3 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2012-08-13 16:22:00 +10:00
Peter Hutterer	447fd220e0	Fix broken ButtonMapping option (#53168 ) Regression introduced in `8af0e6f1eb`. s is now initialized to NULL, so we never entered the loop. X.Org Bug 53168 <http://bugs.freedesktop.org/show_bug.cgi?id=53168> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit `33e7831b5f`)	2012-08-13 16:21:38 +10:00
Peter Hutterer	f2c6da0242	Link against libudev Fixes /usr/bin/Xorg: symbol lookup error: /usr/lib64/xorg/modules/input/evdev_drv.so: undefined symbol: udev_new This doesn't appear in the default configuration as Xorg links against libudev and the symbol is defined when evdev is loaded. It can be reproduced with a HAL-enabled server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit `bc8997e812`)	2012-08-07 08:17:07 +10:00
Peter Hutterer	9791afc4c1	Don't delete the device on ENODEV This is signal handler code and we cannot clean up properly while in the signal handler. So reduce the code to removing the signal handler and let the device be cleaned up later. If hotplugging is on, the server will remove it when the config backend says so and if it is off, the server will remove it on shutdown. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> (cherry picked from commit `1cb8f074df`)	2012-08-07 08:17:06 +10:00