On Tue, May 29, 2012 at 02:25:11PM +1000, Peter Hutterer wrote: > Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
yikes. after running a few more tests I realised that this isn't actually enough. the bamboos define buttons 1, 3, 8 and 9 and we cannot currently handle non-continuous button ranges, neither in libwacom nor the gnome stack. So button 9 is unknown, as we expect buttons 1, 2, 3 and 8. So the below patch only solves the problem partially. as for solutions: I think claiming the bamboo has 5 buttons would be a good enough hack for now until we add non-continuous button range support. Opinions? Cheers, Peter > --- > data/bamboo-2fg-4x5.tablet | 15 +++++++++++++++ > data/bamboo-2fg-6x8.tablet | 15 +++++++++++++++ > data/bamboo-2fg.tablet | 15 +++++++++++++++ > data/bamboo-craft.tablet | 15 +++++++++++++++ > 4 files changed, 60 insertions(+) > > diff --git a/data/bamboo-2fg-4x5.tablet b/data/bamboo-2fg-4x5.tablet > index 96804bd..249d5a6 100644 > --- a/data/bamboo-2fg-4x5.tablet > +++ b/data/bamboo-2fg-4x5.tablet > @@ -7,6 +7,18 @@ > # stylus with two buttons and eraser; 2FG touch > # Pen active area: 5.8 x 3.62in > # Touch active area: 4.92 x 3.35in > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | TABLET | > +# C | | > +# D | | > +# | | > +# *-----------------------* > > [Device] > Name=Wacom Bamboo 2FG 4x5 > @@ -21,3 +33,6 @@ 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 0f204ea..ee50723 100644 > --- a/data/bamboo-2fg-6x8.tablet > +++ b/data/bamboo-2fg-6x8.tablet > @@ -7,6 +7,18 @@ > # stylus with two buttons and eraser; 2FG touch > # Pen active area: 8.53 x 5.40 in > # Touch active area: 7.48 x 5.12 in > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | TABLET | > +# C | | > +# D | | > +# | | > +# *-----------------------* > > [Device] > Name=Wacom Bamboo 2FG 6x8 > @@ -21,3 +33,6 @@ 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 6037775..db405e4 100644 > --- a/data/bamboo-2fg.tablet > +++ b/data/bamboo-2fg.tablet > @@ -6,6 +6,18 @@ > # > # no stylus; 2FG touch > # Touch active area: 4.92 x 3.35in > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | TABLET | > +# C | | > +# D | | > +# | | > +# *-----------------------* > > [Device] > Name=Wacom Bamboo 2FG > @@ -20,3 +32,6 @@ 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 8dba88c..65b3e45 100644 > --- a/data/bamboo-craft.tablet > +++ b/data/bamboo-craft.tablet > @@ -7,6 +7,18 @@ > # stylus with two buttons and eraser; 2FG touch > # Pen active area: 5.8 x 3.62in > # Touch active area: 4.92 x 3.35in > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | TABLET | > +# C | | > +# D | | > +# | | > +# *-----------------------* > > [Device] > Name=Wacom Bamboo Craft > @@ -21,3 +33,6 @@ Reversible=true > Touch=true > Buttons=4 > BuiltIn=false > + > +[Buttons] > +Left=A;B;C;D > -- > 1.7.10.1 > ------------------------------------------------------------------------------ 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
