evdev 2.2.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Define MAX_VALUATORS if it's missing to allow for builds against 1.5.
2026-04-14 11:44:16 +00:00 · 2009-03-09 10:02:23 +10:00 · 2009-03-09 09:31:16 +10:00 · 2009-03-09 09:23:57 +10:00 · 2009-03-06 19:45:28 +10:00
3 changed files with 10 additions and 2 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@

 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-        2.1.99.1,
+        2.2.0,
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        xf86-input-evdev)

--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2002,6 +2002,9 @@ EvdevInitProperty(DeviceIntPtr dev)
                    int group = (button % 0x100)/16;
                    int idx = button - ((button/16) * 16);

+                    if (!btn_labels[group][idx])
+                        continue;
+
                    atom = XIGetKnownProperty(btn_labels[group][idx]);
                    if (!atom)
                        continue;
@@ -2014,7 +2017,7 @@ EvdevInitProperty(DeviceIntPtr dev)

            /* wheel buttons, hardcoded anyway */
            atoms[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-            atoms[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+            atoms[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
            atoms[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
            atoms[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

--- a/src/evdev.h
+++ b/src/evdev.h
@@ -59,6 +59,11 @@
 #define HAVE_PROPERTIES 1
 #endif

+#ifndef MAX_VALUATORS
+#define MAX_VALUATORS 36
+#endif
+
+
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
 typedef struct {
    char *rules;
Author	SHA1	Message	Date
Peter Hutterer	73e5eba8cd	evdev 2.2.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2009-03-09 10:02:23 +10:00
Peter Hutterer	31853c39bf	Define MAX_VALUATORS if it's missing to allow for builds against 1.5. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2009-03-09 09:31:16 +10:00
Peter Hutterer	2c49e21a81	Check button label before fetching the Atom from the server. (#20524 ) The server doesn't like NULL names, so don't call XIGetKnownProperty for labels that don't exist. X.Org Bug 20524 <http://bugs.freedesktop.org/show_bug.cgi?id=20524> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Peter Henriksson	2009-03-09 09:23:57 +10:00
Peter Hutterer	4361b3efa0	Fix duplicate wheel button up mapping. Reported by Simon Thum. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Simon Thum <simon.thum@gmx.de>	2009-03-06 19:45:28 +10:00