On Tue, Mar 3, 2015 at 8:25 PM, Peter Hutterer <peter.hutte...@who-t.net> wrote:
> The mouse has tilt, the lens cursors don't. Or at least the Intuos4+
> compatible one doesn't.

Tilt should be removed for all Puck-type tools, except for "Five
Button Mouse" (0x806), which reports tilt in place of mouse rotation.
With that updated, this patch is

Reviewed-by: Ping Cheng <pi...@wacom.com>

Ping

> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
> ---
>  data/libwacom.stylus   | 6 +++---
>  test/tablet-validity.c | 1 -
>  2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/data/libwacom.stylus b/data/libwacom.stylus
> index 3a59a9d..f0c6c4e 100644
> --- a/data/libwacom.stylus
> +++ b/data/libwacom.stylus
> @@ -377,7 +377,7 @@ Type=Airbrush
>  [0x096]
>  # Intuos and Intuos2
>  Name=Lens Cursor
> -Axes=Tilt;Distance;
> +Axes=Distance;
>  Type=Puck
>  HasLens=true
>  HasWheel=false
> @@ -386,7 +386,7 @@ Buttons=5
>  [0x097]
>  # Intuos3
>  Name=Lens Cursor
> -Axes=Tilt;Distance;
> +Axes=Distance;
>  Type=Puck
>  HasLens=true
>  HasWheel=false
> @@ -395,7 +395,7 @@ Buttons=5
>  [0x006]
>  # Intuos4 and Intuos5
>  Name=Lens Cursor
> -Axes=Tilt;Distance;
> +Axes=Distance;
>  Type=Puck
>  HasLens=true
>  HasWheel=false
> diff --git a/test/tablet-validity.c b/test/tablet-validity.c
> index 54c4dd0..e934881 100644
> --- a/test/tablet-validity.c
> +++ b/test/tablet-validity.c
> @@ -198,7 +198,6 @@ static void verify_tablet(WacomDeviceDatabase *db, 
> WacomDevice *device)
>
>                 axes = libwacom_stylus_get_axes (stylus);
>                 if (libwacom_stylus_get_type (stylus) == WSTYLUS_PUCK) {
> -                       assert(axes & WACOM_AXIS_TYPE_TILT);
>                         assert((axes & WACOM_AXIS_TYPE_PRESSURE) == 0);
>                 } else {
>                         assert(axes & WACOM_AXIS_TYPE_TILT);
> --
> 2.1.0
>
>
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming The Go Parallel Website, sponsored
> by Intel and developed in partnership with Slashdot Media, is your hub for all
> things parallel software development, from weekly thought leadership blogs to
> news, videos, case studies, tutorials and more. Take a look and join the
> conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to