On Wed, Jan 15, 2014 at 11:29:46AM -0800, Ping Cheng wrote: > On Sun, Jan 12, 2014 at 8:58 PM, Peter Hutterer > <peter.hutte...@who-t.net>wrote: > > > On Thu, Jan 09, 2014 at 02:15:14PM -0800, Ping Cheng wrote: > > > A new key word, Touchswitch, is added to wacom.example to > > > indicate if the device has touch switch or not. SVG file names > > > are added in [Device] Layout=. But they are not included in this > > > commit. > > > > > > It takes too long for me to create/modify a SVG file since I am > > > not familiar with Inkscape. This task is open to experts. > > > > > > Signed-off-by: Ping Cheng <pi...@wacom.com> > > > --- > > > data/intuos-m-pt.tablet | 53 > > +++++++++++++++++++++++++++++++++++++++++++++++++ > > > data/intuos-s-p.tablet | 36 +++++++++++++++++++++++++++++++++ > > > data/intuos-s-pt.tablet | 53 > > +++++++++++++++++++++++++++++++++++++++++++++++++ > > > data/wacom.example | 3 +++ > > > 4 files changed, 145 insertions(+) > > > create mode 100644 data/intuos-m-pt.tablet > > > create mode 100644 data/intuos-s-p.tablet > > > create mode 100644 data/intuos-s-pt.tablet > > > > > > diff --git a/data/intuos-m-pt.tablet b/data/intuos-m-pt.tablet > > > new file mode 100644 > > > index 0000000..20a8c56 > > > --- /dev/null > > > +++ b/data/intuos-m-pt.tablet > > > @@ -0,0 +1,53 @@ > > > +# Wacom > > > +# Intuos Pen & Touch Medium > > > +# CTH-680 > > > +# > > > +# Successor of Bamboo3 series > > > +# > > > +# stylus with two buttons and eraser; 16FG touch > > > +# Pen active area: 8.5 x 5.3in > > > +# Touch active area: 8.5 x 5.3in > > > +# > > > +# Button Map: > > > +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) > > > +# > > > +# A C > > > +# B D > > > +# *-----------------------* > > > +# | | > > > +# | | > > > +# | TABLET | > > > +# | | > > > +# | | > > > +# *-----------------------* > > > +# > > > +# Touch Switch Map: > > > +# (on the edge of top right corner; switch to right: touch off; switch > > to left: touch on) > > > +# > > > +# S > > > +# *-----------------------* > > > +# | | > > > +# | | > > > +# | TABLET | > > > +# | | > > > +# | | > > > +# *-----------------------* > > > + > > > +[Device] > > > +Name=Intuos Pen & Touch Medium > > > +DeviceMatch=usb:056a:0303 > > > +Class=Bamboo > > > +Width=9 > > > +Height=5 > > > +Layout=intuos-m-pt.svg > > > > If we don't have a layout file, should we really link to it? > > > > Good point. How about comment out this line and add a comment above the > line to remind us that someone needs to work on it later? > > > +IntegratedIn= > > > + > > > +[Features] > > > +Stylus=true > > > +Reversible=true > > > +Touch=true > > > +Buttons=4 > > > +Touchswitch=true > > > > Does anything in libwacom parse Touchswitch yet? git grep doesn't show > > anything, maybe I missed a patch here? > > > > No, you did not miss a patch. > > I did look into the code under libwacom. We can not update libwacom without > considering how to support touch switch in Gnome control center, unless you > meant to only parse Touchswitch keyword.
that's what I mean. libwacom doesn't decide how the feature is used, but it should expose the data from the .data files 1:1 so the higher levels can used it. Cheers, Peter > > Do we have a candidate for libwacom? Features in Gnome control center is > beyond my scope. > > Ping > > > > > > Cheers, > > Peter > > > > > + > > > +[Buttons] > > > +Top=A;B;C;D > > > diff --git a/data/intuos-s-p.tablet b/data/intuos-s-p.tablet > > > new file mode 100644 > > > index 0000000..166ade2 > > > --- /dev/null > > > +++ b/data/intuos-s-p.tablet > > > @@ -0,0 +1,36 @@ > > > +# Wacom > > > +# Intuos Pen Small > > > +# CTL-480 > > > +# > > > +# Successor of Bamboo3 series > > > +# > > > +# stylus with two buttons and eraser > > > +# Pen active area: 6.0 x 3.7in > > > +# > > > +# Button Map: > > > +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) > > > +# > > > +# A C > > > +# B D > > > +# *-----------------------* > > > +# | | > > > +# | TABLET | > > > +# | | > > > +# *-----------------------* > > > + > > > +[Device] > > > +Name=Intuos Pen Small > > > +DeviceMatch=usb:056a:030e > > > +Class=Bamboo > > > +Width=6 > > > +Height=4 > > > +Layout=intuos-s-p.svg > > > +IntegratedIn= > > > + > > > +[Features] > > > +Stylus=true > > > +Reversible=true > > > +Buttons=4 > > > + > > > +[Buttons] > > > +Top=A;B;C;D > > > diff --git a/data/intuos-s-pt.tablet b/data/intuos-s-pt.tablet > > > new file mode 100644 > > > index 0000000..d9ce6ab > > > --- /dev/null > > > +++ b/data/intuos-s-pt.tablet > > > @@ -0,0 +1,53 @@ > > > +# Wacom > > > +# Intuos Pen & Touch Small > > > +# CTH-480 > > > +# > > > +# Successor of Bamboo3 series > > > +# > > > +# stylus with two buttons and eraser; 16FG touch > > > +# Pen active area: 6.0 x 3.7in > > > +# Touch active area: 6.0 x 3.7in > > > +# > > > +# Button Map: > > > +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) > > > +# > > > +# A C > > > +# B D > > > +# *-----------------------* > > > +# | | > > > +# | | > > > +# | TABLET | > > > +# | | > > > +# | | > > > +# *-----------------------* > > > +# > > > +# Touch Switch Map: > > > +# (on the edge of top right corner; switch to right: touch off; switch > > to left: touch on) > > > +# > > > +# S > > > +# *-----------------------* > > > +# | | > > > +# | | > > > +# | TABLET | > > > +# | | > > > +# | | > > > +# *-----------------------* > > > + > > > +[Device] > > > +Name=Intuos Pen & Touch Small > > > +DeviceMatch=usb:056a:0302 > > > +Class=Bamboo > > > +Width=6 > > > +Height=4 > > > +Layout=intuos-s-pt.svg > > > +IntegratedIn= > > > + > > > +[Features] > > > +Stylus=true > > > +Reversible=true > > > +Touch=true > > > +Buttons=4 > > > +Touchswitch=true > > > + > > > +[Buttons] > > > +Top=A;B;C;D > > > diff --git a/data/wacom.example b/data/wacom.example > > > index 7be0d17..d570e88 100644 > > > --- a/data/wacom.example > > > +++ b/data/wacom.example > > > @@ -91,6 +91,9 @@ Reversible=true > > > # This tablet supports touch. > > > Touch=false > > > > > > +# This tablet supports hardware touch switch. > > > +Touchswitch=false > > > + > > > # This tablet has a touch ring (Intuos4 and Cintiq 24HD) > > > # A touch ring is a circular button that responds to touch > > > # (rather than clicks): > > > -- > > > 1.8.3.2 > > > > > ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
