On Thu, Nov 15, 2012 at 10:52:41AM +0100, Olivier Fourdan wrote: > Updated patch for data to include newly added definitions in master, > namely cintiq-24hd-touch.tablet, isdv4-100.tablet, isdv4-101.tablet > and isdv4-e5.tablet
> >From 2b5b09ec4691e1fa239bee43fcf038c679b3eeeb Mon Sep 17 00:00:00 2001 > From: Olivier Fourdan <ofour...@redhat.com> > Date: Mon, 8 Oct 2012 16:02:39 +0200 > Subject: [PATCH 2/3] data: add the IntegratedIn field to the tablet > definitions > > If set, "IntegratedIn" specifies if the device is integrated > in the "Display" (screen tablet) and/or "System" (ISD, TabletPC). > > This field supersedes the "BuiltIn" value. > > Signed-off-by: Olivier Fourdan <ofour...@redhat.com> > --- > data/bamboo-2fg-4x5.tablet | 1 - > data/bamboo-2fg-6x8.tablet | 1 - > data/bamboo-2fg.tablet | 1 - > data/bamboo-craft.tablet | 1 - > data/bamboo-one.tablet | 1 - > data/bamboo-pen.tablet | 1 - > data/cintiq-12wx.tablet | 2 +- > data/cintiq-20wsx.tablet | 2 +- > data/cintiq-21ux.tablet | 2 +- > data/cintiq-21ux2.tablet | 2 +- > data/cintiq-22hd.tablet | 2 +- > data/cintiq-24hd.tablet | 2 +- > data/dtf-720.tablet | 2 +- > data/dti-520.tablet | 2 +- > data/dtu-1631.tablet | 2 +- > data/dtu-2231.tablet | 2 +- > data/generic.tablet | 1 - > data/graphire-wireless-8x6.tablet | 1 - > data/intuos4-12x19.tablet | 1 - > data/intuos4-4x6.tablet | 1 - > data/intuos4-6x9-wl.tablet | 1 - > data/intuos4-6x9.tablet | 1 - > data/intuos4-8x13.tablet | 1 - > data/intuos5-m.tablet | 1 - > data/intuos5-s.tablet | 1 - > data/intuos5-touch-l.tablet | 1 - > data/intuos5-touch-m.tablet | 1 - > data/intuos5-touch-s.tablet | 1 - > data/isdv4-90.tablet | 2 +- > data/isdv4-93.tablet | 2 +- > data/isdv4-e3.tablet | 2 +- > data/isdv4-e6.tablet | 2 +- > data/isdv4-ed.tablet | 2 +- > data/isdv4-ef.tablet | 2 +- > data/n-trig-pen.tablet | 2 +- > data/serial-wacf004.tablet | 2 +- > data/wacom.example | 12 +++++------- > 37 files changed, 23 insertions(+), 43 deletions(-) > > diff --git a/data/bamboo-2fg-4x5.tablet b/data/bamboo-2fg-4x5.tablet > index fb0cb90..812638f 100644 > --- a/data/bamboo-2fg-4x5.tablet > +++ b/data/bamboo-2fg-4x5.tablet > @@ -20,7 +20,6 @@ Stylus=true > Reversible=true > Touch=true > Buttons=4 > -BuiltIn=false > > [Buttons] > Left=A;B;C;D > diff --git a/data/bamboo-2fg-6x8.tablet b/data/bamboo-2fg-6x8.tablet > index d7bf97c..c9288d8 100644 > --- a/data/bamboo-2fg-6x8.tablet > +++ b/data/bamboo-2fg-6x8.tablet > @@ -20,7 +20,6 @@ Stylus=true > Reversible=true > Touch=true > Buttons=4 > -BuiltIn=false > > [Buttons] > Left=A;B;C;D > diff --git a/data/bamboo-2fg.tablet b/data/bamboo-2fg.tablet > index 4e74ccd..ffea220 100644 > --- a/data/bamboo-2fg.tablet > +++ b/data/bamboo-2fg.tablet > @@ -19,7 +19,6 @@ Stylus=false > Reversible=true > Touch=true > Buttons=4 > -BuiltIn=false > > [Buttons] > Left=A;B;C;D > diff --git a/data/bamboo-craft.tablet b/data/bamboo-craft.tablet > index e68ca5d..dc1bfce 100644 > --- a/data/bamboo-craft.tablet > +++ b/data/bamboo-craft.tablet > @@ -20,7 +20,6 @@ Stylus=true > Reversible=true > Touch=true > Buttons=4 > -BuiltIn=false > > [Buttons] > Left=A;B;C;D > diff --git a/data/bamboo-one.tablet b/data/bamboo-one.tablet > index feacf54..1d553a8 100644 > --- a/data/bamboo-one.tablet > +++ b/data/bamboo-one.tablet > @@ -13,4 +13,3 @@ Touch=false > Ring=false > NumStrips=0 > Buttons=0 > -BuiltIn=false > diff --git a/data/bamboo-pen.tablet b/data/bamboo-pen.tablet > index a5b5aea..a897b71 100644 > --- a/data/bamboo-pen.tablet > +++ b/data/bamboo-pen.tablet > @@ -19,4 +19,3 @@ Stylus=true > Reversible=true > Touch=false > Buttons=0 > -BuiltIn=false > diff --git a/data/cintiq-12wx.tablet b/data/cintiq-12wx.tablet > index 006500d..75b2457 100644 > --- a/data/cintiq-12wx.tablet > +++ b/data/cintiq-12wx.tablet > @@ -38,12 +38,12 @@ Width=10 > Height=7 > Layout=cintiq-12wx.svg > Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885; > +IntegratedIn=Display > > [Features] > Stylus=true > NumStrips=2 > Buttons=10 > -BuiltIn=true > > [Buttons] > Left=A;B;C;D;I > diff --git a/data/cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet > index 3cc6c23..4bc91d0 100644 > --- a/data/cintiq-20wsx.tablet > +++ b/data/cintiq-20wsx.tablet > @@ -40,13 +40,13 @@ Class=Cintiq > Width=17 > Height=11 > Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885; > +IntegratedIn=Display > > [Features] > Reversible=false > Stylus=true > NumStrips=2 > Buttons=14 > -BuiltIn=true > > [Buttons] > Left=A;B;C;D;I;K;L > diff --git a/data/cintiq-21ux.tablet b/data/cintiq-21ux.tablet > index 30d3922..1c353a4 100644 > --- a/data/cintiq-21ux.tablet > +++ b/data/cintiq-21ux.tablet > @@ -33,13 +33,13 @@ Class=Cintiq > Width=17 > Height=13 > Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885; > +IntegratedIn=Display > > [Features] > Reversible=false > Stylus=true > NumStrips=2 > Buttons=8 > -BuiltIn=true > > [Buttons] > Left=A;B;C;D > diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet > index 85f2686..734f9f3 100644 > --- a/data/cintiq-21ux2.tablet > +++ b/data/cintiq-21ux2.tablet > @@ -49,13 +49,13 @@ Class=Cintiq > Width=17 > Height=13 > Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802; > +IntegratedIn=Display > > [Features] > Stylus=true > Ring=false > NumStrips=2 > Buttons=18 > -BuiltIn=true > StatusLEDs=Touchstrip2;Touchstrip > > [Buttons] > diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet > index 8898aa9..f290e2f 100644 > --- a/data/cintiq-22hd.tablet > +++ b/data/cintiq-22hd.tablet > @@ -37,6 +37,7 @@ Class=Cintiq > Width=19 > Height=11 > Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802; > +IntegratedIn=Display > > [Features] > Stylus=true > @@ -45,7 +46,6 @@ Touch=false > Ring=false > NumStrips=2 > Buttons=18 > -BuiltIn=true > > [Buttons] > Left=B;C;D;E;A;F;G;H;I > diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet > index c5ae581..39b749f 100644 > --- a/data/cintiq-24hd.tablet > +++ b/data/cintiq-24hd.tablet > @@ -45,6 +45,7 @@ Class=Cintiq > Width=21 > Height=13 > Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802; > +IntegratedIn=Display > > [Features] > Stylus=true > @@ -53,7 +54,6 @@ Touch=false > Buttons=16 > Ring=true > Ring2=true > -BuiltIn=true > StatusLEDs=Ring2;Ring > > [Buttons] > diff --git a/data/dtf-720.tablet b/data/dtf-720.tablet > index 9bcf19f..e724fa7 100644 > --- a/data/dtf-720.tablet > +++ b/data/dtf-720.tablet > @@ -9,9 +9,9 @@ DeviceMatch=usb:056a:00c0 > Width=13 > Height=11 > Class=PenDisplay > +IntegratedIn=Display;System > > [Features] > Stylus=true > Buttons=0 > -BuiltIn=true > > diff --git a/data/dti-520.tablet b/data/dti-520.tablet > index e2f20d7..700ab51 100644 > --- a/data/dti-520.tablet > +++ b/data/dti-520.tablet > @@ -22,6 +22,7 @@ Width=14 > Height=12 > # FIXME does the stylus have an eraser? > # Styli=0xfffff; > +IntegratedIn=Display;System > > [Features] > # This tablet does not appear to support erasers on styli > @@ -33,7 +34,6 @@ Ring2=false > NumStrips=0 > # Actually 11 buttons but the two Ctrl ones send the same scancode > Buttons=10 > -BuiltIn=true > > [Buttons] > Top=F;G;H;I;J > diff --git a/data/dtu-1631.tablet b/data/dtu-1631.tablet > index 13b6014..201a251 100644 > --- a/data/dtu-1631.tablet > +++ b/data/dtu-1631.tablet > @@ -9,9 +9,9 @@ DeviceMatch=usb:056a:00f0 > Width=14 > Height=8 > Class=PenDisplay > +IntegratedIn=Display;System > > [Features] > Stylus=true > Buttons=0 > -BuiltIn=true > > diff --git a/data/dtu-2231.tablet b/data/dtu-2231.tablet > index 9cf0ef6..034c8f0 100644 > --- a/data/dtu-2231.tablet > +++ b/data/dtu-2231.tablet > @@ -8,9 +8,9 @@ DeviceMatch=usb:056a:00ce > Class=PenDisplay > Width=19 > Height=11 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Buttons=0 > -BuiltIn=true > > diff --git a/data/generic.tablet b/data/generic.tablet > index 7be3033..8b7f867 100644 > --- a/data/generic.tablet > +++ b/data/generic.tablet > @@ -8,4 +8,3 @@ Stylus=true > Ring=true > NumStrips=2 > Buttons=4 > -BuiltIn=false > diff --git a/data/graphire-wireless-8x6.tablet > b/data/graphire-wireless-8x6.tablet > index 5cc5f71..995cab5 100644 > --- a/data/graphire-wireless-8x6.tablet > +++ b/data/graphire-wireless-8x6.tablet > @@ -10,7 +10,6 @@ Reversible=false > Stylus=true > Ring=false > Buttons=2 > -BuiltIn=false > > [Buttons] > Top=A;B > diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet > index f3cc114..cd5f035 100644 > --- a/data/intuos4-12x19.tablet > +++ b/data/intuos4-12x19.tablet > @@ -45,7 +45,6 @@ Reversible=true > Stylus=true > Ring=true > Buttons=9 > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet > index 7aa7a44..05897f4 100644 > --- a/data/intuos4-4x6.tablet > +++ b/data/intuos4-4x6.tablet > @@ -46,7 +46,6 @@ Reversible=true > Stylus=true > Ring=true > Buttons=7 > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet > index a66aa12..9b92977 100644 > --- a/data/intuos4-6x9-wl.tablet > +++ b/data/intuos4-6x9-wl.tablet > @@ -45,7 +45,6 @@ Reversible=true > Stylus=true > Ring=true > Buttons=9 > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet > index be6b9f2..94c2e87 100644 > --- a/data/intuos4-6x9.tablet > +++ b/data/intuos4-6x9.tablet > @@ -45,7 +45,6 @@ Reversible=true > Stylus=true > Ring=true > Buttons=9 > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet > index 52747c1..b5b544d 100644 > --- a/data/intuos4-8x13.tablet > +++ b/data/intuos4-8x13.tablet > @@ -45,7 +45,6 @@ Reversible=true > Stylus=true > Ring=true > Buttons=9 > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet > index 153cf84..e74181d 100644 > --- a/data/intuos5-m.tablet > +++ b/data/intuos5-m.tablet > @@ -57,7 +57,6 @@ Reversible=true > Touch=false > Buttons=9 > Ring=true > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet > index ad3e7eb..b4b318b 100644 > --- a/data/intuos5-s.tablet > +++ b/data/intuos5-s.tablet > @@ -54,7 +54,6 @@ Reversible=true > Touch=false > Buttons=7 > Ring=true > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet > index aaeda44..d2712fc 100644 > --- a/data/intuos5-touch-l.tablet > +++ b/data/intuos5-touch-l.tablet > @@ -56,7 +56,6 @@ Reversible=true > Touch=true > Buttons=9 > Ring=true > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet > index c53694e..cf2da19 100644 > --- a/data/intuos5-touch-m.tablet > +++ b/data/intuos5-touch-m.tablet > @@ -57,7 +57,6 @@ Reversible=true > Touch=true > Buttons=9 > Ring=true > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet > index 2abb2ae..8e10080 100644 > --- a/data/intuos5-touch-s.tablet > +++ b/data/intuos5-touch-s.tablet > @@ -54,7 +54,6 @@ Reversible=true > Touch=true > Buttons=7 > Ring=true > -BuiltIn=false > StatusLEDs=Ring > > [Buttons] > diff --git a/data/isdv4-90.tablet b/data/isdv4-90.tablet > index c92c333..fbba291 100644 > --- a/data/isdv4-90.tablet > +++ b/data/isdv4-90.tablet > @@ -10,9 +10,9 @@ DeviceMatch=usb:056a:0090;serial:056a:0090 > Class=ISDV4 > Width=12 > Height=8 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=false > Buttons=0 > -BuiltIn=true > diff --git a/data/isdv4-93.tablet b/data/isdv4-93.tablet > index c6ab4b5..c0fe0d1 100644 > --- a/data/isdv4-93.tablet > +++ b/data/isdv4-93.tablet > @@ -10,9 +10,9 @@ DeviceMatch=usb:056a:0093;serial:056a:0093 > Class=ISDV4 > Width=10 > Height=6 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=true > Buttons=0 > -BuiltIn=true > diff --git a/data/isdv4-e3.tablet b/data/isdv4-e3.tablet > index 6e68cb4..bf6e075 100644 > --- a/data/isdv4-e3.tablet > +++ b/data/isdv4-e3.tablet > @@ -4,9 +4,9 @@ > Name=Wacom ISDv4 E3 > DeviceMatch=usb:056a:00e3;serial:056a:00e3 > Class=ISDV4 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=true > -BuiltIn=true > Buttons=0 > diff --git a/data/isdv4-e6.tablet b/data/isdv4-e6.tablet > index 328a702..70d0729 100644 > --- a/data/isdv4-e6.tablet > +++ b/data/isdv4-e6.tablet > @@ -6,9 +6,9 @@ DeviceMatch=usb:056a:00e6 > Class=ISDV4 > Width=11 > Height=6 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=true > -BuiltIn=true > Buttons=0 > diff --git a/data/isdv4-ed.tablet b/data/isdv4-ed.tablet > index cee499b..2bbe464 100644 > --- a/data/isdv4-ed.tablet > +++ b/data/isdv4-ed.tablet > @@ -4,9 +4,9 @@ > Name=Wacom ISDv4 ED > DeviceMatch=usb:056a:00ed > Class=ISDV4 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=true > -BuiltIn=true > Buttons=0 > diff --git a/data/isdv4-ef.tablet b/data/isdv4-ef.tablet > index 6f8816f..a21af41 100644 > --- a/data/isdv4-ef.tablet > +++ b/data/isdv4-ef.tablet > @@ -4,8 +4,8 @@ > Name=Wacom ISDv4 EF > DeviceMatch=usb:056a:00ef > Class=ISDV4 > +IntegratedIn=Display;System > > [Features] > Stylus=true > -BuiltIn=true > Buttons=0 > diff --git a/data/n-trig-pen.tablet b/data/n-trig-pen.tablet > index 5297228..d306c06 100644 > --- a/data/n-trig-pen.tablet > +++ b/data/n-trig-pen.tablet > @@ -11,9 +11,9 @@ DeviceMatch=usb:1b96:0001 > Class=ISDV4 > Width=10 > Height=6 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Touch=true > Buttons=0 > -BuiltIn=true > diff --git a/data/serial-wacf004.tablet b/data/serial-wacf004.tablet > index d1ba472..e2b5f74 100644 > --- a/data/serial-wacf004.tablet > +++ b/data/serial-wacf004.tablet > @@ -2,9 +2,9 @@ > Name=Wacom Serial Tablet WACf004 > DeviceMatch=serial:0000:0000 > Class=ISDV4 > +IntegratedIn=Display;System > > [Features] > Stylus=true > Ring=false > Buttons=0 > -BuiltIn=true > diff --git a/data/wacom.example b/data/wacom.example > index 762c360..1047fbb 100644 > --- a/data/wacom.example > +++ b/data/wacom.example > @@ -34,6 +34,11 @@ Width=9 > # (Optional) Height in inches, as advertised by the manufacturer > Height=6 > > +# Integration flags, is the tablet is part of the system, such as a > +# TabletPC or integrated in the screen, ie a screen tablet (most serial > +# tablets, Cintiqs) > +IntegratedIn=Display,System this should be a ';' right? Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> otherwise. don't re-send this patch, I've got it fixed up here and will push it once the lib patch is fixed up. Cheers, Peter > + > # Styli > # > # This is a list of stylus IDs supported by the tablet. This is the > @@ -97,13 +102,6 @@ NumStrips=1 > # Number of buttons on the tablet > Buttons=9 > > -# This tablet is built-in (most serial tablets, Cintiqs) > -# > -# The value within the file is ignored if the WacomDevice > -# is created through the device path, in which case the > -# value comes from kernel properties > -BuiltIn=false > - > # Metadata about the buttons on the tablet > # Buttons are "numbered" using upper-case letters > [Buttons] > -- > 1.7.1 > > ------------------------------------------------------------------------------ > Monitor your physical, virtual and cloud infrastructure from a single > web console. Get in-depth insight into apps, servers, databases, vmware, > SAP, cloud infrastructure, etc. Download 30-day Free Trial. > Pricing starts from $795 for 25 servers or applications! > http://p.sf.net/sfu/zoho_dev2dev_nov > _______________________________________________ > Linuxwacom-devel mailing list > Linuxwacom-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel ------------------------------------------------------------------------------ Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
