From 6f7415d0106e7c2d54ddeaa25641876de6da8299 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 24 Oct 2024 10:53:23 +1000
Subject: [PATCH 1/2] layouts: fix missing Strip in the Huion Kamvas Pro 16

---
 data/layouts/huion-kamvas-pro-16-gt-156.svg | 261 +++++++++++++++++---
 1 file changed, 222 insertions(+), 39 deletions(-)

diff --git a/data/layouts/huion-kamvas-pro-16-gt-156.svg b/data/layouts/huion-kamvas-pro-16-gt-156.svg
index 3e1f01b8..a02e6a4f 100644
--- a/data/layouts/huion-kamvas-pro-16-gt-156.svg
+++ b/data/layouts/huion-kamvas-pro-16-gt-156.svg
@@ -1,41 +1,224 @@
-<?xml version='1.0' encoding='ASCII'?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="huion-kamvas-pro-16-gt-156" width="750" height="430">
-  <title id="title">KAMVAS Pro 16 GT-156</title>
-  <rect x="99" y="47" width="593" height="334"/>
-  <g>
-    <rect id="ButtonA" class="A Button" x="28" y="87" width="19" height="19"/>
-    <text id="LabelA" class="A Label" x="75.5" y="98.5" style="text-anchor:start;">A</text>
-    <path style="fill:none" d="M 60.5,96.5 H 67.5" id="LeaderA" class="Leader A"/>
-  </g>
-  <g>
-    <rect id="ButtonB" class="B Button" x="28" y="112" width="19" height="19"/>
-    <text id="LabelB" class="B Label" x="75.5" y="123.5" style="text-anchor:start;">B</text>
-    <path style="fill:none" d="M 60.5,121.5 H 67.5" id="LeaderB" class="Leader B"/>
-  </g>
-  <g>
-    <rect id="ButtonC" class="C Button" x="28" y="136" width="19" height="19"/>
-    <text id="LabelC" class="C Label" x="75.5" y="147.5" style="text-anchor:start;">C</text>
-    <path style="fill:none" d="M 60.5,145.5 H 67.5" id="LeaderC" class="Leader C"/>
-  </g>
-  <g>
-    <rect id="ButtonD" class="D Button" x="28" y="276" width="19" height="19"/>
-    <text id="LabelD" class="D Label" x="75.5" y="287.5" style="text-anchor:start;">D</text>
-    <path style="fill:none" d="M 60.5,285.5 H 67.5" id="LeaderD" class="Leader D"/>
-  </g>
-  <g>
-    <rect id="ButtonE" class="E Button" x="28" y="300" width="19" height="19"/>
-    <text id="LabelE" class="E Label" x="75.5" y="311.5" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 60.5,309.5 H 67.5" id="LeaderE" class="Leader E"/>
-  </g>
-  <g>
-    <rect id="ButtonF" class="F Button" x="28" y="324" width="19" height="19"/>
-    <text id="LabelF" class="F Label" x="75.5" y="335.5" style="text-anchor:start;">F</text>
-    <path style="fill:none" d="M 60.5,333.5 H 67.5" id="LeaderF" class="Leader F"/>
-  </g>
-  <g>
-    <rect id="ButtonG" class="G Button" x="26" y="347" width="24" height="24"/>
-    <text id="LabelG" class="G Label" x="76.0" y="361" style="text-anchor:start;">G</text>
-    <path style="fill:none" d="M 61.0,359.0 H 68.0" id="LeaderG" class="Leader G"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="huion-kamvas-pro-16-gt-156"
+   width="750"
+   height="430"
+   sodipodi:docname="huion-kamvas-pro-16-gt-156.svg"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   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">
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="3.336"
+     inkscape:cx="375"
+     inkscape:cy="214.92806"
+     inkscape:window-width="3072"
+     inkscape:window-height="1659"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="huion-kamvas-pro-16-gt-156" />
+  <title
+     id="title">KAMVAS Pro 16 GT-156</title>
+  <rect
+     x="99"
+     y="47"
+     width="593"
+     height="334"
+     id="rect1" />
+  <g
+     id="g1">
+    <rect
+       id="ButtonA"
+       class="A Button"
+       x="28"
+       y="87"
+       width="19"
+       height="19" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="75.5"
+       y="98.5"
+       style="text-anchor:start;">A</text>
+    <path
+       style="fill:none"
+       d="M 60.5,96.5 H 67.5"
+       id="LeaderA"
+       class="Leader A" />
+  </g>
+  <g
+     id="g2">
+    <rect
+       id="ButtonB"
+       class="B Button"
+       x="28"
+       y="112"
+       width="19"
+       height="19" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="75.5"
+       y="123.5"
+       style="text-anchor:start;">B</text>
+    <path
+       style="fill:none"
+       d="M 60.5,121.5 H 67.5"
+       id="LeaderB"
+       class="Leader B" />
+  </g>
+  <g
+     id="g3">
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="28"
+       y="136"
+       width="19"
+       height="19" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="75.5"
+       y="147.5"
+       style="text-anchor:start;">C</text>
+    <path
+       style="fill:none"
+       d="M 60.5,145.5 H 67.5"
+       id="LeaderC"
+       class="Leader C" />
+  </g>
+  <g
+     id="g4">
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="28"
+       y="276"
+       width="19"
+       height="19" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="75.5"
+       y="287.5"
+       style="text-anchor:start;">D</text>
+    <path
+       style="fill:none"
+       d="M 60.5,285.5 H 67.5"
+       id="LeaderD"
+       class="Leader D" />
+  </g>
+  <g
+     id="g5">
+    <rect
+       id="ButtonE"
+       class="E Button"
+       x="28"
+       y="300"
+       width="19"
+       height="19" />
+    <text
+       id="LabelE"
+       class="E Label"
+       x="75.5"
+       y="311.5"
+       style="text-anchor:start;">E</text>
+    <path
+       style="fill:none"
+       d="M 60.5,309.5 H 67.5"
+       id="LeaderE"
+       class="Leader E" />
+  </g>
+  <g
+     id="g6">
+    <rect
+       id="ButtonF"
+       class="F Button"
+       x="28"
+       y="324"
+       width="19"
+       height="19" />
+    <text
+       id="LabelF"
+       class="F Label"
+       x="75.5"
+       y="335.5"
+       style="text-anchor:start;">F</text>
+    <path
+       style="fill:none"
+       d="M 60.5,333.5 H 67.5"
+       id="LeaderF"
+       class="Leader F" />
+  </g>
+  <g
+     id="g7">
+    <rect
+       id="ButtonG"
+       class="G Button"
+       x="26"
+       y="347"
+       width="24"
+       height="24" />
+    <text
+       id="LabelG"
+       class="G Label"
+       x="76.0"
+       y="361"
+       style="text-anchor:start;">G</text>
+    <path
+       style="fill:none"
+       d="M 61.0,359.0 H 68.0"
+       id="LeaderG"
+       class="Leader G" />
+  </g>
+  <g
+     id="g9"
+     style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+     transform="translate(-3.1603717,146.47752)">
+    <rect
+       id="Strip"
+       class="Strip TouchStrip"
+       x="35"
+       y="41"
+       rx="1"
+       ry="1"
+       width="12"
+       height="47" />
+    <path
+       id="LeaderStripUp"
+       class="StripUp Strip Leader"
+       d="m 41,39 v -1 h 10 v 10 h 9" />
+    <text
+       id="LabelStripUp"
+       class="StripUp Strip Label"
+       x="62"
+       y="48"
+       style="text-anchor:start">Up</text>
+    <path
+       id="LeaderStripDown"
+       class="StripDown Strip Leader"
+       d="m 41,90 v 1 H 51 V 81 h 9" />
+    <text
+       id="LabelStripDown"
+       class="StripDown Strip Label"
+       x="62"
+       y="81"
+       style="text-anchor:start">Down</text>
   </g>
 </svg>

From d65c1350622fe1623760b2e96158d26ae91ea84d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 22 Oct 2024 15:26:12 +1000
Subject: [PATCH 2/2] data: confirm the Huion RTP-700

See https://github.com/linuxwacom/libwacom/issues/784#issuecomment-2426327301
---
 data/huion-rtp-700.tablet      |  34 +++--
 data/layouts/huion-rtp-700.svg | 224 ++++++++++++++++++++++++++++-----
 2 files changed, 219 insertions(+), 39 deletions(-)

diff --git a/data/huion-rtp-700.tablet b/data/huion-rtp-700.tablet
index 467132c8..0cc10f89 100644
--- a/data/huion-rtp-700.tablet
+++ b/data/huion-rtp-700.tablet
@@ -1,18 +1,32 @@
-# This tablet description file has been generated using an automated tool:
-# https://github.com/JoseExposito/uclogic-libwacom-tablet-descriptions
-# If you own this tablet, please improve it.
+# Huion
+# RTP-700
 #
-# sysinfo missing - if you own this device please provide it. See this link
-# for details: https://github.com/linuxwacom/libwacom/wiki/Adding-a-new-device
-
+# sysinfo.XzvBqrnM2S.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/420
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    +----------------------------------+
+#    |                                  |
+#  A |                                  |
+#  B |                                  |
+#  C |                                  |
+#    |                                  |
+#    |                                  |
+#    |                                  |
+#  D |                                  |
+#  E |                                  |
+#  F |                                  |
+#    |                                  |
+#    +----------------------------------+
 [Device]
 Name=Huion RTP-700
 ModelName=RTP-700
 Class=Bamboo
-# Product ID is unknown, please fix
-DeviceMatch=usb|256c|006e||HUION_T19k;usb|256c|006d||HUION_T19k;usb|256c|006f||HUION_T19k;usb|256c|0064||HUION_T19k;
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
+DeviceMatch=usb|256c|0064||HUION_T19k
+Width=11
+Height=7
 Layout=huion-rtp-700.svg
 Styli=@generic-no-eraser;
 IntegratedIn=
diff --git a/data/layouts/huion-rtp-700.svg b/data/layouts/huion-rtp-700.svg
index a63235b9..91ea70a0 100644
--- a/data/layouts/huion-rtp-700.svg
+++ b/data/layouts/huion-rtp-700.svg
@@ -1,36 +1,202 @@
-<?xml version='1.0' encoding='ASCII'?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="huion-rtp-700" width="726" height="430">
-  <title id="title">Huion RTP-700</title>
-  <rect x="86" y="38" width="566" height="352"/>
-  <g>
-    <rect id="ButtonA" class="A Button" x="37" y="32" width="20" height="20"/>
-    <text id="LabelA" class="A Label" x="85.0" y="44" style="text-anchor:start;">A</text>
-    <path style="fill:none" d="M 70.0,42.0 H 77.0" id="LeaderA" class="Leader A"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="huion-rtp-700"
+   width="726"
+   height="430"
+   sodipodi:docname="huion-rtp-700.svg"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   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">
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="3.3674419"
+     inkscape:cx="362.88674"
+     inkscape:cy="215"
+     inkscape:window-width="3072"
+     inkscape:window-height="1659"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="huion-rtp-700" />
+  <title
+     id="title">Huion RTP-700</title>
+  <rect
+     x="86"
+     y="38"
+     width="566"
+     height="352"
+     id="rect1" />
+  <g
+     id="g1">
+    <rect
+       id="ButtonA"
+       class="A Button"
+       x="37"
+       y="32"
+       width="20"
+       height="20" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="85.0"
+       y="44"
+       style="text-anchor:start;">A</text>
+    <path
+       style="fill:none"
+       d="M 70.0,42.0 H 77.0"
+       id="LeaderA"
+       class="Leader A" />
   </g>
-  <g>
-    <rect id="ButtonB" class="B Button" x="37" y="70" width="20" height="20"/>
-    <text id="LabelB" class="B Label" x="85.0" y="82" style="text-anchor:start;">B</text>
-    <path style="fill:none" d="M 70.0,80.0 H 77.0" id="LeaderB" class="Leader B"/>
+  <g
+     id="g2">
+    <rect
+       id="ButtonB"
+       class="B Button"
+       x="37"
+       y="70"
+       width="20"
+       height="20" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="85.0"
+       y="82"
+       style="text-anchor:start;">B</text>
+    <path
+       style="fill:none"
+       d="M 70.0,80.0 H 77.0"
+       id="LeaderB"
+       class="Leader B" />
   </g>
-  <g>
-    <rect id="ButtonC" class="C Button" x="37" y="110" width="20" height="20"/>
-    <text id="LabelC" class="C Label" x="85.0" y="122" style="text-anchor:start;">C</text>
-    <path style="fill:none" d="M 70.0,120.0 H 77.0" id="LeaderC" class="Leader C"/>
+  <g
+     id="g3">
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="37"
+       y="110"
+       width="20"
+       height="20" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="85.0"
+       y="122"
+       style="text-anchor:start;">C</text>
+    <path
+       style="fill:none"
+       d="M 70.0,120.0 H 77.0"
+       id="LeaderC"
+       class="Leader C" />
   </g>
-  <g>
-    <rect id="ButtonD" class="D Button" x="37" y="300" width="20" height="20"/>
-    <text id="LabelD" class="D Label" x="85.0" y="312" style="text-anchor:start;">D</text>
-    <path style="fill:none" d="M 70.0,310.0 H 77.0" id="LeaderD" class="Leader D"/>
+  <g
+     id="g4">
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="37"
+       y="300"
+       width="20"
+       height="20" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="85.0"
+       y="312"
+       style="text-anchor:start;">D</text>
+    <path
+       style="fill:none"
+       d="M 70.0,310.0 H 77.0"
+       id="LeaderD"
+       class="Leader D" />
   </g>
-  <g>
-    <rect id="ButtonE" class="E Button" x="37" y="340" width="20" height="20"/>
-    <text id="LabelE" class="E Label" x="85.0" y="352" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 70.0,350.0 H 77.0" id="LeaderE" class="Leader E"/>
+  <g
+     id="g5">
+    <rect
+       id="ButtonE"
+       class="E Button"
+       x="37"
+       y="340"
+       width="20"
+       height="20" />
+    <text
+       id="LabelE"
+       class="E Label"
+       x="85.0"
+       y="352"
+       style="text-anchor:start;">E</text>
+    <path
+       style="fill:none"
+       d="M 70.0,350.0 H 77.0"
+       id="LeaderE"
+       class="Leader E" />
   </g>
-  <g>
-    <rect id="ButtonF" class="F Button" x="37" y="379" width="20" height="20"/>
-    <text id="LabelF" class="F Label" x="85.0" y="391" style="text-anchor:start;">F</text>
-    <path style="fill:none" d="M 70.0,389.0 H 77.0" id="LeaderF" class="Leader F"/>
+  <g
+     id="g6">
+    <rect
+       id="ButtonF"
+       class="F Button"
+       x="37"
+       y="379"
+       width="20"
+       height="20" />
+    <text
+       id="LabelF"
+       class="F Label"
+       x="85.0"
+       y="391"
+       style="text-anchor:start;">F</text>
+    <path
+       style="fill:none"
+       d="M 70.0,389.0 H 77.0"
+       id="LeaderF"
+       class="Leader F" />
+  </g>
+  <g
+     id="g9"
+     style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+     transform="translate(6.5821823,147.22721)">
+    <rect
+       id="Strip"
+       class="Strip TouchStrip"
+       x="35"
+       y="41"
+       rx="1"
+       ry="1"
+       width="12"
+       height="47" />
+    <path
+       id="LeaderStripUp"
+       class="StripUp Strip Leader"
+       d="m 41,39 v -1 h 10 v 10 h 9" />
+    <text
+       id="LabelStripUp"
+       class="StripUp Strip Label"
+       x="62"
+       y="48"
+       style="text-anchor:start">Up</text>
+    <path
+       id="LeaderStripDown"
+       class="StripDown Strip Leader"
+       d="m 41,90 v 1 H 51 V 81 h 9" />
+    <text
+       id="LabelStripDown"
+       class="StripDown Strip Label"
+       x="62"
+       y="81"
+       style="text-anchor:start">Down</text>
   </g>
 </svg>