evdev 2.3.2

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Fix up BTN_TOUCH handling for non-button tablets.
2026-04-14 11:44:16 +00:00 · 2009-12-11 13:42:33 +10:00 · 2009-12-03 09:27:32 +10:00 · 2009-12-03 09:27:31 +10:00 · 2009-12-03 09:27:28 +10:00 · 2009-12-03 09:27:25 +10:00
2 changed files with 34 additions and 11 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@

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

--- a/src/evdev.c
+++ b/src/evdev.c
@@ -464,6 +464,13 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
     */
    else if (pEvdev->abs && pEvdev->tool) {
        memcpy(v, pEvdev->vals, sizeof(int) * pEvdev->num_vals);
+
+        if (pEvdev->swap_axes) {
+            int tmp = v[0];
+            v[0] = v[1];
+            v[1] = tmp;
+        }
+
        if (pEvdev->flags & EVDEV_CALIBRATED)
        {
            v[0] = xf86ScaleAxis(v[0],
@@ -476,12 +483,6 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
                    pEvdev->calibration.max_y, pEvdev->calibration.min_y);
        }

-        if (pEvdev->swap_axes) {
-            int tmp = v[0];
-            v[0] = v[1];
-            v[1] = tmp;
-        }
-
        if (pEvdev->invert_x)
            v[0] = (pEvdev->absinfo[ABS_X].maximum - v[0] +
                    pEvdev->absinfo[ABS_X].minimum);
@@ -616,7 +617,6 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
            return;

    switch (ev->code) {
-        case BTN_TOUCH:
        case BTN_TOOL_PEN:
        case BTN_TOOL_RUBBER:
        case BTN_TOOL_BRUSH:
@@ -626,7 +626,11 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
        case BTN_TOOL_MOUSE:
        case BTN_TOOL_LENS:
            pEvdev->tool = value ? ev->code : 0;
-            if (!(pEvdev->flags & EVDEV_TOUCHSCREEN))
+            break;
+
+        case BTN_TOUCH:
+            pEvdev->tool = value ? ev->code : 0;
+            if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET)))
                break;
            /* Treat BTN_TOUCH from devices that only have BTN_TOUCH as
             * BTN_LEFT. */
@@ -1928,6 +1932,11 @@ EvdevProbe(InputInfoPtr pInfo)
            {
                xf86Msg(X_INFO, "%s: Found absolute tablet.\n", pInfo->name);
                pEvdev->flags |= EVDEV_TABLET;
+                if (!pEvdev->num_buttons)
+                {
+                    pEvdev->num_buttons = 7; /* LMR + scroll wheels */
+                    pEvdev->flags |= EVDEV_BUTTON_EVENTS;
+                }
            } else if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask) ||
                TestBit(BTN_TOUCH, pEvdev->key_bitmask)) {
                if (num_buttons || TestBit(BTN_TOOL_FINGER, pEvdev->key_bitmask)) {
@@ -2510,8 +2519,22 @@ EvdevInitProperty(DeviceIntPtr dev)

        prop_calibration = MakeAtom(EVDEV_PROP_CALIBRATION,
                strlen(EVDEV_PROP_CALIBRATION), TRUE);
-        rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER, 32,
-                PropModeReplace, 0, NULL, FALSE);
+        if (pEvdev->flags & EVDEV_CALIBRATED) {
+            int calibration[4];
+
+            calibration[0] = pEvdev->calibration.min_x;
+            calibration[1] = pEvdev->calibration.max_x;
+            calibration[2] = pEvdev->calibration.min_y;
+            calibration[3] = pEvdev->calibration.max_y;
+
+            rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
+                    32, PropModeReplace, 4, calibration,
+                    FALSE);
+        } else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) {
+            rc = XIChangeDeviceProperty(dev, prop_calibration, XA_INTEGER,
+                    32, PropModeReplace, 0, NULL,
+                    FALSE);
+        }
        if (rc != Success)
            return;
Author	SHA1	Message	Date
Peter Hutterer	f7850a4042	evdev 2.3.2 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2009-12-11 13:42:33 +10:00
Peter Hutterer	bd4102af6e	Fix up BTN_TOUCH handling for non-button tablets. BTN_TOOL_* is treated as tool, just like before. BTN_TOUCH on the other hand may need to be treated as a button left press. This again requires a button class. Tested on an HP Touchsmart and a Wacom tablet. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit `1b0df04abe`)	2009-12-03 09:27:32 +10:00
Peter Hutterer	22e816eb32	Only init the calibration property for absolute devices. Relative devices can't be calibrated anyway so why bother. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit `2ca24a16f0`)	2009-12-03 09:27:31 +10:00
David Woodhouse	b6b377fe9a	Report initial calibration parameters. Where an initial calibration is provided through the Calibration option to the driver, it wasn't being exposed in the 'Evdev Axis Calibration' property. Remedy that... Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit `7b285a802b`)	2009-12-03 09:27:28 +10:00
David Woodhouse	3772676fd6	Swap axes before applying touch screen calibration. When the SwapAxes option is set, the X and Y axes in calibration should be labelled as the user perceives them -- not as the kernel sends them. Currently, we apply the X-axis calibration to the X-axis of the input, and then do the axis swapping so we've actually applied the X-axis calibration to what the user sees as the Y-axis. This patch changes the order of the operations, so that the axes are swapped before the calibration is applied. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit `f187badb71`)	2009-12-03 09:27:25 +10:00