Remove explicit keycodes in XML, auto-generate them instead

This makes it easier to keep the geometry and symbols files in sync.
Merge branch 'suppress-warnings' into 'master'
2019-07-14 00:16:32 +02:00 · 2019-07-13 22:14:54 +00:00 · 2019-07-14 00:13:41 +02:00 · 2019-07-13 19:47:40 +00:00 · 2019-07-13 18:36:59 +02:00 · 2019-07-13 16:35:07 +00:00
10 changed files with 176 additions and 219 deletions
--- a/data/icons/keyboard-mode-symbolic.svg
+++ b/data/icons/keyboard-mode-symbolic.svg
@ -0,0 +1,52 @@
+<?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"
+   id="svg4043"
+   version="1.1"
+   viewBox="0 0 4.2333331 4.2333093"
+   height="4.2333093mm"
+   width="4.2333331mm">
+  <defs
+     id="defs4037" />
+  <metadata
+     id="metadata4040">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-86.329776,-68.097636)"
+     id="layer1">
+    <g
+       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
+       id="g842">
+      <g
+         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+         id="g836">
+        <path
+           id="path5166"
+           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
+         id="circle5168" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
+         id="path5170" />
+    </g>
+  </g>
+</svg>
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@ -3,51 +3,51 @@
  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
  <section angle="0">
    <row orientation="1">
-      <key keycode="24" name="AD01" oref="outline2" />
-      <key keycode="25" name="AD02" oref="outline2" />
-      <key keycode="26" name="AD03" oref="outline2" />
-      <key keycode="27" name="AD04" oref="outline2" />
-      <key keycode="28" name="AD05" oref="outline2" />
-      <key keycode="29" name="AD06" oref="outline2" />
-      <key keycode="30" name="AD07" oref="outline2" />
-      <key keycode="31" name="AD08" oref="outline2" />
-      <key keycode="32" name="AD09" oref="outline2" />
-      <key keycode="33" name="AD10" oref="outline2" />
+      <key name="AD01" oref="outline2" />
+      <key name="AD02" oref="outline2" />
+      <key name="AD03" oref="outline2" />
+      <key name="AD04" oref="outline2" />
+      <key name="AD05" oref="outline2" />
+      <key name="AD06" oref="outline2" />
+      <key name="AD07" oref="outline2" />
+      <key name="AD08" oref="outline2" />
+      <key name="AD09" oref="outline2" />
+      <key name="AD10" oref="outline2" />
    </row>
  </section>
  <section angle="0">
    <row orientation="1">
-      <key keycode="38" name="AC01" oref="outline2" />
-      <key keycode="39" name="AC02" oref="outline2" />
-      <key keycode="40" name="AC03" oref="outline2" />
-      <key keycode="41" name="AC04" oref="outline2" />
-      <key keycode="42" name="AC05" oref="outline2" />
-      <key keycode="43" name="AC06" oref="outline2" />
-      <key keycode="44" name="AC07" oref="outline2" />
-      <key keycode="45" name="AC08" oref="outline2" />
-      <key keycode="46" name="AC09" oref="outline2" />
+      <key name="AC01" oref="outline2" />
+      <key name="AC02" oref="outline2" />
+      <key name="AC03" oref="outline2" />
+      <key name="AC04" oref="outline2" />
+      <key name="AC05" oref="outline2" />
+      <key name="AC06" oref="outline2" />
+      <key name="AC07" oref="outline2" />
+      <key name="AC08" oref="outline2" />
+      <key name="AC09" oref="outline2" />
    </row>
  </section>
  <section angle="0">
    <row orientation="1">
-      <key keycode="50" name="LFSH" oref="altline" />
-      <key keycode="52" name="AB01" oref="outline2" />
-      <key keycode="53" name="AB02" oref="outline2" />
-      <key keycode="54" name="AB03" oref="outline2" />
-      <key keycode="55" name="AB04" oref="outline2" />
-      <key keycode="56" name="AB05" oref="outline2" />
-      <key keycode="57" name="AB06" oref="outline2" />
-      <key keycode="58" name="AB07" oref="outline2" />
-      <key keycode="22" name="BKSP" oref="altline" />
+      <key name="LFSH" oref="altline" />
+      <key name="AB01" oref="outline2" />
+      <key name="AB02" oref="outline2" />
+      <key name="AB03" oref="outline2" />
+      <key name="AB04" oref="outline2" />
+      <key name="AB05" oref="outline2" />
+      <key name="AB06" oref="outline2" />
+      <key name="AB07" oref="outline2" />
+      <key name="BKSP" oref="altline" />
    </row>
  </section>
  <section angle="0">
    <row orientation="1">
-      <key keycode="0" name="ABC123" oref="altline" />
-      <key keycode="150" name="I150" oref="altline" />
-      <key keycode="65" name="SPCE" oref="spaceline" />
-      <key keycode="60" name="AB09" oref="outline2" />
-      <key keycode="36" name="RTRN" oref="outline7" />
+      <key name="ABC123" oref="altline" />
+      <key name="I150" oref="altline" />
+      <key name="SPCE" oref="spaceline" />
+      <key name="AB08" oref="outline2" />
+      <key name="RTRN" oref="outline7" />
    </row>
  </section>
  <outline id="outline2" corner-radius="1.000000">
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@ -1,276 +1,180 @@
 <?xml version="1.0"?>
 <symbols version="0.90">
-  <key keycode="9" name="ESC">
-    <keysym keyval="65307">Escape</keysym>
-  </key>
-  <key keycode="67" name="FK01">
-    <keysym keyval="65470">F1</keysym>
-  </key>
-  <key keycode="68" name="FK02">
-    <keysym keyval="65471">F2</keysym>
-  </key>
-  <key keycode="69" name="FK03">
-    <keysym keyval="65472">F3</keysym>
-  </key>
-  <key keycode="70" name="FK04">
-    <keysym keyval="65473">F4</keysym>
-  </key>
-  <key keycode="71" name="FK05">
-    <keysym keyval="65474">F5</keysym>
-  </key>
-  <key keycode="72" name="FK06">
-    <keysym keyval="65475">F6</keysym>
-  </key>
-  <key keycode="73" name="FK07">
-    <keysym keyval="65476">F7</keysym>
-  </key>
-  <key keycode="74" name="FK08">
-    <keysym keyval="65477">F8</keysym>
-  </key>
-  <key keycode="75" name="FK09">
-    <keysym keyval="65478">F9</keysym>
-  </key>
-  <key keycode="76" name="FK10">
-    <keysym keyval="65479">F10</keysym>
-  </key>
-  <key keycode="95" name="FK11">
-    <keysym keyval="65480">F11</keysym>
-  </key>
-  <key keycode="96" name="FK12">
-    <keysym keyval="65481">F12</keysym>
-  </key>
-  <key keycode="22" name="BKSP">
-    <keysym keyval="65288" icon="edit-clear-symbolic">backspace</keysym>
-  </key>
-  <key keycode="23" name="TAB">
-    <keysym keyval="65289">Tab</keysym>
-    <keysym keyval="65056">ISO_Left_Tab</keysym>
-  </key>
-  <key keycode="24" name="AD01">
+  <key name="AD01">
    <keysym keyval="113">q</keysym>
    <keysym keyval="81">Q</keysym>
    <keysym keyval="49">1</keysym>
    <keysym keyval="126">asciitilde</keysym>
  </key>
-  <key keycode="25" name="AD02">
+  <key name="AD02">
    <keysym keyval="119">w</keysym>
    <keysym keyval="87">W</keysym>
    <keysym keyval="50">2</keysym>
    <keysym keyval="96">quoteleft</keysym>
  </key>
-  <key keycode="26" name="AD03">
+  <key name="AD03">
    <keysym keyval="101">e</keysym>
    <keysym keyval="69">E</keysym>
    <keysym keyval="51">3</keysym>
    <keysym keyval="124">bar</keysym>
  </key>
-  <key keycode="27" name="AD04">
+  <key name="AD04">
    <keysym keyval="114">r</keysym>
    <keysym keyval="82">R</keysym>
    <keysym keyval="52">4</keysym>
    <keysym keyval="183">middledot</keysym>
  </key>
-  <key keycode="28" name="AD05">
+  <key name="AD05">
    <keysym keyval="116">t</keysym>
    <keysym keyval="84">T</keysym>
    <keysym keyval="53">5</keysym>
  </key>
-  <key keycode="29" name="AD06">
+  <key name="AD06">
    <keysym keyval="121">y</keysym>
    <keysym keyval="89">Y</keysym>
    <keysym keyval="54">6</keysym>
  </key>
-  <key keycode="30" name="AD07">
+  <key name="AD07">
    <keysym keyval="117">u</keysym>
    <keysym keyval="85">U</keysym>
    <keysym keyval="55">7</keysym>
  </key>
-  <key keycode="31" name="AD08">
+  <key name="AD08">
    <keysym keyval="105">i</keysym>
    <keysym keyval="73">I</keysym>
    <keysym keyval="56">8</keysym>
  </key>
-  <key keycode="32" name="AD09">
+  <key name="AD09">
    <keysym keyval="111">o</keysym>
    <keysym keyval="79">O</keysym>
    <keysym keyval="57">9</keysym>
  </key>
-  <key keycode="33" name="AD10">
+  <key name="AD10">
    <keysym keyval="112">p</keysym>
    <keysym keyval="80">P</keysym>
    <keysym keyval="48">0</keysym>
  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="91">bracketleft</keysym>
-    <keysym keyval="123">braceleft</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="93">bracketright</keysym>
-    <keysym keyval="125">braceright</keysym>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="0" name="ABC123">
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="ABC">show-letters</symbol>
-    <symbol label="ABC">show-letters</symbol>
-  </key>
-  <key keycode="38" name="AC01">
+  <key name="AC01">
    <keysym keyval="97">a</keysym>
    <keysym keyval="65">A</keysym>
    <keysym keyval="64">at</keysym>
    <keysym keyval="169">copyright</keysym>
  </key>
-  <key keycode="39" name="AC02">
+  <key name="AC02">
    <keysym keyval="115">s</keysym>
    <keysym keyval="83">S</keysym>
    <keysym keyval="35">numbersign</keysym>
    <keysym keyval="174">registeredtrademark</keysym>
  </key>
-  <key keycode="40" name="AC03">
+  <key name="AC03">
    <keysym keyval="100">d</keysym>
    <keysym keyval="68">D</keysym>
    <keysym keyval="36">dollar</keysym>
    <keysym keyval="163">poundsign</keysym>
  </key>
-  <key keycode="41" name="AC04">
+  <key name="AC04">
    <keysym keyval="102">f</keysym>
    <keysym keyval="70">F</keysym>
    <keysym keyval="37">percent</keysym>
    <text>€</text>
  </key>
-  <key keycode="42" name="AC05">
+  <key name="AC05">
    <keysym keyval="103">g</keysym>
    <keysym keyval="71">G</keysym>
    <keysym keyval="38">ampersand</keysym>
    <keysym keyval="165">yensign</keysym>
  </key>
-  <key keycode="43" name="AC06">
+  <key name="AC06">
    <keysym keyval="104">h</keysym>
    <keysym keyval="72">H</keysym>
    <keysym keyval="45">minus</keysym>
    <keysym keyval="94">asciicircum</keysym>
  </key>
-  <key keycode="44" name="AC07">
+  <key name="AC07">
    <keysym keyval="106">j</keysym>
    <keysym keyval="74">J</keysym>
    <keysym keyval="43">plus</keysym>
    <keysym keyval="176">degreesign</keysym>
  </key>
-  <key keycode="45" name="AC08">
+  <key name="AC08">
    <keysym keyval="107">k</keysym>
    <keysym keyval="75">K</keysym>
    <keysym keyval="40">parenleft</keysym>
    <keysym keyval="123">braceleft</keysym>
  </key>
-  <key keycode="46" name="AC09">
+  <key name="AC09">
    <keysym keyval="108">l</keysym>
    <keysym keyval="76">L</keysym>
    <keysym keyval="41">parenright</keysym>
    <keysym keyval="125">braceright</keysym>
  </key>
-  <key keycode="47" name="AC10">
-    <keysym keyval="59">semicolon</keysym>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="36" name="RTRN">
+  <key name="RTRN">
    <keysym keyval="65293" icon="key-enter">Return</keysym>
  </key>
-  <key keycode="50" name="LFSH">
+  <key name="LFSH">
    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
    <keysym keyval="65505" label="=/+">Shift_L</keysym>
    <keysym keyval="65505" label="123">Shift_L</keysym>
  </key>
-  <key keycode="52" name="AB01">
+  <key name="AB01">
    <keysym keyval="122">z</keysym>
    <keysym keyval="90">Z</keysym>
    <keysym keyval="44">comma</keysym>
    <keysym keyval="92">backslash</keysym>
  </key>
-  <key keycode="53" name="AB02">
+  <key name="AB02">
    <keysym keyval="120">x</keysym>
    <keysym keyval="88">X</keysym>
    <keysym keyval="34">quotedbl</keysym>
    <keysym keyval="47">slash</keysym>
  </key>
-  <key keycode="54" name="AB03">
+  <key name="AB03">
    <keysym keyval="99">c</keysym>
    <keysym keyval="67">C</keysym>
    <keysym keyval="39">quoteright</keysym>
    <keysym keyval="60">less</keysym>
  </key>
-  <key keycode="55" name="AB04">
+  <key name="AB04">
    <keysym keyval="118">v</keysym>
    <keysym keyval="86">V</keysym>
    <keysym keyval="58">colon</keysym>
    <keysym keyval="62">greater</keysym>
  </key>
-  <key keycode="56" name="AB05">
+  <key name="AB05">
    <keysym keyval="98">b</keysym>
    <keysym keyval="66">B</keysym>
    <keysym keyval="59">semicolon</keysym>
    <keysym keyval="61">equal</keysym>
  </key>
-  <key keycode="57" name="AB06">
+  <key name="AB06">
    <keysym keyval="110">n</keysym>
    <keysym keyval="78">N</keysym>
    <keysym keyval="33">exclam</keysym>
    <keysym keyval="91">bracketleft</keysym>
  </key>
-  <key keycode="58" name="AB07">
+  <key name="AB07">
    <keysym keyval="109">m</keysym>
    <keysym keyval="77">M</keysym>
    <keysym keyval="63">question</keysym>
    <keysym keyval="93">bracketright</keysym>
  </key>
-  <key keycode="59" name="AB08">
-    <keysym keyval="44">comma</keysym>
-    <keysym keyval="60">less</keysym>
-  </key>
-  <key keycode="60" name="AB09">
+  <key name="AB08">
    <keysym keyval="46">period</keysym>
  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="47">slash</keysym>
-    <keysym keyval="63">question</keysym>
+  <key name="ABC123">
+    <symbol label="123">show-numbers</symbol>
+    <symbol label="123">show-numbers</symbol>
+    <symbol label="ABC">show-letters</symbol>
+    <symbol label="ABC">show-letters</symbol>
  </key>
-  <key keycode="62" name="RTSH">
-    <keysym keyval="65506">Shift_R</keysym>
+  <key name="I150">
+    <symbol label="☺" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
  </key>
-  <key keycode="149" name="I149">
-    <symbol label="⌨" icon="input-keyboard-symbolic" tooltip="Change keyboard">cycle-keyboard</symbol>
-  </key>
-  <key keycode="150" name="I150">
-    <symbol label="☺" icon="preferences-system-symbolic" tooltip="Setup">preferences</symbol>
-  </key>
-  <key keycode="37" name="LCTL">
-    <keysym keyval="65507">Control_L</keysym>
-  </key>
-  <key keycode="64" name="LALT">
-    <keysym keyval="65513">Alt_L</keysym>
-    <keysym keyval="65511">Meta_L</keysym>
-  </key>
-  <key keycode="65" name="SPCE">
+  <key name="SPCE">
    <keysym keyval="32">space</keysym>
  </key>
-  <key keycode="113" name="LEFT">
-    <keysym keyval="65361">Left</keysym>
-  </key>
-  <key keycode="111" name="UP">
-    <keysym keyval="65362">Up</keysym>
-  </key>
-  <key keycode="116" name="DOWN">
-    <keysym keyval="65364">Down</keysym>
-  </key>
-  <key keycode="114" name="RGHT">
-    <keysym keyval="65363">Right</keysym>
+  <key name="BKSP">
+    <keysym keyval="65288" icon="edit-clear-symbolic">backspace</keysym>
  </key>
 </symbols>
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -34,5 +34,6 @@
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
   <file>icons/key-enter.svg</file>
   <file>icons/key-shift.svg</file>
+   <file>icons/keyboard-mode-symbolic.svg</file>
  </gresource>
 </gresources>
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@ -68,7 +68,7 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
    if (pixbuf != NULL)
        goto found;
    else {
-        g_warning ("can't get icon pixbuf for %s: %s", path, error->message);
+/*      g_warning ("can't get icon pixbuf for %s: %s", path, error->message);*/
        g_error_free (error);
        error = NULL;
    }
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -70,11 +70,11 @@ struct _EekKeyboardPrivate
    EekLayout *layout;
    EekModifierBehavior modifier_behavior;
    EekModifierType modifiers;
-    EekModifierType old_level;
+    unsigned int old_level;
    GList *pressed_keys;
    GList *locked_keys;
    GArray *outline_array;
-    GHashTable *keycodes;
+    GHashTable *names;

    /* modifiers dynamically assigned at run time */
    EekModifierType num_lock_mask;
@ -129,9 +129,9 @@ section_child_added_cb (EekContainer *container,
                        EekElement   *element,
                        EekKeyboard  *keyboard)
 {
-    guint keycode = eek_key_get_keycode (EEK_KEY(element));
-    g_hash_table_insert (keyboard->priv->keycodes,
-                         GUINT_TO_POINTER(keycode),
+    const gchar *name = eek_element_get_name(element);
+    g_hash_table_insert (keyboard->priv->names,
+                         (gpointer)name,
                         element);
 }

@ -140,9 +140,9 @@ section_child_removed_cb (EekContainer *container,
                          EekElement   *element,
                          EekKeyboard  *keyboard)
 {
-    guint keycode = eek_key_get_keycode (EEK_KEY(element));
-    g_hash_table_remove (keyboard->priv->keycodes,
-                         GUINT_TO_POINTER(keycode));
+    const gchar *name = eek_element_get_name(element);
+    g_hash_table_remove (keyboard->priv->names,
+                         name);
 }

 static EekSection *
@ -221,7 +221,7 @@ set_level_from_modifiers (EekKeyboard *self, EekKey *key)
    gint level = priv->old_level & 2;

    /* Handle non-emitting keys */
-    if (key && (eek_key_get_keycode(key) == 0)) {
+    if (key) {
        const gchar *name = eek_element_get_name(EEK_ELEMENT(key));
        if (g_strcmp0(name, "ABC123") == 0)
            level ^= 2;
@ -259,7 +259,7 @@ set_level_from_modifiers (EekKeyboard *self, EekKey *key)

    if (level == VIEW_NUMBERS || level == VIEW_SYMBOLS)
        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LOCK;
-    else if (level == VIEW_LETTERS_UPPER)
+    else
        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LATCH;

    priv->old_level = level;
@ -400,7 +400,7 @@ eek_keyboard_finalize (GObject *object)
    g_list_free_full (priv->locked_keys,
                      (GDestroyNotify) eek_modifier_key_free);

-    g_hash_table_destroy (priv->keycodes);
+    g_hash_table_destroy (priv->names);

    for (i = 0; i < priv->outline_array->len; i++) {
        EekOutline *outline = &g_array_index (priv->outline_array,
@ -528,7 +528,7 @@ eek_keyboard_init (EekKeyboard *self)
    self->priv = EEK_KEYBOARD_GET_PRIVATE(self);
    self->priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_NONE;
    self->priv->outline_array = g_array_new (FALSE, TRUE, sizeof (EekOutline));
-    self->priv->keycodes = g_hash_table_new (g_direct_hash, g_direct_equal);
+    self->priv->names = g_hash_table_new (g_str_hash, g_str_equal);
    eek_element_set_symbol_index (EEK_ELEMENT(self), 0, 0);
 }

@ -548,20 +548,20 @@ eek_keyboard_create_section (EekKeyboard *keyboard)
 }

 /**
- * eek_keyboard_find_key_by_keycode:
+ * eek_keyboard_find_key_by_name:
 * @keyboard: an #EekKeyboard
- * @keycode: a keycode
+ * @name: a key name
 *
- * Find an #EekKey whose keycode is @keycode.
- * Return value: (transfer none): #EekKey whose keycode is @keycode
+ * Find an #EekKey whose name is @name.
+ * Return value: (transfer none): #EekKey whose name is @name
 */
 EekKey *
-eek_keyboard_find_key_by_keycode (EekKeyboard *keyboard,
-                                  guint        keycode)
+eek_keyboard_find_key_by_name (EekKeyboard *keyboard,
+                               const gchar *name)
 {
    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
-    return g_hash_table_lookup (keyboard->priv->keycodes,
-                                GUINT_TO_POINTER(keycode));
+    return g_hash_table_lookup (keyboard->priv->names,
+                                name);
 }

 /**
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -69,8 +69,8 @@ struct _EekKeyboard
 /**
 * EekKeyboardClass:
 * @create_section: virtual function for creating a section
- * @find_key_by_keycode: virtual function for finding a key in the
- * keyboard by keycode
+ * @find_key_by_name: virtual function for finding a key in the
+ * keyboard by name
 * @key_pressed: class handler for #EekKeyboard::key-pressed signal
 * @key_released: class handler for #EekKeyboard::key-released signal
 * @key_locked: class handler for #EekKeyboard::key-locked signal
@ -89,8 +89,8 @@ struct _EekKeyboardClass
    /*< public >*/
    EekSection *(* create_section)      (EekKeyboard *self);

-    EekKey     *(* find_key_by_keycode) (EekKeyboard *self,
-                                         guint        keycode);
+    EekKey     *(* find_key_by_name)    (EekKeyboard *self,
+                                         const gchar *name);

    /*< private >*/
    /* obsolete members moved to EekElement */
@ -155,9 +155,9 @@ EekModifierType     eek_keyboard_get_modifiers
 EekSection         *eek_keyboard_create_section
                                     (EekKeyboard        *keyboard);

-EekKey             *eek_keyboard_find_key_by_keycode
+EekKey             *eek_keyboard_find_key_by_name
                                     (EekKeyboard        *keyboard,
-                                      guint               keycode);
+                                      const gchar        *name);

 guint               eek_keyboard_add_outline
                                     (EekKeyboard        *keyboard,
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@ -124,7 +124,8 @@ on_unlocked (EekKey     *key,

 static EekKey *
 eek_section_real_create_key (EekSection *self,
-                             guint       keycode,
+                             const gchar *name,
+                             gint        keycode,
                             gint        column_index,
                             gint        row_index)
 {
@ -142,6 +143,7 @@ eek_section_real_create_key (EekSection *self,
        row->num_columns = column_index + 1;

    key = g_object_new (EEK_TYPE_KEY,
+                        "name", name,
                        "keycode", keycode,
                        "column", column_index,
                        "row", row_index,
@ -463,6 +465,7 @@ eek_section_get_row (EekSection     *section,
 /**
 * eek_section_create_key:
 * @section: an #EekSection
+ * @name: a name
 * @keycode: a keycode
 * @column: the column index of the key
 * @row: the row index of the key
@ -473,12 +476,14 @@ eek_section_get_row (EekSection     *section,
 */
 EekKey *
 eek_section_create_key (EekSection *section,
-                        guint       keycode,
+                        const gchar *name,
+                        gint        keycode,
                        gint        column,
                        gint        row)
 {
    g_return_val_if_fail (EEK_IS_SECTION(section), NULL);
    return EEK_SECTION_GET_CLASS(section)->create_key (section,
+                                                       name,
                                                       keycode,
                                                       column,
                                                       row);
--- a/eek/eek-section.h
+++ b/eek/eek-section.h
@ -62,7 +62,8 @@ struct _EekSectionClass
                                     EekOrientation *orientation);

    EekKey *(* create_key)          (EekSection     *self,
-                                     guint           keycode,
+                                     const gchar    *name,
+                                     gint            keycode,
                                     gint            row,
                                     gint            column);

@ -99,7 +100,8 @@ void    eek_section_get_row              (EekSection     *section,
                                          EekOrientation *orientation);

 EekKey *eek_section_create_key           (EekSection     *section,
-                                          guint           keycode,
+                                          const gchar    *name,
+                                          gint            keycode,
                                          gint            column,
                                          gint            row);

--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -249,6 +249,7 @@ struct _GeometryParseData {
    gchar *name;
    EekOutline outline;
    gchar *oref;
+    gint keycode;

    GHashTable *key_oref_hash;
    GHashTable *oref_outline_hash;
@ -271,6 +272,7 @@ geometry_parse_data_new (EekKeyboard *keyboard)
                               g_str_equal,
                               g_free,
                               (GDestroyNotify)eek_outline_free);
+    data->keycode = 1;
    return data;
 }

@ -396,29 +398,23 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
    }

    if (g_strcmp0 (element_name, "key") == 0) {
-        guint keycode;

        attribute = get_attribute (attribute_names, attribute_values,
-                                   "keycode");
+                                   "name");
        if (attribute == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-                         "no \"keycode\" attribute for \"key\"");
+                         "no \"name\" attribute for \"key\"");
            return;
        }
-        keycode = strtoul (attribute, NULL, 10);

        data->key = eek_section_create_key (data->section,
-                                            keycode,
+                                            g_strdup (attribute),
+                                            data->keycode++,
                                            data->num_columns,
                                            data->num_rows - 1);

-        attribute = get_attribute (attribute_names, attribute_values,
-                                   "name");
-        if (attribute != NULL)
-            eek_element_set_name (EEK_ELEMENT(data->key), attribute);
-
        attribute = get_attribute (attribute_names, attribute_values,
                                   "oref");
        if (attribute == NULL) {
@ -622,28 +618,25 @@ symbols_start_element_callback (GMarkupParseContext *pcontext,
        return;

    if (g_strcmp0 (element_name, "key") == 0) {
-        guint keycode;

        attribute = get_attribute (attribute_names, attribute_values,
-                                   "keycode");
+                                   "name");
        if (attribute == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-                         "no \"keycode\" attribute for \"key\"");
+                         "no \"name\" attribute for \"key\"");
            return;
        }
-        keycode = strtoul (attribute, NULL, 10);

-        data->key = eek_keyboard_find_key_by_keycode (data->keyboard,
-                                                      keycode);
-        /*if (data->key == NULL) {
+        data->key = eek_keyboard_find_key_by_name (data->keyboard,
+                                                   attribute);
+        if (data->key == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_INVALID_CONTENT,
-                         "no such keycode %u", keycode);
-            return;
-        }*/
+                         "no such key %s", attribute);
+        }

        attribute = get_attribute (attribute_names, attribute_values,
                                   "groups");
Author	SHA1	Message	Date
David Boddie	901ca9ec76	Remove explicit keycodes in XML, auto-generate them instead This makes it easier to keep the geometry and symbols files in sync.	2019-07-14 00:16:32 +02:00
David Boddie	4d8d3a8109	Merge branch 'suppress-warnings' into 'master' Suppress warning message See merge request Librem5/squeekboard!70	2019-07-13 22:14:54 +00:00
David Boddie	a183cf8b63	Suppress warning message	2019-07-14 00:13:41 +02:00
David Boddie	f834edcf94	Merge branch 'fix-compiler-warnings' into 'master' Fix use of inappropriate type See merge request Librem5/squeekboard!69	2019-07-13 19:47:40 +00:00
David Boddie	17802a9408	Fix use of inappropriate type	2019-07-13 18:36:59 +02:00
David Boddie	ac1aad881c	Merge branch '49-inconsistent-behaviour-of-shift-key-s-pressed-state' into 'master' Resolve "Inconsistent behaviour of shift key's pressed state" Closes #49 See merge request Librem5/squeekboard!66	2019-07-13 16:35:07 +00:00
David Boddie	928110a92d	Merge branch 'add-missing-icon' into 'master' Add keyboard preferences icon See merge request Librem5/squeekboard!68	2019-07-12 21:09:49 +00:00
David Boddie	f6479fafe2	Add keyboard preferences icon	2019-07-12 23:07:01 +02:00
David Boddie	62b1c2ba84	Revert to latch behavior for letters	2019-07-12 19:54:21 +00:00