Blob Blame History Raw
From ea2769f8efbffffb13d2971a7f829a5590daee6d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 11 May 2010 08:24:14 +1000
Subject: [PATCH] Revert "Always init wheel buttons to 4/5."

This commit leads to weird button events on tools like the Art Pen.
http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTil9O7b5Q7k03-zBWS_mSEJ79dDuh0ZqsBhuOI2v%40mail.gmail.com&forum_name=linuxwacom-discuss

This reverts commit 0fbd3e34d792cb17163c1974d7e8ce93c24242a0.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/wcmConfig.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 597aa4e..34b00c5 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -88,8 +88,8 @@ static int wcmAllocate(LocalDevicePtr local)
 	priv->relup = 5;			/* Default relative wheel up event */
 	priv->reldn = 4;			/* Default relative wheel down event */
 
-	priv->wheelup = 4;			/* Default absolute wheel up event */
-	priv->wheeldn = 5;			/* Default absolute wheel down event */
+	priv->wheelup = IsPad (priv) ? 4 : 0;	/* Default absolute wheel up event */
+	priv->wheeldn = IsPad (priv) ? 5 : 0;	/* Default absolute wheel down event */
 	priv->striplup = 4;			/* Default left strip up event */
 	priv->stripldn = 5;			/* Default left strip down event */
 	priv->striprup = 4;			/* Default right strip up event */
-- 
1.7.2.3