From d2c6cc001ccd61faaa25f74690f459aecc37e172 Mon Sep 17 00:00:00 2001
From: mattie20 <45700495+mattie20@users.noreply.github.com>
Date: Thu, 16 May 2024 20:41:47 -0400
Subject: [PATCH] Improve Huion Inspiroy 2 m support (#699)

---
 data/huion-inspiroy-2-m---h951p.tablet      |  60 ++-
 data/layouts/huion-inspiroy-2-m---h951p.svg | 414 ++++++++------------
 2 files changed, 220 insertions(+), 254 deletions(-)

diff --git a/data/huion-inspiroy-2-m---h951p.tablet b/data/huion-inspiroy-2-m---h951p.tablet
index a8e7833b..8b7af877 100644
--- a/data/huion-inspiroy-2-m---h951p.tablet
+++ b/data/huion-inspiroy-2-m---h951p.tablet
@@ -1,29 +1,61 @@
 # 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
+# Inspiroy 2 M
+# H951P
+#
+# sysinfo.nLrNAqLFy1.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/383
+#
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#     *-----------------------*
+#     |                       |
+# A D |                       |
+# B E |                       |
+# C F |                       |
+#   G |                       |
+#     |        TABLET         |
+#   H |                       |
+#   I |                       |
+#   J |                       |
+#   K |                       |
+#     |                       |
+#     *-----------------------*
+#
+#
+# Dial Map:
+# (A=1, B=2, C=3, ...)
+#
+#     *-----------------------*
+#     |                       |
+#     |                       |
+#   A |        TABLET         |
+#     |                       |
+#     |                       |
+#     *-----------------------*
 #
-# 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
 
 [Device]
-Name=Inspiroy 2 M - H951P
-ModelName=Inspiroy 2 M - H951P
+Name=Huion Inspiroy 2 M
+ModelName=H951P
 Class=Bamboo
-DeviceMatch=usb|256c|0067||HUION_T21k
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
+DeviceMatch=usb|256c|0067;
+Width=9
+Height=6  # Technically rounds down to 5, but 6 seems more natural
+IntegratedIn=
 Layout=huion-inspiroy-2-m---h951p.svg
 Styli=@generic-no-eraser;
-IntegratedIn=
 
 [Features]
-NumStrips=0
-NumRings=0
-NumDials=1
-Reversible=true
 Stylus=true
+Reversible=true
 Touch=false
 TouchSwitch=false
+NumRings=0
+NumDials=1
+NumStrips=0
 
 [Buttons]
 Left=A;B;C;D;E;F;G;H;I;J;K
diff --git a/data/layouts/huion-inspiroy-2-m---h951p.svg b/data/layouts/huion-inspiroy-2-m---h951p.svg
index 9bd8eee9..bfe99db3 100644
--- a/data/layouts/huion-inspiroy-2-m---h951p.svg
+++ b/data/layouts/huion-inspiroy-2-m---h951p.svg
@@ -1,329 +1,263 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
    id="huion-inspiroy-2-m---h951p"
-   width="720"
-   height="424"
-   sodipodi:docname="huion-inspiroy-2-m---h951p.svg"
-   inkscape:version="1.5-dev (afb39433d1, 2024-05-12)"
-   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="defs11" />
-  <sodipodi:namedview
-     id="namedview11"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="3.2652778"
-     inkscape:cx="360"
-     inkscape:cy="212.07997"
-     inkscape:window-width="3072"
-     inkscape:window-height="1696"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="huion-inspiroy-2-m---h951p" />
+   width="720.0"
+   height="424.0"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
   <title
      id="title">Inspiroy 2 M - H951P</title>
   <rect
-     x="151"
-     y="50"
-     width="519"
-     height="323"
-     id="rect1" />
-  <g
-     id="g1">
-    <rect
+     x="5.0"
+     y="5.0"
+     width="710.0"
+     height="414.0" />
+  <g>
+    <circle
        id="ButtonA"
-       class="A Button"
-       x="8"
-       y="32"
-       width="17"
-       height="17" />
+       class="A ModeSwitch Button"
+       cx="22.0"
+       cy="40.5"
+       r="10.5" />
+    <path
+       id="LeaderA"
+       class="Leader A"
+       d="M 21.5 55.0 V 60.0 H 106.0" />
     <text
        id="LabelA"
        class="A Label"
-       x="14.5"
-       y="62.5"
+       x="112.0"
+       y="61.0"
        style="text-anchor:start;">A</text>
-    <path
-       style="fill:none"
-       d="M 16.5,47.5 V 54.5"
-       id="LeaderA"
-       class="Leader A" />
   </g>
-  <g
-     id="g2">
-    <rect
+  <g>
+    <circle
        id="ButtonB"
-       class="B Button"
-       x="8"
-       y="72"
-       width="17"
-       height="17" />
+       class="B ModeSwitch Button"
+       cx="22.0"
+       cy="80.5"
+       r="10.5" />
+    <path
+       id="LeaderB"
+       class="Leader B"
+       d="M 21.5 95.0 V 100.0 H 106.0" />
     <text
        id="LabelB"
        class="B Label"
-       x="14.5"
-       y="102.5"
+       x="112.0"
+       y="101.0"
        style="text-anchor:start;">B</text>
-    <path
-       style="fill:none"
-       d="M 16.5,87.5 V 94.5"
-       id="LeaderB"
-       class="Leader B" />
   </g>
-  <g
-     id="g3">
-    <rect
+  <g>
+    <circle
        id="ButtonC"
-       class="C Button"
-       x="8"
-       y="112"
-       width="17"
-       height="17" />
+       class="C ModeSwitch Button"
+       cx="22.0"
+       cy="120.5"
+       r="10.5" />
+    <path
+       id="LeaderC"
+       class="Leader C"
+       d="M 21.5 135.0 V 140.0 H 106.0" />
     <text
        id="LabelC"
        class="C Label"
-       x="14.5"
-       y="142.5"
+       x="112.0"
+       y="141.0"
        style="text-anchor:start;">C</text>
-    <path
-       style="fill:none"
-       d="M 16.5,127.5 V 134.5"
-       id="LeaderC"
-       class="Leader C" />
   </g>
-  <g
-     id="g4">
+  <g>
     <rect
        id="ButtonD"
        class="D Button"
-       x="41"
-       y="28"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="28.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderD"
+       class="Leader D"
+       d="M 88.0 41.0 H 127.0" />
     <text
        id="LabelD"
        class="D Label"
-       x="98.0"
-       y="43"
+       x="133.0"
+       y="42.0"
        style="text-anchor:start;">D</text>
-    <path
-       style="fill:none"
-       d="M 83.0,41.0 H 90.0"
-       id="LeaderD"
-       class="Leader D" />
   </g>
-  <g
-     id="g5">
+  <g>
     <rect
        id="ButtonE"
        class="E Button"
-       x="41"
-       y="68"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="68.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderE"
+       class="Leader E"
+       d="M 88.0 81.0 H 127.0" />
     <text
        id="LabelE"
        class="E Label"
-       x="98.0"
-       y="83"
+       x="133.0"
+       y="82.0"
        style="text-anchor:start;">E</text>
-    <path
-       style="fill:none"
-       d="M 83.0,81.0 H 90.0"
-       id="LeaderE"
-       class="Leader E" />
   </g>
-  <g
-     id="g6">
+  <g>
     <rect
        id="ButtonF"
        class="F Button"
-       x="41"
-       y="108"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="108.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderF"
+       class="Leader F"
+       d="M 88.0 122.0 H 127.0" />
     <text
        id="LabelF"
        class="F Label"
-       x="98.0"
-       y="123"
+       x="133.0"
+       y="122.0"
        style="text-anchor:start;">F</text>
-    <path
-       style="fill:none"
-       d="M 83.0,121.0 H 90.0"
-       id="LeaderF"
-       class="Leader F" />
   </g>
-  <g
-     id="g7">
+  <g>
     <rect
        id="ButtonG"
        class="G Button"
-       x="40"
-       y="148"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="148.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderG"
+       class="Leader G"
+       d="M 88.0 161.0 H 127.0" />
     <text
        id="LabelG"
        class="G Label"
-       x="97.0"
-       y="163"
+       x="133.0"
+       y="162.0"
        style="text-anchor:start;">G</text>
+  </g>
+  <g>
+    <rect
+       id="Dial"
+       class="Dial TouchDial"
+       x="37.0"
+       y="200.0"
+       width="56.0"
+       height="22.0"
+       rx="11.0"
+       ry="11.0" />
     <path
-       style="fill:none"
-       d="M 82.0,161.0 H 89.0"
-       id="LeaderG"
-       class="Leader G" />
+       id="LeaderDialCCW"
+       class="DialCCW Dial Leader"
+       d="M 65.0 196.0 V 190.0 H 106.0" />
+    <path
+       id="LeaderDialCW"
+       class="DialCW Dial Leader"
+       d="M 65.0 226.0 V 232.0 H 106.0" />
+    <text
+       id="LabelDialCCW"
+       class="DialCCW Dial Label"
+       x="112.0"
+       y="192.0"
+       style="text-anchor:start;">Up</text>
+    <text
+       id="LabelDialCW"
+       class="DialCW Dial Label"
+       x="112.0"
+       y="234.0"
+       style="text-anchor:start;">Down</text>
   </g>
-  <g
-     id="g8">
+  <g>
     <rect
        id="ButtonH"
        class="H Button"
-       x="41"
-       y="250"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="250.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderH"
+       class="Leader H"
+       d="M 88.0 263.0 H 127.0" />
     <text
        id="LabelH"
        class="H Label"
-       x="98.0"
-       y="265"
+       x="133.0"
+       y="264.0"
        style="text-anchor:start;">H</text>
-    <path
-       style="fill:none"
-       d="M 83.0,263.0 H 90.0"
-       id="LeaderH"
-       class="Leader H" />
   </g>
-  <g
-     id="g9">
+  <g>
     <rect
        id="ButtonI"
        class="I Button"
-       x="41"
-       y="289"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="289.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderI"
+       class="Leader I"
+       d="M 88.0 302.0 H 127.0" />
     <text
        id="LabelI"
        class="I Label"
-       x="98.0"
-       y="304"
+       x="133.0"
+       y="303.0"
        style="text-anchor:start;">I</text>
-    <path
-       style="fill:none"
-       d="M 83.0,302.0 H 90.0"
-       id="LeaderI"
-       class="Leader I" />
   </g>
-  <g
-     id="g10">
+  <g>
     <rect
        id="ButtonJ"
        class="J Button"
-       x="41"
-       y="329"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="329.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderJ"
+       class="Leader J"
+       d="M 88.0 342.0 H 127.0" />
     <text
        id="LabelJ"
        class="J Label"
-       x="98.0"
-       y="344"
+       x="133.0"
+       y="343.0"
        style="text-anchor:start;">J</text>
-    <path
-       style="fill:none"
-       d="M 83.0,342.0 H 90.0"
-       id="LeaderJ"
-       class="Leader J" />
   </g>
-  <g
-     id="g11">
+  <g>
     <rect
        id="ButtonK"
        class="K Button"
-       x="41"
-       y="369"
-       width="38"
-       height="26" />
+       x="46.0"
+       y="369.0"
+       width="38.0"
+       height="24.5"
+       rx="4.0" />
+    <path
+       id="LeaderK"
+       class="Leader K"
+       d="M 88.0 382.0 H 127.0" />
     <text
        id="LabelK"
        class="K Label"
-       x="98.0"
-       y="384"
+       x="133.0"
+       y="383.0"
        style="text-anchor:start;">K</text>
-    <path
-       style="fill:none"
-       d="M 83.0,382.0 H 90.0"
-       id="LeaderK"
-       class="Leader K" />
-  </g>
-  <g
-     id="g2-6"
-     style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25"
-     transform="translate(-23.821293,2.9484)">
-    <rect
-       style="fill:none"
-       id="rect6"
-       width="71.107414"
-       height="27.032572"
-       x="35.946293"
-       y="198.33681"
-       ry="3.4251668"
-       rx="3.1165621" />
-    <path
-       id="LeaderDialCCW"
-       class="DialCCW Dial Leader"
-       d="M 87.116505,189.14918 V 187.1991 H 139.33177"
-       style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.349836" />
-    <path
-       id="DialArrowUp"
-       class="DialCCW Button"
-       d="m 86.936266,207.95518 1.5,3 h -1 a 7.5,7.5 0 0 1 -1.5,5 6.5,6.5 0 0 0 0.5,-5 h -1 z"
-       style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
-    <path
-       id="DialArrowDown"
-       class="DialCCW Button"
-       d="m 55.16357,215.75101 -1.5,-3 h 1 a 7.5,7.5 0 0 1 1.5,-5 6.5,6.5 0 0 0 -0.5,5 h 1 z"
-       style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
-    <path
-       id="LeaderDialCW"
-       class="DialCW Dial Leader"
-       d="m 55.414901,233.17455 v 1.90472 h 84.779479"
-       style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.440553" />
-    <text
-       id="LabelDialCCW"
-       class="DialCCW Dial Label"
-       x="152.79242"
-       y="189.8886"
-       style="color:#000000;font-size:8px;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">Up</text>
-    <text
-       id="LabelDialCW"
-       class="DialCW Dial Label"
-       x="147.37643"
-       y="237.93018"
-       style="color:#000000;font-size:8px;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">Down</text>
-    <rect
-       style="fill:none"
-       id="Dial"
-       class="Dial TouchDial"
-       width="71.107414"
-       height="27.032572"
-       x="35.946293"
-       y="198.33681"
-       ry="3.4251668"
-       rx="3.1165621" />
   </g>
 </svg>