Attachment 28692 Details for Bug 20529 – evdev patch to allow buttonless EmulateWheel, with an extra timing check

[patch] evdev patch to allow buttonless EmulateWheel, with an extra timing check

0001--Allow-0-as-wheel-emulation-button-for-unconditiona.patch (text/plain), 2.83 KB, created by Dima Kogan on 2009-08-16 23:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Kogan

Created: 2009-08-16 23:25:55 UTC

Size: 2.83 KB

patch

obsolete

>From 513b626b83d8dbfe251e9282a6d470eb8ff07041 Mon Sep 17 00:00:00 2001
>From: Dima Kogan <dkogan@secretsauce.net>
>Date: Sun, 16 Aug 2009 23:11:50 -0700
>Subject: [PATCH] [PATCH] Allow 0 as wheel emulation button for unconditional scrolling (#20529)
>
>If wheel emulation is on and the emulation button is 0, then any x/y motion
>of the device is converted into wheel events. The devices becomes a
>scrolling-only device.
>
>Signed-off-by: Dima Kogan <dkogan@cds.caltech.edu>
>---
> include/evdev-properties.h |    2 +-
> man/evdev.man              |    5 ++++-
> src/emuWheel.c             |   12 +++++++-----
> 3 files changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/include/evdev-properties.h b/include/evdev-properties.h
>index 55c5a39..3e3c194 100644
>--- a/include/evdev-properties.h
>+++ b/include/evdev-properties.h
>@@ -43,7 +43,7 @@
> #define EVDEV_PROP_WHEEL_INERTIA "Evdev Wheel Emulation Inertia"
> /* CARD16 */
> #define EVDEV_PROP_WHEEL_TIMEOUT "Evdev Wheel Emulation Timeout"
>-/* CARD8, value range 0-32  */
>+/* CARD8, value range 0-32, 0 to always scroll */
> #define EVDEV_PROP_WHEEL_BUTTON "Evdev Wheel Emulation Button"
> 
> /* Drag lock */
>diff --git a/man/evdev.man b/man/evdev.man
>index 07f125a..c3c5551 100644
>--- a/man/evdev.man
>+++ b/man/evdev.man
>@@ -105,7 +105,10 @@ press/release events as specified for the
> .B XAxisMapping
> and
> .B YAxisMapping
>-settings.  Default: 4. Property: "Evdev Wheel Emulation Button".
>+settings. If the button is 0 and
>+.BR EmulateWheel
>+is on, any motion of the device is converted into wheel events. Default: 4.
>+Property: "Evdev Wheel Emulation Button".
> .TP 7
> .BI "Option \*qEmulateWheelInertia\*q \*q" integer \*q
> Specifies how far (in pixels) the pointer must move to generate button
>diff --git a/src/emuWheel.c b/src/emuWheel.c
>index 421477e..3ff1dc3 100644
>--- a/src/emuWheel.c
>+++ b/src/emuWheel.c
>@@ -100,18 +100,20 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
>     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
>     WheelAxisPtr pAxis = NULL;
>     int value = pEv->value;
>-    int ms;
> 
>     /* Has wheel emulation been configured to be enabled? */
>     if (!pEvdev->emulateWheel.enabled)
> 	return FALSE;
> 
>-    /* Handle our motion events if the emuWheel button is pressed*/
>-    if (pEvdev->emulateWheel.button_state) {
>+    /* Handle our motion events if the emuWheel button is pressed
>+     * wheel button of 0 means always emulate wheel.
>+     */
>+    if (pEvdev->emulateWheel.button_state || !pEvdev->emulateWheel.button) {
>         /* Just return if the timeout hasn't expired yet */
>-        ms = pEvdev->emulateWheel.expires - GetTimeInMillis();
>-        if (ms > 0)
>+        if (pEvdev->emulateWheel.button &&
>+            pEvdev->emulateWheel.expires - GetTimeInMillis() > 0) {
>             return TRUE;
>+        }
> 
> 	/* We don't want to intercept real mouse wheel events */
> 	switch(pEv->code) {
>-- 
>1.6.2.4
>

Actions: View | Splinter Review

Attachments on bug 20529: 23646 | 28683 | 28684 | 28690 | 28691 | 28692

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.