Attachment 32496 Details for Bug 25915 – Implements switch_mode for devices with absolute axis

[patch] Implements switch_mode for devices with absolute axis

0001-Implements-switch_mode-for-devices-with-absolute-axi.patch (text/plain), 5.81 KB, created by Andrej Gelenberg on 2010-01-07 02:19:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrej Gelenberg

Created: 2010-01-07 02:19:41 UTC

Size: 5.81 KB

patch

obsolete

>From e0a16d13975d363ed34109b2007c014f60eebe93 Mon Sep 17 00:00:00 2001
>From: Andrej Gelenberg <andrej.gelenberg@udo.edu>
>Date: Thu, 7 Jan 2010 10:55:24 +0100
>Subject: [PATCH] Implements switch_mode for devices with absolute axis
>
>
>Signed-off-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
>---
> configure.ac  |    3 ++
> man/evdev.man |    4 +++
> src/evdev.c   |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 3 files changed, 69 insertions(+), 3 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 9d8d0a7..759c1ae 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -55,6 +55,9 @@ AC_ARG_WITH(xorg-module-dir,
> inputdir=${moduledir}/input
> AC_SUBST(inputdir)
> 
>+# Checks for extensions
>+XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
>+
> # Checks for pkg-config packages. We need to be able to override sdkdir
> # to satisfy silly distcheck requirements.
> PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
>diff --git a/man/evdev.man b/man/evdev.man
>index 4771167..0d75828 100644
>--- a/man/evdev.man
>+++ b/man/evdev.man
>@@ -159,6 +159,10 @@ originally reported by the kernel (e.g. touchscreens). The scaling to the
> custom coordinate system is done in-driver and the X server is unaware of
> the transformation. Property: "Evdev Axis Calibration".
> .TP 7
>+.B Option \*qMode\*q \*qRelative\*q\fP|\fP\*qAbsolute\*q
>+sets the mode of the device, if device has absolute axis.
>+The derfault value for touchpad is relative, for other absolute.
>+.TP 7
> .BI "Option \*qSwapAxes\*q \*q" Bool \*q
> Swap x/y axes. Default: off. Property: "Evdev Axes Swap".
> .TP 7
>diff --git a/src/evdev.c b/src/evdev.c
>index 7e65c69..a6a67f2 100644
>--- a/src/evdev.c
>+++ b/src/evdev.c
>@@ -32,6 +32,7 @@
> #endif
> 
> #include <X11/keysym.h>
>+#include <X11/extensions/XI.h>
> 
> #include <sys/stat.h>
> #include <unistd.h>
>@@ -92,6 +93,7 @@
> #define EVDEV_TABLET		(1 << 8) /* device looks like a tablet? */
> #define EVDEV_UNIGNORE_ABSOLUTE (1 << 9) /* explicitly unignore abs axes */
> #define EVDEV_UNIGNORE_RELATIVE (1 << 10) /* explicitly unignore rel axes */
>+#define EVDEV_RELATIVE_MODE	(1 << 11) /* Force relative events for devices with absolute axis */
> 
> #define MIN_KEYCODE 8
> #define GLYPHS_PER_KEY 2
>@@ -117,6 +119,7 @@ static const char *evdevDefaults[] = {
> static int EvdevOn(DeviceIntPtr);
> static int EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare);
> static void EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
>+static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode);
> 
> #ifdef HAVE_PROPERTIES
> static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms);
>@@ -136,6 +139,35 @@ static Atom prop_btn_label = 0;
>  * cannot be used by evdev, leaving us with a space of 2 at the end. */
> static EvdevPtr evdev_devices[MAXDEVICES] = {NULL};
> 
>+static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode)
>+{
>+    InputInfoPtr pInfo;
>+    EvdevPtr pEvdev;
>+ 
>+    pInfo = device->public.devicePrivate;
>+    pEvdev = pInfo->private;
>+
>+    if ( !(pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) )
>+        return BadMatch;
>+
>+    switch ( mode )
>+    {
>+        case Absolute:
>+            xf86Msg(X_INFO, "%s: switch to absolute mode\n", pInfo->name);
>+            pEvdev->flags &= ~EVDEV_RELATIVE_MODE;
>+            break;
>+        case Relative:
>+            xf86Msg(X_INFO, "%s: switch to relative mode\n", pInfo->name);
>+            pEvdev->flags |= EVDEV_RELATIVE_MODE;
>+            break;
>+        default:
>+            xf86Msg(X_WARNING, "%s: unknown mode (%d)\n", pInfo->name, mode);
>+            return BadValue;
>+    }
>+
>+    return Success;
>+}
>+
> static size_t CountBits(unsigned long *array, size_t nlongs)
> {
>     unsigned int i;
>@@ -341,7 +373,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
>     *num_v = *first_v = 0;
> 
>     /* convert to relative motion for touchpads */
>-    if (pEvdev->abs && (pEvdev->flags & EVDEV_TOUCHPAD)) {
>+    if (pEvdev->abs && (pEvdev->flags & EVDEV_RELATIVE_MODE)) {
>         if (pEvdev->tool) { /* meaning, touch is active */
>             if (pEvdev->old_vals[0] != -1)
>                 pEvdev->delta[REL_X] = pEvdev->vals[0] - pEvdev->old_vals[0];
>@@ -567,7 +599,6 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
>             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
>@@ -1129,6 +1160,7 @@ EvdevAddAbsClass(DeviceIntPtr device)
>     EvdevPtr pEvdev;
>     int num_axes, axis, i = 0;
>     Atom *atoms;
>+    const char *mode;
> 
>     pInfo = device->public.devicePrivate;
>     pEvdev = pInfo->private;
>@@ -1200,6 +1232,33 @@ EvdevAddAbsClass(DeviceIntPtr device)
>          TestBit(ABS_TILT_Y, pEvdev->abs_bitmask)))
>         pInfo->flags |= XI86_POINTER_CAPABLE;
> 
>+    if ( pEvdev->flags & EVDEV_TOUCHPAD )
>+    {
>+        pEvdev->flags |= EVDEV_RELATIVE_MODE;
>+    }
>+    else
>+    {
>+        pEvdev->flags &= ~EVDEV_RELATIVE_MODE;
>+    }
>+
>+    if (xf86FindOption(pInfo->options, "Mode"))
>+    {
>+        mode = xf86SetStrOption(pInfo->options, "Mode", NULL);
>+        if (!strcasecmp("absolute", mode))
>+        {
>+            pEvdev->flags &= ~EVDEV_RELATIVE_MODE;
>+        }
>+        else if (!strcasecmp("relative", mode))
>+        {
>+            pEvdev->flags |= EVDEV_RELATIVE_MODE;
>+        }
>+	else
>+	{
>+	    xf86Msg(X_INFO, "%s: unknown mode, use default\n", pInfo->name);
>+	}
>+    }
>+ 
>+
>     return Success;
> }
> 
>@@ -1966,7 +2025,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
>     pInfo->history_size = 0;
>     pInfo->control_proc = NULL;
>     pInfo->close_proc = NULL;
>-    pInfo->switch_mode = NULL;
>+    pInfo->switch_mode = EvdevSwitchMode;
>     pInfo->conversion_proc = NULL;
>     pInfo->reverse_conversion_proc = NULL;
>     pInfo->dev = NULL;
>-- 
>1.6.6
>

Actions: View | Splinter Review

Attachments on bug 25915: 32475 | 32496 | 32551 | 32583

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.