Hi Peter,
On Mon, Jan 30, 2017 at 3:06 PM, Peter Hutterer <peter.hutte...@who-t.net>
wrote:
> thanks aaron - note that breaks make check here, see below
>
> Thanks, hopefully it's not another year before my next commit to libwacom.
Otherwise
I'm likely to forget to run make check again.
On Mon, Jan 30, 2017 at 09:03:37AM -0800, Aaron Armstrong Skomra wrote:
> > Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
> > ---
> > data/intuos-pro-2-l.tablet | 67 +++++++++
> > data/intuos-pro-2-m.tablet | 67 +++++++++
> > data/layouts/intuos-pro-2-l.svg | 323 ++++++++++++++++++++++++++++++
> ++++++++++
> > data/layouts/intuos-pro-2-m.svg | 323 ++++++++++++++++++++++++++++++
> ++++++++++
> > 4 files changed, 780 insertions(+)
> > create mode 100644 data/intuos-pro-2-l.tablet
> > create mode 100644 data/intuos-pro-2-m.tablet
> > create mode 100644 data/layouts/intuos-pro-2-l.svg
> > create mode 100644 data/layouts/intuos-pro-2-m.svg
> >
> > diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet
> > new file mode 100644
> > index 0000000..a6bd811
> > --- /dev/null
> > +++ b/data/intuos-pro-2-l.tablet
> > @@ -0,0 +1,67 @@
> > +# Wacom
> > +# Intuos Pro 2 L
> > +# PTH-860
> > +#
> > +# Button Map:
> > +# (A=1, B=2, C=3, ...)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# A | |
> > +# B | |
> > +# C | |
> > +# D | |
> > +# I | TABLET |
> > +# E | |
> > +# F | |
> > +# G | |
> > +# H | |
> > +# | |
> > +# *-----------------------*
> > +#
> > +# Touch Ring Map:
> > +# (A=1st ring, B=2nd ring, ...)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# A | TABLET |
> > +# | |
> > +# *-----------------------*
> > +#
> > +# LED Map:
> > +# (XY=Bank X, LED Y; *=Invisible)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# | |
> > +# 01 02 | |
> > +# | TABLET |
> > +# 00 03 | |
> > +# | |
> > +# | |
> > +# *-----------------------*
> > +#
> > +
> > +[Device]
> > +Name=Wacom Intuos Pro 2 L
> > +DeviceMatch=usb:056a:0358
> > +Class=Intuos5
> > +Width=9
> > +Height=6
> > +Layout=intuos-pro-2-l.svg
> > +IntegratedIn=
> > +Styli=0x842;0x84a;0x802;0x80a;0x804;0x80c;0x902;0x90a;
> 0x16802;0x10802;0x14802;0x10804;0x10902;0x2842;0x4842
>
> 0x16802 breaks the dbverify and tablet-validity test, it doesn't exist in
> our database. I suspect 0x14802 would too, not sure about the others
>
> I'll fix this in the update. I should have had the same styli list as the
Mobile Studio Pro.
> > +
> > +[Features]
> > +Stylus=true
> > +Reversible=true
> > +Touch=true
> > +Buttons=9
> > +Ring=true
> > +StatusLEDs=Ring
> > +
> > +[Buttons]
> > +Left=A;B;C;D;E;F;G;H;I
> > +
> > +Ring=I
>
> just to verify: it's really BTN_8 that triggers the modes?
>
> Yes with the Pro 2 the mode-switch/led is last in the sequence instead of
first.
> also, something isn't right with the buttons, I get this error when running
> test/load
>
> (process:13800): libwacom-CRITICAL **: libwacom_get_button_flag:
> assertion 'button < 'A' + device->num_buttons' failed
>
> When I look at test/load it looks like this test only applies to the
Intuos 4 WL and that it is supposed to tickle the assertion:
Following critical warning in libwacom_get_button_flag() is expected
(process:23185): libwacom-CRITICAL **: libwacom_get_button_flag: assertion
'button < 'A' + device->num_buttons' failed
Best,
Aaron
Cheers,
> Peter
>
> > +RingNumModes=4
> > diff --git a/data/intuos-pro-2-m.tablet b/data/intuos-pro-2-m.tablet
> > new file mode 100644
> > index 0000000..3f84406
> > --- /dev/null
> > +++ b/data/intuos-pro-2-m.tablet
> > @@ -0,0 +1,67 @@
> > +# Wacom
> > +# Intuos Pro 2 M
> > +# PTH-660
> > +#
> > +# Button Map:
> > +# (A=1, B=2, C=3, ...)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# A | |
> > +# B | |
> > +# C | |
> > +# D | |
> > +# I | TABLET |
> > +# E | |
> > +# F | |
> > +# G | |
> > +# H | |
> > +# | |
> > +# *-----------------------*
> > +#
> > +# Touch Ring Map:
> > +# (A=1st ring, B=2nd ring, ...)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# A | TABLET |
> > +# | |
> > +# *-----------------------*
> > +#
> > +# LED Map:
> > +# (XY=Bank X, LED Y; *=Invisible)
> > +#
> > +# *-----------------------*
> > +# | |
> > +# | |
> > +# 01 02 | |
> > +# | TABLET |
> > +# 00 03 | |
> > +# | |
> > +# | |
> > +# *-----------------------*
> > +#
> > +
> > +[Device]
> > +Name=Wacom Intuos Pro 2 M
> > +DeviceMatch=usb:056a:0357
> > +Class=Intuos5
> > +Width=9
> > +Height=6
> > +Layout=intuos-pro-2-m.svg
> > +IntegratedIn=
> > +Styli=0x842;0x84a;0x802;0x80a;0x804;0x80c;0x902;0x90a;
> 0x16802;0x10802;0x14802;0x10804;0x10902;0x2842;0x4842
> > +
> > +[Features]
> > +Stylus=true
> > +Reversible=true
> > +Touch=true
> > +Buttons=9
> > +Ring=true
> > +StatusLEDs=Ring
> > +
> > +[Buttons]
> > +Left=A;B;C;D;E;F;G;H;I
> > +
> > +Ring=I
> > +RingNumModes=4
> > diff --git a/data/layouts/intuos-pro-2-l.svg
> b/data/layouts/intuos-pro-2-l.svg
> > new file mode 100644
> > index 0000000..9ba5b5c
> > --- /dev/null
> > +++ b/data/layouts/intuos-pro-2-l.svg
> > @@ -0,0 +1,323 @@
> > +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
> > +<svg
> > + xmlns:dc="http://purl.org/dc/elements/1.1/";
> > + xmlns:cc="http://creativecommons.org/ns#";
> > + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
> > + xmlns:svg="http://www.w3.org/2000/svg";
> > + xmlns="http://www.w3.org/2000/svg";
> > + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
> > + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
> > + version="1.1"
> > + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:
> .25;font-size:8"
> > + id="intuos-pro-2-l"
> > + width="380"
> > + height="250"
> > + inkscape:version="0.47 r22583"
> > + sodipodi:docname="intuos-pro-2-l.svg">
> > + <metadata
> > + id="metadata66">
> > + <rdf:RDF>
> > + <cc:Work
> > + rdf:about="">
> > + <dc:format>image/svg+xml</dc:format>
> > + <dc:type
> > + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
> > + <dc:title>Wacom Intuos Pro 2 L</dc:title>
> > + </cc:Work>
> > + </rdf:RDF>
> > + </metadata>
> > + <defs
> > + id="defs64">
> > + <inkscape:perspective
> > + sodipodi:type="inkscape:persp3d"
> > + inkscape:vp_x="0 : 125 : 1"
> > + inkscape:vp_y="0 : 1000 : 0"
> > + inkscape:vp_z="380 : 125 : 1"
> > + inkscape:persp3d-origin="190 : 83.333333 : 1"
> > + id="perspective68" />
> > + </defs>
> > + <sodipodi:namedview
> > + pagecolor="#ffffff"
> > + bordercolor="#666666"
> > + borderopacity="1"
> > + objecttolerance="10"
> > + gridtolerance="10"
> > + guidetolerance="10"
> > + inkscape:pageopacity="0"
> > + inkscape:pageshadow="2"
> > + inkscape:window-width="1600"
> > + inkscape:window-height="1124"
> > + id="namedview62"
> > + showgrid="false"
> > + inkscape:zoom="3.776"
> > + inkscape:cx="190"
> > + inkscape:cy="122.3517"
> > + inkscape:window-x="0"
> > + inkscape:window-y="25"
> > + inkscape:window-maximized="1"
> > + inkscape:current-layer="intuos-pro-2-l" />
> > + <title
> > + id="title">Wacom Intuos Pro 2 L</title>
> > + <g
> > + id="GroupA">
> > + <path
> > + d="M 24 42 c 0 -2 2 -2 2 -2 l 16 0 c 2 0 2 2 2 2 l 0
> 10 l -20 0 l -0 -10"
> > + class="A Button"
> > + id="ButtonA" />
> > + <path
> > + id="LeaderA"
> > + class="A Leader"
> > + d="M 46 46 L 50 46" />
> > + <text
> > + id="LabelA"
> > + class="A Label"
> > + x="52"
> > + y="46"
> > + style="text-anchor:start;">
> > + A
> > + </text>
> > + </g>
> > + <g
> > + id="g9"
> > + transform="translate(0,-1.5889831)">
> > + <rect
> > + id="ButtonB"
> > + class="B Button"
> > + x="24"
> > + y="54"
> > + width="20"
> > + height="12" />
> > + <rect
> > + id="DotB1"
> > + rx="1"
> > + ry="1"
> > + x="30"
> > + y="59.5"
> > + width="8"
> > + height="1" />
> > + <path
> > + id="LeaderB"
> > + class="B Leader"
> > + d="m 46,60 4,0" />
> > + <text
> > + id="LabelB"
> > + class="B Label"
> > + x="52"
> > + y="60"
> > + style="text-anchor:start">B</text>
> > + </g>
> > + <g
> > + id="g15"
> > + transform="translate(0,-3.1779661)">
> > + <rect
> > + id="ButtonC"
> > + class="C Button"
> > + x="24"
> > + y="68"
> > + width="20"
> > + height="12" />
> > + <circle
> > + id="DotC1"
> > + cx="34"
> > + cy="74"
> > + r="0.75"
> > + d="m 34.75,74 c 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0
> -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75
> 0.414214,0 0.75,0.335786 0.75,0.75 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="74"
> > + sodipodi:rx="0.75"
> > + sodipodi:ry="0.75" />
> > + <path
> > + id="LeaderC"
> > + class="C Leader"
> > + d="m 46,74 4,0" />
> > + <text
> > + id="LabelC"
> > + class="C Label"
> > + x="52"
> > + y="74"
> > + style="text-anchor:start">C</text>
> > + </g>
> > + <g
> > + id="g21"
> > + transform="translate(0,-4.7669492)">
> > + <path
> > + d="m 24,82 20,0 0,10 c 0,2 -2,2 -2,2 l -16,0 c -2,0 -2,-2 -2,-2
> l 0,-10"
> > + class="D Button"
> > + id="ButtonD" />
> > + <path
> > + id="LeaderD"
> > + class="D Leader"
> > + d="m 46,88 4,0" />
> > + <text
> > + id="LabelD"
> > + class="D Label"
> > + x="52"
> > + y="88"
> > + style="text-anchor:start">D</text>
> > + </g>
> > + <g
> > + id="g26"
> > + transform="translate(-0.26483051,-7.4152542)">
> > + <path
> > + d="M 24 156 c 0 -2 2 -2 2 -2 l
> 16 0 c 2 0 2 2 2 2 l 0 10
> l -20 0 l -0 -10"
> > + class="H Button"
> > + id="ButtonH" />
> > + <path
> > + id="LeaderE"
> > + class="E Leader"
> > + d="m 46,162 4,0" />
> > + <text
> > + id="LabelE"
> > + class="E Label"
> > + x="52"
> > + y="162"
> > + style="text-anchor:start">E</text>
> > + </g>
> > + <g
> > + id="g31"
> > + transform="translate(-0.26483051,-11.122881)">
> > + <rect
> > + id="ButtonF"
> > + class="F Button"
> > + x="24"
> > + y="170"
> > + width="20"
> > + height="12" />
> > + <circle
> > + id="DotF1"
> > + cx="34"
> > + cy="176"
> > + r="0.75"
> > + d="m 34.75,176 c 0,0.41421 -0.335786,0.75 -0.75,0.75 -0.414214,0
> -0.75,-0.33579 -0.75,-0.75 0,-0.41421 0.335786,-0.75 0.75,-0.75 0.414214,0
> 0.75,0.33579 0.75,0.75 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="176"
> > + sodipodi:rx="0.75"
> > + sodipodi:ry="0.75" />
> > + <path
> > + id="LeaderF"
> > + class="F Leader"
> > + d="m 46,176 4,0" />
> > + <text
> > + id="LabelF"
> > + class="F Label"
> > + x="52"
> > + y="176"
> > + style="text-anchor:start">F</text>
> > + </g>
> > + <g
> > + id="g37"
> > + transform="translate(-0.26483051,-12.711865)">
> > + <rect
> > + id="ButtonG"
> > + class="G Button"
> > + x="24"
> > + y="184"
> > + width="20"
> > + height="12" />
> > + <rect
> > + id="DotG1"
> > + rx="1"
> > + ry="1"
> > + x="30"
> > + y="189.5"
> > + width="8"
> > + height="1" />
> > + <path
> > + id="LeaderG"
> > + class="G Leader"
> > + d="m 46,190 4,0" />
> > + <text
> > + id="LabelG"
> > + class="G Label"
> > + x="52"
> > + y="190"
> > + style="text-anchor:start">G</text>
> > + </g>
> > + <g
> > + id="g43"
> > + transform="translate(-0.26483051,-14.830508)">
> > + <path
> > + d="m 24,198 20,0 0,10 c 0,2 -2,2 -2,2 l -16,0 c -2,0 -2,-2 -2,-2
> l 0,-10"
> > + class="D Button"
> > + id="path41" />
> > + <path
> > + id="LeaderH"
> > + class="H Leader"
> > + d="m 46,204 4,0" />
> > + <text
> > + id="LabelH"
> > + class="H Label"
> > + x="52"
> > + y="204"
> > + style="text-anchor:start">H</text>
> > + </g>
> > + <g
> > + id="g48"
> > + transform="translate(-0.52966102,-6.0911017)">
> > + <circle
> > + id="Ring"
> > + class="Ring TouchRing"
> > + cx="34"
> > + cy="125"
> > + r="19.5"
> > + d="m 53.5,125 c 0,10.76955 -8.730447,19.5 -19.5,19.5
> -10.769553,0 -19.5,-8.73045 -19.5,-19.5 0,-10.76955 8.730447,-19.5
> 19.5,-19.5 10.769553,0 19.5,8.73045 19.5,19.5 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="125"
> > + sodipodi:rx="19.5"
> > + sodipodi:ry="19.5" />
> > + <path
> > + id="LeaderRingCCW"
> > + class="RingCCW Ring Leader"
> > + d="m 34,105 0,-2 26,0" />
> > + <text
> > + id="LabelRingCCW"
> > + class="RingCCW Ring Label"
> > + x="62"
> > + y="103"
> > + style="text-anchor:start">CCW</text>
> > + <path
> > + id="RingCCW"
> > + class="RingCCW Button"
> > + d="m 31,111 3,-1.5 0,1 a 7.5,7.5 0 0 1 5,1.5 6.5,6.5 0 0 0
> -5,-0.5 l 0,1 z" />
> > + <path
> > + id="LeaderRingCW"
> > + class="RingCW Ring Leader"
> > + d="m 34,145 0,2 26,0" />
> > + <text
> > + id="LabelRingCW"
> > + class="RingCW Ring Label"
> > + x="62"
> > + y="147"
> > + style="text-anchor:start">CW</text>
> > + <path
> > + id="RingCW"
> > + class="RingCW Button"
> > + d="m 31,139 3,-1.5 0,1 a 7.5,7.5 0 0 0 5,-1 6.5,6.5 0 0 1 -5,2 l
> 0,1 z" />
> > + </g>
> > + <g
> > + id="g57"
> > + transform="translate(-0.52966107,-6.0911017)">
> > + <circle
> > + id="ButtonI"
> > + class="I ModeSwitch Button"
> > + cx="34"
> > + cy="125"
> > + r="9.5"
> > + d="m 43.5,125 c 0,5.24671 -4.253295,9.5 -9.5,9.5 -5.246705,0
> -9.5,-4.25329 -9.5,-9.5 0,-5.24671 4.253295,-9.5 9.5,-9.5 5.246705,0
> 9.5,4.25329 9.5,9.5 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="125"
> > + sodipodi:rx="9.5"
> > + sodipodi:ry="9.5" />
> > + <path
> > + id="LeaderI"
> > + class="I ModeSwitch Leader"
> > + d="m 56,125 4,0" />
> > + <text
> > + id="LabelI"
> > + class="I ModeSwitch Label"
> > + x="62"
> > + y="125"
> > + style="text-anchor:start">I</text>
> > + </g>
> > +
> > +</svg>
> > diff --git a/data/layouts/intuos-pro-2-m.svg
> b/data/layouts/intuos-pro-2-m.svg
> > new file mode 100644
> > index 0000000..53f200b
> > --- /dev/null
> > +++ b/data/layouts/intuos-pro-2-m.svg
> > @@ -0,0 +1,323 @@
> > +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
> > +<svg
> > + xmlns:dc="http://purl.org/dc/elements/1.1/";
> > + xmlns:cc="http://creativecommons.org/ns#";
> > + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
> > + xmlns:svg="http://www.w3.org/2000/svg";
> > + xmlns="http://www.w3.org/2000/svg";
> > + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
> > + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
> > + version="1.1"
> > + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:
> .25;font-size:8"
> > + id="intuos-pro-2-m"
> > + width="380"
> > + height="250"
> > + inkscape:version="0.47 r22583"
> > + sodipodi:docname="intuos-pro-2-m.svg">
> > + <metadata
> > + id="metadata66">
> > + <rdf:RDF>
> > + <cc:Work
> > + rdf:about="">
> > + <dc:format>image/svg+xml</dc:format>
> > + <dc:type
> > + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
> > + <dc:title>Wacom Intuos Pro 2 M</dc:title>
> > + </cc:Work>
> > + </rdf:RDF>
> > + </metadata>
> > + <defs
> > + id="defs64">
> > + <inkscape:perspective
> > + sodipodi:type="inkscape:persp3d"
> > + inkscape:vp_x="0 : 125 : 1"
> > + inkscape:vp_y="0 : 1000 : 0"
> > + inkscape:vp_z="380 : 125 : 1"
> > + inkscape:persp3d-origin="190 : 83.333333 : 1"
> > + id="perspective68" />
> > + </defs>
> > + <sodipodi:namedview
> > + pagecolor="#ffffff"
> > + bordercolor="#666666"
> > + borderopacity="1"
> > + objecttolerance="10"
> > + gridtolerance="10"
> > + guidetolerance="10"
> > + inkscape:pageopacity="0"
> > + inkscape:pageshadow="2"
> > + inkscape:window-width="1600"
> > + inkscape:window-height="1124"
> > + id="namedview62"
> > + showgrid="false"
> > + inkscape:zoom="3.776"
> > + inkscape:cx="190"
> > + inkscape:cy="122.3517"
> > + inkscape:window-x="0"
> > + inkscape:window-y="25"
> > + inkscape:window-maximized="1"
> > + inkscape:current-layer="intuos-pro-2-m" />
> > + <title
> > + id="title">Wacom Intuos Pro 2 M</title>
> > + <g
> > + id="GroupA">
> > + <path
> > + d="M 24 42 c 0 -2 2 -2 2 -2 l 16 0 c 2 0 2 2 2 2 l 0
> 10 l -20 0 l -0 -10"
> > + class="A Button"
> > + id="ButtonA" />
> > + <path
> > + id="LeaderA"
> > + class="A Leader"
> > + d="M 46 46 L 50 46" />
> > + <text
> > + id="LabelA"
> > + class="A Label"
> > + x="52"
> > + y="46"
> > + style="text-anchor:start;">
> > + A
> > + </text>
> > + </g>
> > + <g
> > + id="g9"
> > + transform="translate(0,-1.5889831)">
> > + <rect
> > + id="ButtonB"
> > + class="B Button"
> > + x="24"
> > + y="54"
> > + width="20"
> > + height="12" />
> > + <rect
> > + id="DotB1"
> > + rx="1"
> > + ry="1"
> > + x="30"
> > + y="59.5"
> > + width="8"
> > + height="1" />
> > + <path
> > + id="LeaderB"
> > + class="B Leader"
> > + d="m 46,60 4,0" />
> > + <text
> > + id="LabelB"
> > + class="B Label"
> > + x="52"
> > + y="60"
> > + style="text-anchor:start">B</text>
> > + </g>
> > + <g
> > + id="g15"
> > + transform="translate(0,-3.1779661)">
> > + <rect
> > + id="ButtonC"
> > + class="C Button"
> > + x="24"
> > + y="68"
> > + width="20"
> > + height="12" />
> > + <circle
> > + id="DotC1"
> > + cx="34"
> > + cy="74"
> > + r="0.75"
> > + d="m 34.75,74 c 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0
> -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75
> 0.414214,0 0.75,0.335786 0.75,0.75 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="74"
> > + sodipodi:rx="0.75"
> > + sodipodi:ry="0.75" />
> > + <path
> > + id="LeaderC"
> > + class="C Leader"
> > + d="m 46,74 4,0" />
> > + <text
> > + id="LabelC"
> > + class="C Label"
> > + x="52"
> > + y="74"
> > + style="text-anchor:start">C</text>
> > + </g>
> > + <g
> > + id="g21"
> > + transform="translate(0,-4.7669492)">
> > + <path
> > + d="m 24,82 20,0 0,10 c 0,2 -2,2 -2,2 l -16,0 c -2,0 -2,-2 -2,-2
> l 0,-10"
> > + class="D Button"
> > + id="ButtonD" />
> > + <path
> > + id="LeaderD"
> > + class="D Leader"
> > + d="m 46,88 4,0" />
> > + <text
> > + id="LabelD"
> > + class="D Label"
> > + x="52"
> > + y="88"
> > + style="text-anchor:start">D</text>
> > + </g>
> > + <g
> > + id="g26"
> > + transform="translate(-0.26483051,-7.4152542)">
> > + <path
> > + d="M 24 156 c 0 -2 2 -2 2 -2 l
> 16 0 c 2 0 2 2 2 2 l 0 10
> l -20 0 l -0 -10"
> > + class="H Button"
> > + id="ButtonH" />
> > + <path
> > + id="LeaderE"
> > + class="E Leader"
> > + d="m 46,162 4,0" />
> > + <text
> > + id="LabelE"
> > + class="E Label"
> > + x="52"
> > + y="162"
> > + style="text-anchor:start">E</text>
> > + </g>
> > + <g
> > + id="g31"
> > + transform="translate(-0.26483051,-11.122881)">
> > + <rect
> > + id="ButtonF"
> > + class="F Button"
> > + x="24"
> > + y="170"
> > + width="20"
> > + height="12" />
> > + <circle
> > + id="DotF1"
> > + cx="34"
> > + cy="176"
> > + r="0.75"
> > + d="m 34.75,176 c 0,0.41421 -0.335786,0.75 -0.75,0.75 -0.414214,0
> -0.75,-0.33579 -0.75,-0.75 0,-0.41421 0.335786,-0.75 0.75,-0.75 0.414214,0
> 0.75,0.33579 0.75,0.75 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="176"
> > + sodipodi:rx="0.75"
> > + sodipodi:ry="0.75" />
> > + <path
> > + id="LeaderF"
> > + class="F Leader"
> > + d="m 46,176 4,0" />
> > + <text
> > + id="LabelF"
> > + class="F Label"
> > + x="52"
> > + y="176"
> > + style="text-anchor:start">F</text>
> > + </g>
> > + <g
> > + id="g37"
> > + transform="translate(-0.26483051,-12.711865)">
> > + <rect
> > + id="ButtonG"
> > + class="G Button"
> > + x="24"
> > + y="184"
> > + width="20"
> > + height="12" />
> > + <rect
> > + id="DotG1"
> > + rx="1"
> > + ry="1"
> > + x="30"
> > + y="189.5"
> > + width="8"
> > + height="1" />
> > + <path
> > + id="LeaderG"
> > + class="G Leader"
> > + d="m 46,190 4,0" />
> > + <text
> > + id="LabelG"
> > + class="G Label"
> > + x="52"
> > + y="190"
> > + style="text-anchor:start">G</text>
> > + </g>
> > + <g
> > + id="g43"
> > + transform="translate(-0.26483051,-14.830508)">
> > + <path
> > + d="m 24,198 20,0 0,10 c 0,2 -2,2 -2,2 l -16,0 c -2,0 -2,-2 -2,-2
> l 0,-10"
> > + class="D Button"
> > + id="path41" />
> > + <path
> > + id="LeaderH"
> > + class="H Leader"
> > + d="m 46,204 4,0" />
> > + <text
> > + id="LabelH"
> > + class="H Label"
> > + x="52"
> > + y="204"
> > + style="text-anchor:start">H</text>
> > + </g>
> > + <g
> > + id="g48"
> > + transform="translate(-0.52966102,-6.0911017)">
> > + <circle
> > + id="Ring"
> > + class="Ring TouchRing"
> > + cx="34"
> > + cy="125"
> > + r="19.5"
> > + d="m 53.5,125 c 0,10.76955 -8.730447,19.5 -19.5,19.5
> -10.769553,0 -19.5,-8.73045 -19.5,-19.5 0,-10.76955 8.730447,-19.5
> 19.5,-19.5 10.769553,0 19.5,8.73045 19.5,19.5 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="125"
> > + sodipodi:rx="19.5"
> > + sodipodi:ry="19.5" />
> > + <path
> > + id="LeaderRingCCW"
> > + class="RingCCW Ring Leader"
> > + d="m 34,105 0,-2 26,0" />
> > + <text
> > + id="LabelRingCCW"
> > + class="RingCCW Ring Label"
> > + x="62"
> > + y="103"
> > + style="text-anchor:start">CCW</text>
> > + <path
> > + id="RingCCW"
> > + class="RingCCW Button"
> > + d="m 31,111 3,-1.5 0,1 a 7.5,7.5 0 0 1 5,1.5 6.5,6.5 0 0 0
> -5,-0.5 l 0,1 z" />
> > + <path
> > + id="LeaderRingCW"
> > + class="RingCW Ring Leader"
> > + d="m 34,145 0,2 26,0" />
> > + <text
> > + id="LabelRingCW"
> > + class="RingCW Ring Label"
> > + x="62"
> > + y="147"
> > + style="text-anchor:start">CW</text>
> > + <path
> > + id="RingCW"
> > + class="RingCW Button"
> > + d="m 31,139 3,-1.5 0,1 a 7.5,7.5 0 0 0 5,-1 6.5,6.5 0 0 1 -5,2 l
> 0,1 z" />
> > + </g>
> > + <g
> > + id="g57"
> > + transform="translate(-0.52966107,-6.0911017)">
> > + <circle
> > + id="ButtonI"
> > + class="I ModeSwitch Button"
> > + cx="34"
> > + cy="125"
> > + r="9.5"
> > + d="m 43.5,125 c 0,5.24671 -4.253295,9.5 -9.5,9.5 -5.246705,0
> -9.5,-4.25329 -9.5,-9.5 0,-5.24671 4.253295,-9.5 9.5,-9.5 5.246705,0
> 9.5,4.25329 9.5,9.5 z"
> > + sodipodi:cx="34"
> > + sodipodi:cy="125"
> > + sodipodi:rx="9.5"
> > + sodipodi:ry="9.5" />
> > + <path
> > + id="LeaderI"
> > + class="I ModeSwitch Leader"
> > + d="m 56,125 4,0" />
> > + <text
> > + id="LabelI"
> > + class="I ModeSwitch Label"
> > + x="62"
> > + y="125"
> > + style="text-anchor:start">I</text>
> > + </g>
> > +
> > +</svg>
> > --
> > 2.7.4
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
