On Fri, Nov 26, 2010 at 3:19 PM, Chris Bagwell <[email protected]> wrote:
> Any chance this is related to this:
>
> http://sourceforge.net/tracker/?func=detail&aid=3075216&group_id=69596&atid=525124

The above issue is fixed by my [PATCH] Intuos4 ring and Intuos3 strips
unwillingly change directions.

I think Peter was trying to fix the issue that I fixed by [PATCH]
Normalized the wrong wheel.

Ping

> On Wed, Nov 24, 2010 at 10:58 PM, Peter Hutterer
> <[email protected]> wrote:
>> The pad has an abswheel too, normalizing this into the rotation range
>> screws the coordinates.
>>
>> Signed-off-by: Peter Hutterer <[email protected]>
>> ---
>>  src/wcmCommon.c |    8 ++++++--
>>  src/wcmUSB.c    |    9 ++-------
>>  2 files changed, 8 insertions(+), 9 deletions(-)
>>
>> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
>> index 4579578..3e6e65f 100644
>> --- a/src/wcmCommon.c
>> +++ b/src/wcmCommon.c
>> @@ -578,17 +578,21 @@ void wcmSendEvents(InputInfoPtr pInfo, const 
>> WacomDeviceState* ds)
>>        if (ds->proximity)
>>                wcmRotateAndScaleCoordinates(pInfo, &x, &y);
>>
>> -       if (IsCursor(priv))
>> +       if (IsCursor(priv))
>>        {
>>                v3 = ds->rotation;
>>                v4 = ds->throttle;
>> +
>> +               /* normalize abswheel airbrush data */
>> +               v5 = ds->abswheel * MAX_ROTATION_RANGE/(double)MAX_ABS_WHEEL 
>> + MIN_ROTATION;
>> +
>>        }
>>        else  /* Intuos styli have tilt */
>>        {
>>                v3 = tx;
>>                v4 = ty;
>> +               v5 = ds->abswheel;
>>        }
>> -       v5 = ds->abswheel;
>>
>>        DBG(6, priv, "%s prox=%d\tx=%d"
>>                "\ty=%d\tz=%d\tv3=%d\tv4=%d\tv5=%d\tid=%d"
>> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
>> index 51161f0..79c05a8 100644
>> --- a/src/wcmUSB.c
>> +++ b/src/wcmUSB.c
>> @@ -835,13 +835,8 @@ static int usbParseAbsEvent(WacomCommonPtr common,
>>                        ds->distance = event->value;
>>                        break;
>>                case ABS_WHEEL:
>> -                       {
>> -                               double norm = event->value *
>> -                                       MAX_ROTATION_RANGE /
>> -                                       (double)MAX_ABS_WHEEL;
>> -                               ds->abswheel = (int)norm + MIN_ROTATION;
>> -                               break;
>> -                       }
>> +                       ds->abswheel = event->value;
>> +                       break;
>>                case ABS_Z:
>>                        ds->abswheel = event->value;
>>                        break;
>> --
>> 1.7.3.2
>>
>>
>> ------------------------------------------------------------------------------
>> Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
>> Tap into the largest installed PC base & get more eyes on your game by
>> optimizing for Intel(R) Graphics Technology. Get started today with the
>> Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
>> http://p.sf.net/sfu/intelisp-dev2dev
>> _______________________________________________
>> Linuxwacom-devel mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>>
>
> ------------------------------------------------------------------------------
> Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
> Tap into the largest installed PC base & get more eyes on your game by
> optimizing for Intel(R) Graphics Technology. Get started today with the
> Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
> http://p.sf.net/sfu/intelisp-dev2dev
> _______________________________________________
> Linuxwacom-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to