Attachment 28388 Details for Bug 23126 – Patch 04: Corrected logging types, abstracted logic into 3 functions, simpler from reuse.

[patch] Patch 04: Corrected logging types, abstracted logic into 3 functions, simpler from reuse.

0004-evdev.c-Fix-improve-discrimination-of-rel-abs-axes.patch (text/plain), 5.28 KB, created by Michael Witten on 2009-08-05 16:56:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Witten

Created: 2009-08-05 16:56:46 UTC

Size: 5.28 KB

patch

obsolete

>From 11ccc552d1393371c929b14e9319cf2bd2cd8ab9 Mon Sep 17 00:00:00 2001
>From: Michael Witten <mfwitten@gmail.com>
>Date: Tue, 4 Aug 2009 03:11:49 -0500
>Subject: [PATCH] evdev.c: Fix/improve discrimination of rel/abs axes
>
>The relevant comment from evdev.c:
>
>We don't allow relative and absolute axes on the same device. The
>reason is that some devices (MS Optical Desktop 2000) register both
>rel and abs axes for x/y.
>
>The abs axes register min/max; this min/max then also applies to the
>relative device (the mouse) and caps it at 0..255 for both axes.
>So, unless you have a small screen, you won't be enjoying it much;
>consequently, absolute axes are generally ignored.
>
>However, currenly only a device with absolute axes can be registered
>as a touch{pad,screen}. Thus, given such a device, absolute axes are
>used and relative axes are ignored.
>
>The code for initializing abs/rel axes has been abstracted out into
>3 functions, so that initialization in EvdevInit(device) is as easy
>as:
>
>    if (pEvdev->flags & (EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN))
>        EvdevInitTouchDevice(device, pEvdev);
>    else if (pEvdev->flags & EVDEV_RELATIVE_EVENTS)
>        EvdevInitRelClass(device, pEvdev);
>    else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
>        EvdevInitAbsClass(device, pEvdev);
>
>Signed-off-by: Michael Witten <mfwitten@gmail.com>
>---
> src/evdev.c |   97 ++++++++++++++++++++++++++++++++++++++++++++++------------
> 1 files changed, 77 insertions(+), 20 deletions(-)
>
>diff --git a/src/evdev.c b/src/evdev.c
>index 9528dbf..bdf7f0a 100644
>--- a/src/evdev.c
>+++ b/src/evdev.c
>@@ -1410,6 +1410,64 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
> 
> }
> 
>+static void
>+EvdevInitAbsClass(DeviceIntPtr device, EvdevPtr pEvdev)
>+{
>+    if (EvdevAddAbsClass(device) == Success) {
>+
>+        xf86Msg(X_INFO,"%s: initialized for absolute axes.\n", device->name);
>+
>+    } else {
>+
>+        xf86Msg(X_ERROR,"%s: failed to initialize for absolute axes.\n",
>+                device->name);
>+
>+        pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
>+
>+    }
>+}
>+
>+static void
>+EvdevInitRelClass(DeviceIntPtr device, EvdevPtr pEvdev)
>+{
>+    int has_abs_axes = pEvdev->flags & EVDEV_ABSOLUTE_EVENTS;
>+
>+    if (EvdevAddRelClass(device) == Success) {
>+
>+        xf86Msg(X_INFO,"%s: initialized for relative axes.\n", device->name);
>+
>+        if (has_abs_axes) {
>+
>+            xf86Msg(X_WARNING,"%s: ignoring absolute axes.\n", device->name);
>+            pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
>+        }
>+
>+    } else {
>+
>+        xf86Msg(X_ERROR,"%s: failed to initialize for relative axes.\n",
>+                device->name);
>+
>+        pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
>+
>+        if (has_abs_axes)
>+            EvdevInitAbsClass(device, pEvdev);
>+    }
>+}
>+
>+static void
>+EvdevInitTouchDevice(DeviceIntPtr device, EvdevPtr pEvdev)
>+{
>+    if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) {
>+
>+        xf86Msg(X_WARNING,"%s: touchpads and touchscreens ignore relative "
>+                "axes.\n", device->name);
>+
>+        pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
>+    }
>+
>+    EvdevInitAbsClass(device, pEvdev);
>+}
>+
> static int
> EvdevInit(DeviceIntPtr device)
> {
>@@ -1428,28 +1486,27 @@ EvdevInit(DeviceIntPtr device)
> 	EvdevAddKeyClass(device);
>     if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
> 	EvdevAddButtonClass(device);
>-    /* We don't allow relative and absolute axes on the same device. Reason
>-       Reason being that some devices (MS Optical Desktop 2000) register both
>-       rel and abs axes for x/y.
>-       The abs axes register min/max, this min/max then also applies to the
>-       relative device (the mouse) and caps it at 0..255 for both axis.
>-       So unless you have a small screen, you won't be enjoying it much.
>-
>-        FIXME: somebody volunteer to fix this.
>+
>+    /* We don't allow relative and absolute axes on the same device. The
>+     * reason is that some devices (MS Optical Desktop 2000) register both
>+     * rel and abs axes for x/y.
>+     *
>+     * The abs axes register min/max; this min/max then also applies to the
>+     * relative device (the mouse) and caps it at 0..255 for both axes.
>+     * So, unless you have a small screen, you won't be enjoying it much;
>+     * consequently, absolute axes are generally ignored.
>+     *
>+     * However, currenly only a device with absolute axes can be registered
>+     * as a touch{pad,screen}. Thus, given such a device, absolute axes are
>+     * used and relative axes are ignored.
>      */
>-    if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) {
>-        if (EvdevAddRelClass(device) == Success)
>-        {
>-            if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
>-                xf86Msg(X_INFO,"%s: relative axes found, ignoring absolute "
>-                        "axes.\n", device->name);
>-            pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
>-        } else
>-            pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
>-    }
> 
>-    if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
>-        EvdevAddAbsClass(device);
>+    if (pEvdev->flags & (EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN))
>+        EvdevInitTouchDevice(device, pEvdev);
>+    else if (pEvdev->flags & EVDEV_RELATIVE_EVENTS)
>+        EvdevInitRelClass(device, pEvdev);
>+    else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
>+        EvdevInitAbsClass(device, pEvdev);
> 
> #ifdef HAVE_PROPERTIES
>     /* We drop the return value, the only time we ever want the handlers to
>-- 
>1.6.2.2.479.g2aec
>

Actions: View | Splinter Review

Attachments on bug 23126: 28329 | 28330 | 28331 | 28334 | 28340 | 28341 | 28355 | 28364 | 28388

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.