X expects buttons 4-7 to be the scrolling directions, hence if our device
has more than 3 buttons, we need to add 4 to the actual number of buttons
reported.

Signed-off-by: Peter Hutterer <[email protected]>
---
Alexia, I think this one is the reason for the bamboo button issue.


 src/xf86Wacom.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index 872e4aa..15ce5a4 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -654,7 +654,7 @@ static int wcmRegisterX11Devices (LocalDevicePtr local)
                butmap[loop] = loop;
 
        /* FIXME: button labels would be nice */
-       if (InitButtonClassDeviceStruct(local->dev, nbbuttons,
+       if (InitButtonClassDeviceStruct(local->dev, (nbbuttons > 4) ? nbbuttons 
+ 4 : nbbuttons,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                        btn_labels,
 #endif
-- 
1.6.6.1

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to