wacom: Add AES styli as separate stylus SVG

These are styli like the Dell Active Pen and most of the styli supplied
with laptops with built-in tablets. We don't always know how many
buttons these have so the SVG has just one large button. They're
typicall slimmer and less rounded than the Wacom pens so let's reflect
this here too.

This requires libwacom 1.4 released June 2020
This commit is contained in:
Peter Hutterer 2024-03-08 13:16:30 +10:00 committed by Felipe Borges
parent 6d8edb80dc
commit f1cfc55a63
5 changed files with 187 additions and 1 deletions

View file

@ -297,7 +297,7 @@ if host_is_linux_not_s390
# gnome-bluetooth
gnome_bluetooth_dep = dependency('gnome-bluetooth-ui-3.0')
libwacom_dep = dependency('libwacom', version: '>= 0.7')
libwacom_dep = dependency('libwacom', version: '>= 1.4')
wacom_deps = [
libwacom_dep,

View file

@ -298,6 +298,8 @@ get_icon_name_from_type (const WacomStylus *wstylus)
return "wacom-stylus-classic";
case WSTYLUS_3D:
return "wacom-stylus-3btn-no-eraser";
case WSTYLUS_MOBILE:
return "wacom-stylus-mobile";
default:
if (!libwacom_stylus_has_eraser (wstylus)) {
if (libwacom_stylus_get_num_buttons (wstylus) >= 3)

View file

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
id="svg86343"
version="1.1"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
width="190"
height="32"
sodipodi:docname="wacom-stylus-mobile.svg"
viewBox="0 0 190 32"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata86349">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs86347" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1011"
id="namedview86345"
showgrid="true"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:zoom="3.3934887"
inkscape:cx="5.1569348"
inkscape:cy="-66.450789"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg86343"
borderlayer="true"
inkscape:showpageshadow="false"
inkscape:pagecheckerboard="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid86802"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="-2.9802322e-08"
originy="-1"
spacingy="1"
spacingx="1"
units="px" />
</sodipodi:namedview>
<path
sodipodi:nodetypes="ccccccccccc"
inkscape:connector-curvature="0"
id="rect10526"
d="M 185,8 C 185,8 80,8 30,8 l -25.8956781,6.787494 -0.011266,0.6544 h -3.00374 c -1,0 -1,1.5581 0,1.5581 h 3 l -5e-4,0.6436 L 30,24 c 50,0 155,0 155,0 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3584e4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<rect
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
id="rect10541"
width="8.4535885"
height="39.951416"
x="12.044071"
y="-102.74279"
rx="3.2488298"
ry="4.5000033"
transform="rotate(90)" />
</svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

View file

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
id="svg86343"
version="1.1"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
width="190"
height="32"
sodipodi:docname="wacom-stylus-mobile.svg"
viewBox="0 0 190 32"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata86349">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs86347" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1011"
id="namedview86345"
showgrid="true"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:zoom="3.3934887"
inkscape:cx="5.1569348"
inkscape:cy="-66.450789"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg86343"
borderlayer="true"
inkscape:showpageshadow="false"
inkscape:pagecheckerboard="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid86802"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="-2.9802322e-08"
originy="-1"
spacingy="1"
spacingx="1"
units="px" />
</sodipodi:namedview>
<path
sodipodi:nodetypes="ccccccccccc"
inkscape:connector-curvature="0"
id="rect10526"
d="M 185,8 C 185,8 80,8 30,8 l -25.8956781,6.787494 -0.011266,0.6544 h -3.00374 c -1,0 -1,1.5581 0,1.5581 h 3 l -5e-4,0.6436 L 30,24 c 50,0 155,0 155,0 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<rect
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
id="rect10541"
width="8.4535885"
height="39.951416"
x="12.044071"
y="-102.74279"
rx="3.2488298"
ry="4.5000033"
transform="rotate(90)" />
</svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

View file

@ -24,6 +24,8 @@
<file>wacom-stylus-classic-highlighted.svg</file>
<file>wacom-stylus-inking.svg</file>
<file>wacom-stylus-inking-highlighted.svg</file>
<file>wacom-stylus-mobile.svg</file>
<file>wacom-stylus-mobile-highlighted.svg</file>
<file>wacom-stylus-no-eraser.svg</file>
<file>wacom-stylus-no-eraser-highlighted.svg</file>
<file>wacom-tablet.svg</file>