And remove erroneous comment in the process, wcmRotateTablet only sets the
rotation value, nothing more.

Note that this changes the logic. Previously, the rotation was not set for
the Pad tool, now it is. Since the pad never sends x/y coordinates though,
this is irrelevant.

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

diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index ebac2ce..389f94d 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -422,9 +422,6 @@ wcmInitAxes(DeviceIntPtr pWcm)
 
                wcmInitialCoordinates(priv->pInfo, 0);
                wcmInitialCoordinates(priv->pInfo, 1);
-
-               /* Rotation rotates the Max X and Y */
-               wcmRotateTablet(pInfo, common->wcmRotate);
        }
 
 
@@ -578,6 +575,7 @@ static int wcmDevInit(DeviceIntPtr pWcm)
 {
        InputInfoPtr pInfo = (InputInfoPtr)pWcm->public.devicePrivate;
        WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
+       WacomCommonPtr common = priv->common;
        unsigned char butmap[WCM_MAX_BUTTONS+1];
        int nbaxes, nbbuttons, nbkeys;
        int loop;
@@ -679,6 +677,8 @@ static int wcmDevInit(DeviceIntPtr pWcm)
        if (!wcmInitAxes(pWcm))
                return FALSE;
 
+       wcmRotateTablet(pInfo, common->wcmRotate);
+
        if (IsTouch(priv))
        {
                /* hard prox out */
-- 
1.7.3.3


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to