On Mon, 2012-04-30 at 15:53 +1000, Peter Hutterer wrote:
> Listed as "Interactive Pen Display" on the Wacom website

Link?

> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>

Reviewed-By: Bastien Nocera <had...@hadess.net>

> ---
>  data/dtf-720.tablet          |    1 +
>  data/dti-520.tablet          |    1 +
>  data/dtu-1631.tablet         |    1 +
>  data/dtu-2231.tablet         |    1 +
>  libwacom/libwacom-database.c |    2 ++
>  libwacom/libwacom.c          |    1 +
>  libwacom/libwacom.h          |    1 +
>  7 files changed, 8 insertions(+)
> 
> diff --git a/data/dtf-720.tablet b/data/dtf-720.tablet
> index 1325877..9bcf19f 100644
> --- a/data/dtf-720.tablet
> +++ b/data/dtf-720.tablet
> @@ -8,6 +8,7 @@ Name=Wacom DTF-720
>  DeviceMatch=usb:056a:00c0
>  Width=13
>  Height=11
> +Class=PenDisplay
>  
>  [Features]
>  Stylus=true
> diff --git a/data/dti-520.tablet b/data/dti-520.tablet
> index a8b23d3..1e7f9d4 100644
> --- a/data/dti-520.tablet
> +++ b/data/dti-520.tablet
> @@ -17,6 +17,7 @@
>  [Device]
>  Name=Wacom DTI520UB/L
>  DeviceMatch=usb:056a:003a
> +Class=PenDisplay
>  Width=14
>  Height=12
>  Styli=0xfffff;
> diff --git a/data/dtu-1631.tablet b/data/dtu-1631.tablet
> index 09ed3d3..13b6014 100644
> --- a/data/dtu-1631.tablet
> +++ b/data/dtu-1631.tablet
> @@ -8,6 +8,7 @@ Name=Wacom DTU-1631
>  DeviceMatch=usb:056a:00f0
>  Width=14
>  Height=8
> +Class=PenDisplay
>  
>  [Features]
>  Stylus=true
> diff --git a/data/dtu-2231.tablet b/data/dtu-2231.tablet
> index 24011b9..9cf0ef6 100644
> --- a/data/dtu-2231.tablet
> +++ b/data/dtu-2231.tablet
> @@ -5,6 +5,7 @@
>  [Device]
>  Name=Wacom DTU-2231
>  DeviceMatch=usb:056a:00ce
> +Class=PenDisplay
>  Width=19
>  Height=11
>  
> diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
> index 70b93ca..0c60d6d 100644
> --- a/libwacom/libwacom-database.c
> +++ b/libwacom/libwacom-database.c
> @@ -66,6 +66,8 @@ libwacom_class_string_to_enum(const char *class)
>               return WCLASS_INTUOS2;
>       if (strcmp(class, "ISDV4") == 0)
>               return WCLASS_ISDV4;
> +     if (strcmp(class, "PenDisplay") == 0)
> +             return WCLASS_PEN_DISPLAYS;
>  
>       return WCLASS_UNKNOWN;
>  }
> diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
> index 432d6e6..811948a 100644
> --- a/libwacom/libwacom.c
> +++ b/libwacom/libwacom.c
> @@ -526,6 +526,7 @@ libwacom_print_device_description(int fd, WacomDevice 
> *device)
>               case WCLASS_ISDV4:      class_name = "ISDV4";   break;
>               case WCLASS_INTUOS:     class_name = "Intuos";  break;
>               case WCLASS_INTUOS2:    class_name = "Intuos2"; break;
> +             case WCLASS_PEN_DISPLAYS:       class_name = "PenDisplay";      
> break;
>               default:                g_assert_not_reached(); break;
>       }
>  
> diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
> index b397865..f7e6cf9 100644
> --- a/libwacom/libwacom.h
> +++ b/libwacom/libwacom.h
> @@ -128,6 +128,7 @@ typedef enum {
>       WCLASS_ISDV4,           /**< Any serial ISDV4 device */
>       WCLASS_INTUOS,          /**< Any Intuos series */
>       WCLASS_INTUOS2,         /**< Any Intuos2 series */
> +     WCLASS_PEN_DISPLAYS,    /**< Any "interactive pen display" */
>  } WacomClass;
>  
>  /**



------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to