On Wed, Dec 02, 2009 at 01:54:54AM +0000, Mike Auty wrote:
> I just tried out xf86-input-wacom-0.10.2, and discovered that whilst
> everything else seems to work fine, rolling my mouse wheel up or down
> failed.
> 
> I carried out a git bisection and identified the big "Wacom Button
> Actions" check-in (3cfc3f5df754c6266127e3addbd6ee84c8f471d9) as the culprit.
> 
> Xev shows that on the last good commit, moving the mouse wheel up or
> down sends ButtonPress/ButtonRelease events, whereas the bad commit
> sends a MotionNotify and there are no Button events at all.
> 
> I'm happy to do run further tests, try out patches, or provide any
> further information that may help.  Just let me know...

oops sorry. I changed a define and then lost the fallback for wheel events.
Thanks for bisecting - following patch works for me:

>From 35322750898d1ba3c0b74f197b6d60a39b7ad781 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <[email protected]>
Date: Wed, 2 Dec 2009 13:58:11 +1000
Subject: [PATCH] AC_TYPE of 0 is a valid type for wheel events.

3cfc3f5df754c6266127e3addbd6ee84c8f471d9 introduced button actions. Wheel
events by default are simply assigned to a button. In the old code,
AC_BUTTON was 0, now AC_BUTTON is a specific event mask. Hence we need to
cater for both AC_BUTTON set or unset - they just happen to produce the same
result.

This is a quickfix, the wheel event processing seems it could use some
cleanup.

Signed-off-by: Peter Hutterer <[email protected]>
---
 src/wcmCommon.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index e197973..ea3c937 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -616,6 +616,7 @@ static void sendWheelStripEvents(LocalDevicePtr local, 
const WacomDeviceState* d
 
        switch (fakeButton & AC_TYPE)
        {
+           case 0: /* no spec. action defined */
            case AC_BUTTON:
                /* send both button on/off in the same event for pad */ 
                xf86PostButtonEvent(local->dev, is_absolute, fakeButton & 
AC_CODE,
-- 
1.6.5.2


------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing. 
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to