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
33 changed files with 591 additions and 3448 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -4,10 +4,6 @@ stages:
  - build

 before_script:
-  - apt-get -y update
-  - apt-get -y install wget gnupg2
-  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
  - apt-get -y update
  - apt-get -y build-dep .

--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@ -0,0 +1,20 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="sm.puri.OSK0">
+    <method name="SetVisible">
+      <arg name="visible" type="b" direction="in"/>
+      <doc:doc><doc:description>
+        Switch keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <method name="GetVisible">
+      <arg name="visible" type="b" direction="out"/>
+      <doc:doc><doc:description>
+        Get keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <property name="Visible" type="b" access="read">
+    </property>
+  </interface>
+</node>
--- a/data/icons/key-enter.svg
+++ b/data/icons/key-enter.svg
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
+             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
+             C 19,13 20,12 20,10 L 20,1 Z"
+          stroke="none" fill="black" />
+</svg>
--- a/data/icons/key-shift.svg
+++ b/data/icons/key-shift.svg
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
+          stroke="none" fill="black" />
+</svg>
--- 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
@ -1,123 +1,53 @@
 <?xml version="1.0"?>
 <geometry version="0.90">
-  <bounds x="0.000000" y="0.000000" width="426.0000" height="296.5853"/>
+  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
  <section angle="0">
-    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key keycode="24" name="AD01" oref="outline2">
-	<bounds x="65.56097" y="42.14634" width="37.46341" height="52.44877"/>
-      </key>
-      <key keycode="25" name="AD02" oref="outline2">
-	<bounds x="106.1463" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="26" name="AD03" oref="outline2">
-	<bounds x="145.1707" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="27" name="AD04" oref="outline2">
-	<bounds x="185.7560" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="28" name="AD05" oref="outline2">
-	<bounds x="226.3414" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="29" name="AD06" oref="outline2">
-	<bounds x="266.9268" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="30" name="AD07" oref="outline2">
-	<bounds x="307.5121" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="31" name="AD08" oref="outline2">
-	<bounds x="348.0975" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="32" name="AD09" oref="outline2">
-	<bounds x="388.6829" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="33" name="AD10" oref="outline2">
-	<bounds x="429.2682" y="42.14634" width="37.46341" height="37.46341"/>
-      </key>
+      <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">
-    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key keycode="38" name="AC01" oref="outline2">
-	<bounds x="76.48780" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="39" name="AC02" oref="outline2">
-	<bounds x="115.5121" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="40" name="AC03" oref="outline2">
-	<bounds x="156.0975" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="41" name="AC04" oref="outline2">
-	<bounds x="196.6829" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="42" name="AC05" oref="outline2">
-	<bounds x="237.2682" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="43" name="AC06" oref="outline2">
-	<bounds x="277.8536" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="44" name="AC07" oref="outline2">
-	<bounds x="318.4390" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="45" name="AC08" oref="outline2">
-	<bounds x="359.0243" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="46" name="AC09" oref="outline2">
-	<bounds x="399.6097" y="82.73170" width="37.46341" height="37.46341"/>
-      </key>
+      <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">
-    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key keycode="50" name="LFSH" oref="altline">
-	<bounds x="3.121951" y="121.7560" width="88.97561" height="37.46341"/>
-      </key>
-      <key keycode="52" name="AB01" oref="outline2">
-	<bounds x="95.21951" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="53" name="AB02" oref="outline2">
-	<bounds x="135.8048" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="54" name="AB03" oref="outline2">
-	<bounds x="176.3902" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="55" name="AB04" oref="outline2">
-	<bounds x="215.4146" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="56" name="AB05" oref="outline2">
-	<bounds x="256.0000" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="57" name="AB06" oref="outline2">
-	<bounds x="296.5853" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="58" name="AB07" oref="outline2">
-	<bounds x="337.1707" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="22" name="BKSP" oref="altline">
-	<bounds x="529.1707" y="1.560976" width="79.60975" height="37.46341"/>
-      </key>
+      <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">
-    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key keycode="37" name="LCTL" oref="altline">
-	<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
-      </key>
-      <key keycode="66" name="ALTGR" oref="altline">
-	<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
-      </key>
-      <key keycode="65" name="SPCE" oref="spaceline">
-	<bounds x="165.4634" y="162.3414" width="217.5853" height="37.46341"/>
-      </key>
-      <key keycode="60" name="AB09" oref="outline2">
-       <bounds x="418.3414" y="121.7560" width="37.46341" height="37.46341"/>
-      </key>
-      <key keycode="36" name="RTRN" oref="outline7">
-	<bounds x="519.8048" y="82.73170" width="88.97561" height="37.46341"/>
-      </key>
+      <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,304 +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="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="22" name="BKSP">
-    <keysym keyval="65288">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="66" name="ALTGR">
-    <keysym keyval="65027">ISO_Level3_Shift</keysym>
-  </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="95">underscore</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 name="RTRN">
+    <keysym keyval="65293" icon="key-enter">Return</keysym>
  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
+  <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="36" name="RTRN">
-    <keysym keyval="65293">Return</keysym>
-  </key>
-  <key keycode="50" name="LFSH">
-    <keysym keyval="65505">Shift_L</keysym>
-  </key>
-  <key keycode="52" name="AB01">
+  <key name="AB01">
    <keysym keyval="122">z</keysym>
    <keysym keyval="90">Z</keysym>
-    <keysym keyval="43">plus</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>
-    <keysym keyval="62">greater</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/meson.build
+++ b/data/meson.build
@ -1,57 +1,12 @@
+gnome = import('gnome')

-install_data(
-    'themes/default.css',
-    install_dir: pkgdatadir + '/themes',
+squeekboard_resources = gnome.compile_resources(
+   'squeekboard-resources',
+   'squeekboard.gresources.xml',
+
+   c_name: 'squeekboard',
 )

-install_data(
-    'keyboards/keyboards.xml',
-    install_dir: pkgdatadir + '/keyboards/',
-)
-
-install_data(
-    'keyboards/geometry/compact.xml',
-    install_dir: pkgdatadir + '/keyboards/geometry/',
-)
-
-symbols = [
-    'ar.xml',
-    'as-inscript.xml',
-    'be.xml',
-    'bn-inscript.xml',
-    'fa.xml',
-    'gu-inscript.xml',
-    'he.xml',
-    'hi-inscript.xml',
-    'ja-kana.xml',
-    'kk.xml',
-    'kn-inscript.xml',
-    'ks-inscript.xml',
-    'ks.xml',
-    'mai-inscript.xml',
-    'ml-inscript.xml',
-    'mr-inscript.xml',
-    'my.xml',
-    'or-inscript.xml',
-    'pa-inscript.xml',
-    'ru.xml',
-    'sd-inscript.xml',
-    'ta-inscript.xml',
-    'te-inscript.xml',
-    'th.xml',
-    'ua.xml',
-    'ug.xml',
-    'us.xml',
-    'zh-bopomofo.xml',
-]
-
-foreach symbol: symbols
-    install_data(
-        'keyboards/symbols/' + symbol,
-        install_dir: pkgdatadir + '/keyboards/symbols/',
-    )
-endforeach
-
 desktop_file = 'sm.puri.Squeekboard.desktop'

 i18n.merge_file('desktop',
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/sm/puri/squeekboard">
+   <file compressed="true">style.css</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/bn-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/fa.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/gu-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/he.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/hi-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ja-kana.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kk.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kn-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mai-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ml-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mr-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/my.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/or-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/pa-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ru.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/sd-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ta-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/te-inscript.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/th.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
+   <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/data/themes/default.css
+++ b/data/themes/default.css
--- a/debian/control
+++ b/debian/control
@ -11,7 +11,6 @@ Build-Depends:
 libcroco3-dev,
 libwayland-dev (>= 1.16),
 rustc,
- virtboard,
 wayland-protocols (>= 1.14)
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
--- a/debian/copyright
+++ b/debian/copyright
@ -3,7 +3,58 @@ Upstream-Name: evscript
 Source: https://source.puri.sm/david.boddie/evscript

 Files: *
-Copyright: 2019 Purism SPC
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+License: GPL-3+
+
+Files: eek/layersurface.c
+       src/wayland.c
+       src/key-emitter.c
+       meson.build
+       src/meson.build
+       po/meson.build
+Copyright: 2018-2019 Purism SPC
+License: GPL-3+
+
+Files: eekboard/keymap.c
+Copyright: 2000 Red Hat, Inc.
+           2019 Purism, SPC
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Files: protocols/wlr-layer-shell-unstable-v1.xml
+Copytight: Copyright © 2017 Drew DeVault
+License: X11
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice appear in all copies and fthat both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the copyright holders not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  The copyright holders make
+ no representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied warranty.
+ .
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 License: GPL-3+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -549,12 +549,12 @@ render_pressed_key (GtkWidget *widget,
    cairo_translate (cr, bounds.x, bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
    cairo_restore (cr);
-
+/*
    cairo_save (cr);
    cairo_translate (cr, large_bounds.x, large_bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
    cairo_restore (cr);
-
+*/
    gdk_window_end_draw_frame (window, context);

    cairo_region_destroy (region);
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@ -57,10 +57,23 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
                                        gint size)
 {
    GdkPixbuf *pixbuf;
-    GError *error;
+    GError *error = NULL;
    cairo_surface_t *surface;

-    error = NULL;
+    gchar *path = g_strconcat("/sm/puri/squeekboard/icons/", icon_name, ".svg", NULL);
+
+    pixbuf = gdk_pixbuf_new_from_resource_at_scale (path, size, size,
+                                                    TRUE, &error);
+
+    if (pixbuf != NULL)
+        goto found;
+    else {
+/*      g_warning ("can't get icon pixbuf for %s: %s", path, error->message);*/
+        g_error_free (error);
+        error = NULL;
+    }
+    g_free(path);
+
    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                       icon_name,
                                       size,
@ -74,6 +87,7 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
        return NULL;
    }

+found:
    surface = pixbuf_to_cairo_surface (pixbuf);
    g_object_unref (pixbuf);
    return surface;
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -53,9 +53,14 @@ enum {
    LAST_SIGNAL
 };

-static guint signals[LAST_SIGNAL] = { 0, };
+enum {
+    VIEW_LETTERS_LOWER,
+    VIEW_LETTERS_UPPER,
+    VIEW_NUMBERS,
+    VIEW_SYMBOLS
+};

-G_DEFINE_TYPE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
+static guint signals[LAST_SIGNAL] = { 0, };

 #define EEK_KEYBOARD_GET_PRIVATE(obj)                                  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYBOARD, EekKeyboardPrivate))
@ -65,16 +70,19 @@ struct _EekKeyboardPrivate
    EekLayout *layout;
    EekModifierBehavior modifier_behavior;
    EekModifierType modifiers;
+    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;
    EekModifierType alt_gr_mask;
 };

+G_DEFINE_TYPE_WITH_PRIVATE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
+
 G_DEFINE_BOXED_TYPE(EekModifierKey, eek_modifier_key,
                    eek_modifier_key_copy, eek_modifier_key_free);

@ -121,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);
 }

@ -132,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 *
@ -203,15 +211,58 @@ eek_keyboard_get_property (GObject    *object,
 }

 static void
-set_level_from_modifiers (EekKeyboard *self)
+set_level_from_modifiers (EekKeyboard *self, EekKey *key)
 {
    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    gint level = 0;

-    if (priv->modifiers & priv->alt_gr_mask)
-        level |= 2;
-    if (priv->modifiers & EEK_SHIFT_MASK)
-        level |= 1;
+    /* The levels are: 0 Letters, 1 Upper case letters, 2 Numbers, 3 Symbols */
+
+    /* Use the numbers/letters bit from the old level */
+    gint level = priv->old_level & 2;
+
+    /* Handle non-emitting keys */
+    if (key) {
+        const gchar *name = eek_element_get_name(EEK_ELEMENT(key));
+        if (g_strcmp0(name, "ABC123") == 0)
+            level ^= 2;
+    }
+
+    level |= ((priv->modifiers & EEK_SHIFT_MASK) ? 1 : 0);
+
+    switch (priv->old_level) {
+    case VIEW_LETTERS_UPPER:
+    {
+        /* Redirect upper case letters to numbers instead of symbols, clearing
+           the shift modifier to keep the modifiers in sync with the level */
+        if (level == VIEW_SYMBOLS) {
+            level = VIEW_NUMBERS;
+            priv->modifiers &= ~EEK_SHIFT_MASK;
+        }
+        break;
+    }
+    case VIEW_SYMBOLS:
+    {
+        /* Redirect symbols to lower case letters instead of upper case,
+           clearing the shift modifier to keep the modifiers in sync with the
+           level */
+        if (level == VIEW_LETTERS_UPPER) {
+            level = VIEW_LETTERS_LOWER;
+            priv->modifiers &= ~EEK_SHIFT_MASK;
+        }
+        break;
+    }
+    case VIEW_LETTERS_LOWER:    /* Direct transitions between views */
+    case VIEW_NUMBERS:
+    default:
+        break;
+    }
+
+    if (level == VIEW_NUMBERS || level == VIEW_SYMBOLS)
+        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LOCK;
+    else
+        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LATCH;
+
+    priv->old_level = level;
    eek_element_set_level (EEK_ELEMENT(self), level);
 }

@ -267,7 +318,7 @@ void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestam
    EekModifierType modifier = eek_symbol_get_modifier_mask (symbol);
    if (priv->modifier_behavior == EEK_MODIFIER_BEHAVIOR_NONE) {
        set_modifiers_with_key (keyboard, key, priv->modifiers | modifier);
-        set_level_from_modifiers (keyboard);
+        set_level_from_modifiers (keyboard, key);
    }

    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event
@ -316,7 +367,7 @@ void eek_keyboard_release_key( EekKeyboard *keyboard,
                                    (priv->modifiers ^ modifier) & modifier);
        break;
    }
-    set_level_from_modifiers (keyboard);
+    set_level_from_modifiers (keyboard, key);

    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event

@ -349,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,
@ -390,9 +441,6 @@ eek_keyboard_class_init (EekKeyboardClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

-    g_type_class_add_private (gobject_class,
-                              sizeof (EekKeyboardPrivate));
-
    klass->create_section = eek_keyboard_real_create_section;

    /* signals */
@ -480,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);
 }

@ -500,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);
 }

 /**
@ -585,7 +633,7 @@ eek_keyboard_set_modifiers (EekKeyboard    *keyboard,
 {
    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
    keyboard->priv->modifiers = modifiers;
-    set_level_from_modifiers (keyboard);
+    set_level_from_modifiers (keyboard, NULL);
 }

 /**
--- 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-renderer.c
+++ b/eek/eek-renderer.c
@ -162,9 +162,14 @@ create_keyboard_surface (EekRenderer *renderer)
                                       &background);

    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
-    keyboard_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                                   ceil(bounds.width * priv->scale),
-                                                   ceil(bounds.height * priv->scale));
+
+    /* Create a surface that encompasses the dimensions of the keyboard as well
+       as the margin around the edge. */
+    keyboard_surface = cairo_image_surface_create (
+        CAIRO_FORMAT_ARGB32,
+        ceil(((bounds.x * 2) + bounds.width) * priv->scale),
+        ceil(((bounds.y * 2) + bounds.height) * priv->scale));
+
    data.cr = cairo_create (keyboard_surface);
    data.renderer = renderer;

@ -459,7 +464,8 @@ render_key (EekRenderer *self,
    if (!outline_surface) {
        cairo_t *cr;

-        // Outline will be drawn on the outside of the button, so the surface needs to be bigger than the button
+        // Outline will be drawn on the outside of the button, so the
+        // surface needs to be bigger than the button
        outline_surface =
            cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
                                        (int)ceil(bounds.width) + 10,
@ -485,44 +491,38 @@ render_key (EekRenderer *self,
    cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
    cairo_paint (cr);

+    eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
    /* render icon (if any) */
    symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
    if (!symbol)
        return;

+ #define SCALE 0.4
    if (eek_symbol_get_icon_name (symbol)) {
+
        cairo_surface_t *icon_surface =
            eek_renderer_get_icon_surface (self,
                                           eek_symbol_get_icon_name (symbol),
-                                           MIN(bounds.width, bounds.height) * 0.7);
+                                           MIN(bounds.width, bounds.height));
        if (icon_surface) {
            gint width = cairo_image_surface_get_width (icon_surface);
            gint height = cairo_image_surface_get_height (icon_surface);
-            gdouble scale;
-
-            if (width < bounds.width && height < bounds.height)
-                scale = 1;
-            else {
-                if (height * bounds.width / width <= bounds.height)
-                    scale = bounds.width / width;
-                else if (width * bounds.height / height <= bounds.width)
-                    scale = bounds.height / height;
-                else {
-                    if (width * bounds.height < height * bounds.width)
-                        scale = width / bounds.width;
-                    else
-                        scale = height / bounds.height;
-                }
-            }

            cairo_save (cr);
            cairo_translate (cr,
-                             (bounds.width - width * scale) / 2,
-                             (bounds.height - height * scale) / 2);
+                             (bounds.width - width * SCALE) / 2,
+                             (bounds.height - height * SCALE) / 2);
            cairo_rectangle (cr, 0, 0, width, height);
+            cairo_scale (cr, SCALE, SCALE);
            cairo_clip (cr);
-            cairo_set_source_surface (cr, icon_surface, 0.0, 0.0);
-            cairo_paint (cr);
+            /* Draw the shape of the icon using the foreground color */
+            cairo_set_source_rgba (cr, foreground.red,
+                                       foreground.green,
+                                       foreground.blue,
+                                       foreground.alpha);
+            cairo_mask_surface (cr, icon_surface, 0.0, 0.0);
+            cairo_fill (cr);
+
            cairo_restore (cr);
            return;
        }
@ -539,7 +539,6 @@ render_key (EekRenderer *self,
         (bounds.width - extents.width / PANGO_SCALE) / 2,
         (bounds.height - extents.height / PANGO_SCALE) / 2);

-    eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
    cairo_set_source_rgba (cr,
                           foreground.red,
                           foreground.green,
--- 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-theme-node.c
+++ b/eek/eek-theme-node.c
@ -89,11 +89,6 @@ static void eek_theme_node_finalize           (GObject                 *object);

 static const EekColor BLACK_COLOR = { 0, 0, 0, 0xff };
 static const EekColor TRANSPARENT_COLOR = { 0, 0, 0, 0 };
-#if 0  // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-const-variable =====
-static const EekColor DEFAULT_SUCCESS_COLOR = { 0x4e, 0x9a, 0x06, 0xff };
-static const EekColor DEFAULT_WARNING_COLOR = { 0xf5, 0x79, 0x3e, 0xff };
-static const EekColor DEFAULT_ERROR_COLOR = { 0xcc, 0x00, 0x00, 0xff };
-#endif // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-const-variable =====

 static void
 eek_theme_node_init (EekThemeNode *self)
--- a/eek/eek-theme.c
+++ b/eek/eek-theme.c
@ -43,6 +43,7 @@
 * Copyright (C) 2003-2004 Dodji Seketeli.  All Rights Reserved.
 */

+#define G_LOG_DOMAIN "eek-theme"

 #include <stdlib.h>
 #include <string.h>
@ -166,103 +167,65 @@ eek_theme_class_init (EekThemeClass *klass)

 }

-/* This is a workaround for a bug in libcroco < 0.6.2 where
- * function starting with 'r' (and 'u') are misparsed. We work
- * around this by exploiting the fact that libcroco is incomformant
- * with the CSS-spec and case sensitive and pre-convert all
- * occurrences of rgba to RGBA. Then we make our own parsing
- * code check for RGBA as well.
- */
-#if LIBCROCO_VERSION_NUMBER < 602
-static gboolean
-is_identifier_character (char c)
-{
-  /* Actual CSS rules allow for unicode > 0x00a1 and escaped
-   * characters, but we'll assume we won't do that in our stylesheets
-   * or at least not next to the string 'rgba'.
-   */
-  return g_ascii_isalnum(c) || c == '-' || c == '_';
-}
-
-static void
-convert_rgba_RGBA (char *buf)
-{
-  char *p;
-
-  p = strstr (buf, "rgba");
-  while (p)
-    {
-      /* Check if this looks like a complete token; this is to
-       * avoiding mangling, say, a selector '.rgba-entry' */
-      if (!((p > buf && is_identifier_character (*(p - 1))) ||
-            (is_identifier_character (*(p + 4)))))
-        memcpy(p, "RGBA", 4);
-      p += 4;
-      p = strstr (p, "rgba");
-    }
-}
-
-static CRStyleSheet *
-parse_stylesheet (const char  *filename,
-                  GError     **error)
-{
-  enum CRStatus status;
-  char *contents;
-  gsize length;
-  CRStyleSheet *stylesheet = NULL;
-
-  if (filename == NULL)
-    return NULL;
-
-  if (!g_file_get_contents (filename, &contents, &length, error))
-    return NULL;
-
-  convert_rgba_RGBA (contents);
-
-  status = cr_om_parser_simply_parse_buf ((const guchar *) contents,
-                                          length,
-                                          CR_UTF_8,
-                                          &stylesheet);
-  g_free (contents);
-
-  if (status != CR_OK)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Error parsing stylesheet '%s'; errcode:%d", filename, status);
-      return NULL;
-    }
-
-  return stylesheet;
-}
-
-CRDeclaration *
-_eek_theme_parse_declaration_list (const char *str)
-{
-  char *copy = g_strdup (str);
-  CRDeclaration *result;
-
-  convert_rgba_RGBA (copy);
-
-  result = cr_declaration_parse_list_from_buf ((const guchar *)copy,
-                                               CR_UTF_8);
-  g_free (copy);
-
-  return result;
-}
-#else /* LIBCROCO_VERSION_NUMBER >= 602 */
 static CRStyleSheet *
 parse_stylesheet (const char  *filename,
                  GError     **error)
 {
  enum CRStatus status;
  CRStyleSheet *stylesheet;
+  g_autoptr (GFileInputStream) stream = NULL;
+  g_autoptr (GFileInfo) info = NULL;
+  g_autoptr (GFile) file = NULL;
+  g_autofree guchar* contents = NULL;
+  goffset size;
+  gsize out = 0;
+  GError *err = NULL;

  if (filename == NULL)
    return NULL;

-  status = cr_om_parser_simply_parse_file ((const guchar *) filename,
-                                           CR_UTF_8,
-                                           &stylesheet);
+  g_debug ("Parsing %s", filename);
+  if (g_strcmp0 (filename, "resource://") > 0) {
+      file = g_file_new_for_uri (filename);
+      stream = g_file_read (file, NULL, &err);
+      if (!stream) {
+          g_warning ("Failed to open %s: %s", filename, err->message);
+          g_clear_error (&err);
+          return NULL;
+      }
+
+      info = g_file_input_stream_query_info (stream,
+                                             G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                             NULL,
+                                             &err);
+
+      if (!info) {
+          g_warning ("Failed to stat %s: %s", filename, err->message);
+          g_clear_error (&err);
+          return NULL;
+      }
+
+      size = g_file_info_get_size (info);
+      contents = g_malloc0 (size);
+      if (!g_input_stream_read_all (G_INPUT_STREAM (stream),
+                                    contents,
+                                    size,
+                                    &out,
+                                    NULL,
+                                    &err)) {
+          g_warning ("Failed to read %s: %s", filename, err->message);
+          g_clear_error (&err);
+          return NULL;
+      }
+      status = cr_om_parser_simply_parse_buf (contents,
+                                              size,
+                                              CR_UTF_8,
+                                              &stylesheet);
+  } else {
+      status = cr_om_parser_simply_parse_file ((const guchar *) filename,
+                                               CR_UTF_8,
+                                               &stylesheet);
+  }

  if (status != CR_OK)
    {
@ -280,7 +243,6 @@ _eek_theme_parse_declaration_list (const char *str)
  return cr_declaration_parse_list_from_buf ((const guchar *)str,
                                             CR_UTF_8);
 }
-#endif /* LIBCROCO_VERSION_NUMBER < 602 */

 /* Just g_warning for now until we have something nicer to do */
 static CRStyleSheet *
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -25,6 +25,7 @@
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */

+#include <gio/gio.h> /* GResource */
 #include <stdlib.h>
 #include <string.h>

@ -35,6 +36,8 @@
 #include "eek-keysym.h"
 #include "eek-text.h"

+#include "squeekboard-resources.h"
+
 enum {
    PROP_0,
    PROP_ID,
@ -246,6 +249,7 @@ struct _GeometryParseData {
    gchar *name;
    EekOutline outline;
    gchar *oref;
+    gint keycode;

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

@ -359,8 +364,6 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,

        if (g_strcmp0 (data->element_stack->data, "geometry") == 0)
            eek_element_set_bounds (EEK_ELEMENT(data->keyboard), &bounds);
-        else if (g_strcmp0 (data->element_stack->data, "section") == 0)
-            eek_element_set_bounds (EEK_ELEMENT(data->section), &bounds);
        goto out;
    }

@ -395,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) {
@ -621,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");
@ -1058,10 +1052,10 @@ initable_init (GInitable    *initable,
    gchar *path;
    EekXmlKeyboardDesc *desc;

-    priv->keyboards_dir = (gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR");
+    priv->keyboards_dir = g_strdup ((gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR"));
+
    if (priv->keyboards_dir == NULL)
-        priv->keyboards_dir = KEYBOARDSDIR;
-    priv->keyboards_dir = g_strdup (priv->keyboards_dir);
+        priv->keyboards_dir = g_strdup ("resource:///sm/puri/squeekboard/keyboards/");

    path = g_build_filename (priv->keyboards_dir, "keyboards.xml", NULL);
    keyboards = parse_keyboards (path, error);
@ -1112,7 +1106,7 @@ eek_xml_list_keyboards (void)

    keyboards_dir = g_getenv ("EEKBOARD_KEYBOARDSDIR");
    if (keyboards_dir == NULL)
-        keyboards_dir = KEYBOARDSDIR;
+        keyboards_dir = g_strdup ("resource:///sm/puri/squeekboard/keyboards/");
    path = g_build_filename (keyboards_dir, "keyboards.xml", NULL);
    keyboards = parse_keyboards (path, NULL);
    g_free (path);
@ -1181,7 +1175,9 @@ parse_geometry (const gchar *path, EekKeyboard *keyboard, GError **error)
    GFileInputStream *input;
    gboolean retval;

-    file = g_file_new_for_path (path);
+    file = g_str_has_prefix (path, "resource://")
+         ? g_file_new_for_uri  (path)
+         : g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1307,7 +1303,9 @@ parse_symbols (const gchar *path, EekKeyboard *keyboard, GError **error)
    GFileInputStream *input;
    gboolean retval;

-    file = g_file_new_for_path (path);
+    file = g_str_has_prefix (path, "resource://")
+         ? g_file_new_for_uri  (path)
+         : g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1340,7 +1338,9 @@ parse_prerequisites (const gchar *path, GError **error)
    GList *prerequisites;
    gboolean retval;

-    file = g_file_new_for_path (path);
+    file = g_str_has_prefix (path, "resource://")
+         ? g_file_new_for_uri  (path)
+         : g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1375,7 +1375,9 @@ parse_keyboards (const gchar *path, GError **error)
    GList *keyboards;
    gboolean retval;

-    file = g_file_new_for_path (path);
+    file = g_str_has_prefix (path, "resource://")
+         ? g_file_new_for_uri  (path)
+         : g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -82,11 +82,9 @@ struct _EekboardContextServicePrivate {
    GSettings *settings;
 };

-G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);

-#if 0  // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-variable =====
-static Display *display = NULL;
-#endif // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-variable =====
+/*static Display *display = NULL; */

 static EekKeyboard *
 eekboard_context_service_real_create_keyboard (EekboardContextService *self,
@ -152,13 +150,14 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
    rules.layout = strdup(keyboard_type);
    struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &rules,
        XKB_KEYMAP_COMPILE_NO_FLAGS);
+    xkb_context_unref(context);
    if (!keymap) {
        g_error("Bad keymap");
    }
    keyboard->keymap = keymap;
    char *keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
    keyboard->keymap_len = strlen(keymap_str) + 1;
-    char *path = strdup("/eek_keymap-XXXXXX");
+    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
    getrandom(r, 6, GRND_NONBLOCK);
    for (uint i = 0; i < 6; i++) {
@ -286,6 +285,7 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
        }
    }
    g_variant_iter_free(iter);
+    g_variant_unref(inputs);
 }

 static void
@ -358,9 +358,6 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

-    g_type_class_add_private (gobject_class,
-                              sizeof (EekboardContextServicePrivate));
-
    klass->create_keyboard = eekboard_context_service_real_create_keyboard;
    klass->show_keyboard = eekboard_context_service_real_show_keyboard;
    klass->hide_keyboard = eekboard_context_service_real_hide_keyboard;
@ -485,55 +482,6 @@ eekboard_context_service_init (EekboardContextService *self)
    }
 }

-#if 0  // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-function =====
-static gboolean on_repeat_timeout (EekboardContextService *context);
-
-static gboolean
-on_repeat_timeout (EekboardContextService *context)
-{
-    guint delay = 500; // ms
-
-    // hardcoding; needs to connect to yet another settings path because
-    // org.gnome.desktop.input-sources doesn't control repeating
-    //g_settings_get (context->priv->settings, "repeat-interval", "u", &delay);
-
-    context->priv->repeat_timeout_id =
-        g_timeout_add (delay,
-                       (GSourceFunc)on_repeat_timeout,
-                       context);
-
-    return FALSE;
-}
-#endif // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-function =====
-
-#if 0  // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-function =====
-static gboolean
-on_repeat_timeout_init (EekboardContextService *context)
-{
-    /* FIXME: clear modifiers for further key repeat; better not
-       depend on modifier behavior is LATCH */
-    eek_keyboard_set_modifiers (context->priv->keyboard, 0);
-
-    /* reschedule repeat timeout only when "repeat" option is set */
-    /* TODO: org.gnome.desktop.input-sources doesn't have repeat info.
-     * In addition, repeat is only useful when the keyboard is not in text
-     * input mode */
-    /*
-    if (g_settings_get_boolean (context->priv->settings, "repeat")) {
-        guint delay;
-
-        g_settings_get (context->priv->settings, "repeat-interval", "u", &delay);
-        context->priv->repeat_timeout_id =
-            g_timeout_add (delay,
-                           (GSourceFunc)on_repeat_timeout,
-                           context);
-    } else */
-        context->priv->repeat_timeout_id = 0;
-
-    return FALSE;
-}
-#endif // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-function =====
-
 /**
 * eekboard_context_service_enable:
 * @context: an #EekboardContextService
--- a/eekboard/key-emitter.c
+++ b/eekboard/key-emitter.c
@ -78,15 +78,13 @@ replace_keycode (SeatEmitter *emitter,
                 guint   keycode,
                 guint  *keysym)
 {
-#if 0  // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-variable =====
-    GdkDisplay *display = gdk_display_get_default ();
-    //Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+/*  GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
    guint old_keysym;
    int keysyms_per_keycode;
-#endif // ===== REMOVAL NOTICE ==== expires by: 2019-08-20 -Wunused-variable =====
-
-    return TRUE; // FIXME: no xkb allocated at the moment, pretending all is fine
-
+    KeySym *syms;
+*/
+return TRUE; // FIXME: no xkb allocated at the moment, pretending all is fine
    g_return_val_if_fail (emitter->xkb->min_key_code <= keycode &&
                          keycode <= emitter->xkb->max_key_code,
                          FALSE);
--- a/src/client-main.c
+++ b/src/client-main.c
@ -1,320 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include <stdlib.h>
-#ifdef HAVE_ATSPI
-#include <dbus/dbus.h>
-#include <atspi/atspi.h>
-#endif  /* HAVE_ATSPI */
-#ifdef HAVE_IBUS
-#include <ibus.h>
-#endif  /* HAVE_IBUS */
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "eekboard/eekboard-client.h"
-#include "client.h"
-
-static gboolean opt_system = FALSE;
-static gboolean opt_session = FALSE;
-static gchar *opt_address = NULL;
-
-static gboolean opt_focus = FALSE;
-#ifdef HAVE_ATSPI
-static gboolean opt_keystroke = FALSE;
-#endif  /* HAVE_ATSPI */
-
-static gchar *opt_keyboards = NULL;
-
-static gboolean opt_fullscreen = FALSE;
-
-static const GOptionEntry options[] = {
-    {"system", 'y', 0, G_OPTION_ARG_NONE, &opt_system,
-     N_("Connect to the system bus")},
-    {"session", 'e', 0, G_OPTION_ARG_NONE, &opt_session,
-     N_("Connect to the session bus")},
-    {"address", 'a', 0, G_OPTION_ARG_STRING, &opt_address,
-     N_("Connect to the given D-Bus address")},
-#if ENABLE_FOCUS_LISTENER
-    {"listen-focus", 'f', 0, G_OPTION_ARG_NONE, &opt_focus,
-     N_("Listen focus change events")},
-#endif  /* ENABLE_FOCUS_LISTENER */
-#ifdef HAVE_ATSPI
-    {"listen-keystroke", 's', 0, G_OPTION_ARG_NONE, &opt_keystroke,
-     N_("Listen keystroke events with AT-SPI")},
-#endif  /* HAVE_ATSPI */
-    {"keyboards", 'k', 0, G_OPTION_ARG_STRING, &opt_keyboards,
-     N_("Specify keyboards (comma separated)")},
-    {"fullscreen", 'F', 0, G_OPTION_ARG_NONE, &opt_fullscreen,
-     N_("Create window in fullscreen mode")},
-    {NULL}
-};
-
-static void
-on_context_destroyed (EekboardContext *context,
-                      gpointer         user_data)
-{
-    gtk_main_quit ();
-}
-
-static void
-on_destroyed (EekboardClient *eekboard,
-              gpointer          user_data)
-{
-    gtk_main_quit ();
-}
-
-enum FocusListenerType {
-    FOCUS_NONE,
-    FOCUS_ATSPI,
-    FOCUS_IBUS
-};
-
-static gboolean
-set_keyboards (SeatEmitter              *client,
-               const gchar * const *keyboards)
-{
-    if (g_strv_length ((gchar **)keyboards) == 0) {
-        if (!client_enable_xkl (client)) {
-            g_printerr ("Can't register xklavier event listeners\n");
-            return FALSE;
-        }
-    } else {
-        if (!client_set_keyboards (client, keyboards)) {
-            gchar *str = g_strjoinv (", ", (gchar **)keyboards);
-            g_printerr ("Can't set keyboards \"%s\"\n", str);
-            g_free (str);
-            return FALSE;
-        }
-    }
-    return TRUE;
-}
-
-int
-main (int argc, char **argv)
-{
-    SeatEmitter *client = NULL;
-    EekboardClient *eekboard;
-    EekboardContext *context;
-    GBusType bus_type;
-    GDBusConnection *connection;
-    GError *error;
-    GOptionContext *option_context;
-    gint focus;
-    GSettings *settings = NULL;
-    gchar **keyboards = NULL;
-    gint retval = 0;
-
-    if (!gtk_init_check (&argc, &argv)) {
-        g_printerr ("Can't init GTK\n");
-        exit (1);
-    }
-
-    eek_init ();
-
-    option_context = g_option_context_new ("eekboard-desktop-client");
-    g_option_context_add_main_entries (option_context, options, NULL);
-    g_option_context_parse (option_context, &argc, &argv, NULL);
-    g_option_context_free (option_context);
-
-    if (opt_system)
-        bus_type = G_BUS_TYPE_SYSTEM;
-    else if (opt_address)
-        bus_type = G_BUS_TYPE_NONE;
-    else
-        bus_type = G_BUS_TYPE_SESSION;
-
-    switch (bus_type) {
-    case G_BUS_TYPE_SYSTEM:
-        error = NULL;
-        connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-        if (connection == NULL) {
-            g_printerr ("Can't connect to the system bus: %s\n",
-                        error->message);
-            g_error_free (error);
-            exit (1);
-        }
-        break;
-    case G_BUS_TYPE_SESSION:
-        error = NULL;
-        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-        if (connection == NULL) {
-            g_printerr ("Can't connect to the session bus: %s\n",
-                        error->message);
-            g_error_free (error);
-            exit (1);
-        }
-        break;
-    case G_BUS_TYPE_NONE:
-        error = NULL;
-        connection = g_dbus_connection_new_for_address_sync (opt_address,
-                                                             0,
-                                                             NULL,
-                                                             NULL,
-                                                             &error);
-        if (connection == NULL) {
-            g_printerr ("Can't connect to the bus at %s: %s\n",
-                        opt_address,
-                        error->message);
-            g_error_free (error);
-            exit (1);
-        }
-        break;
-    default:
-        g_assert_not_reached ();
-        break;
-    }
-
-    client = client_new (connection);
-    g_object_unref (connection);
-
-    if (client == NULL) {
-        g_printerr ("Can't create a client\n");
-        exit (1);
-    }
-
-    settings = g_settings_new ("org.fedorahosted.eekboard");
-    focus = FOCUS_NONE;
-    if (opt_focus) {
-        gchar *focus_listener = g_settings_get_string (settings,
-                                                       "focus-listener");
-        const struct {
-            const gchar *name;
-            enum FocusListenerType type;
-        } focus_listeners[] = {
-#ifdef HAVE_ATSPI
-            { "atspi", FOCUS_ATSPI },
-#endif
-#ifdef HAVE_IBUS
-            { "ibus", FOCUS_IBUS },
-#endif
-            { NULL }
-        };
-        gint i;
-
-        focus = FOCUS_NONE;
-        for (i = 0; focus_listeners[i].name; i++) {
-            if (g_strcmp0 (focus_listener, focus_listeners[i].name) == 0)
-                focus = focus_listeners[i].type;
-        }
-        if (focus == FOCUS_NONE) {
-            g_printerr ("Unknown focus listener \"%s\".  "
-                        "Try \"atspi\" or \"ibus\"\n", focus_listener);
-            retval = 1;
-            goto out;
-        }
-    }
-        
-#ifdef HAVE_ATSPI
-    if (focus == FOCUS_ATSPI || opt_keystroke) {
-        GSettings *desktop_settings =
-            g_settings_new ("org.gnome.desktop.interface");
-        gboolean accessibility_enabled =
-            g_settings_get_boolean (desktop_settings, "toolkit-accessibility");
-        g_object_unref (desktop_settings);
-
-        if (accessibility_enabled) {
-            if (atspi_init () != 0) {
-                g_printerr ("Can't init AT-SPI 2\n");
-                retval = 1;
-                goto out;
-            }
-
-            if (focus == FOCUS_ATSPI &&
-                !client_enable_atspi_focus (client)) {
-                g_printerr ("Can't register AT-SPI focus change event listeners\n");
-                retval = 1;
-                goto out;
-            }
-
-            if (opt_keystroke &&
-                !client_enable_atspi_keystroke (client)) {
-                g_printerr ("Can't register AT-SPI keystroke event listeners\n");
-                retval = 1;
-                goto out;
-            }
-        } else {
-            g_printerr ("Desktop accessibility support is disabled\n");
-            retval = 1;
-            goto out;
-        }
-    }
-#endif  /* HAVE_ATSPI */
-
-#ifdef HAVE_IBUS
-    if (focus == FOCUS_IBUS) {
-        ibus_init ();
-
-        if (!client_enable_ibus_focus (client)) {
-            g_printerr ("Can't register IBus focus change event listeners\n");
-            retval = 1;
-            goto out;
-        }
-    }
-#endif  /* HAVE_IBUS */
-
-//#ifdef HAVE_XTEST
-    if (!client_enable_xtest (client)) {
-        g_printerr ("Can't init xtest\n");
-        g_object_unref (client);
-        exit (1);
-    }
-//#endif  /* HAVE_XTEST */
-
-    if (!opt_focus) {
-        g_object_get (client, "context", &context, NULL);
-        g_signal_connect (context, "destroyed",
-                          G_CALLBACK(on_context_destroyed), NULL);
-        g_object_unref (context);
-    }
-
-    if (opt_fullscreen ||
-        g_settings_get_boolean (settings, "start-fullscreen")) {
-        g_object_get (client, "context", &context, NULL);
-        eekboard_context_set_fullscreen (context, TRUE, NULL);
-        g_object_unref (context);
-    }
-
-    g_object_get (client, "eekboard", &eekboard, NULL);
-    g_signal_connect (eekboard, "destroyed",
-                      G_CALLBACK(on_destroyed), NULL);
-    g_object_unref (eekboard);
-    
-    if (opt_keyboards != NULL) {
-        keyboards = g_strsplit (opt_keyboards, ",", -1);
-
-        if (!set_keyboards (client, (const gchar * const *)keyboards)) {
-            g_strfreev (keyboards);
-            retval = 1;
-            goto out;
-        }
-        g_strfreev (keyboards);
-    }
-
-    gtk_main ();
-
- out:
-    if (client)
-        g_object_unref (client);
-    if (settings)
-        g_object_unref (settings);
-
-    return retval;
-}
--- a/src/client.c
+++ b/src/client.c
--- a/src/client.h
+++ b/src/client.h
@ -1,55 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef CLIENT_H
-#define CLIENT_H 1
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define TYPE_CLIENT (client_get_type())
-#define CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLIENT, Client))
-#define CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CLIENT, ClientClass))
-#define IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CLIENT))
-#define IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CLIENT))
-#define CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CLIENT, ClientClass))
-
-typedef struct _Client SeatEmitter;
-
-SeatEmitter  *client_new                     (GDBusConnection     *connection);
-
-gboolean client_set_keyboards           (SeatEmitter              *client,
-                                         const gchar * const *keyboard);
-
-gboolean client_enable_xkl              (SeatEmitter              *client);
-void     client_disable_xkl             (SeatEmitter              *client);
-
-gboolean client_enable_atspi_focus      (SeatEmitter              *client);
-void     client_disable_atspi_focus     (SeatEmitter              *client);
-
-gboolean client_enable_atspi_keystroke  (SeatEmitter              *client);
-void     client_disable_atspi_keystroke (SeatEmitter              *client);
-
-gboolean client_enable_xtest            (SeatEmitter              *client);
-void     client_disable_xtest           (SeatEmitter              *client);
-
-gboolean client_enable_ibus_focus       (SeatEmitter              *client);
-void     client_disable_ibus_focus      (SeatEmitter              *client);
-
-G_END_DECLS
-#endif  /* CLIENT_H */
--- a/src/meson.build
+++ b/src/meson.build
@ -1,7 +1,7 @@
 gnome = import('gnome')
 dbus_src = gnome.gdbus_codegen(
    'sm.puri.OSK0',
-    join_paths(dbusdir, 'sm.puri.OSK0.xml')
+    join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
 )

 sources = [
@ -40,7 +40,8 @@ sources = [
  '../eekboard/eekboard-context-service.c',
  '../eekboard/eekboard-context.c',
  '../eekboard/eekboard-service.c',
-#  '../eekboard/eekboard-xklutil.c',
+  #  '../eekboard/eekboard-xklutil.c',
+  squeekboard_resources,
  wl_proto_sources,
 ]

--- a/src/preferences-dialog.c
+++ b/src/preferences-dialog.c
@ -1,415 +0,0 @@
-/* 
- * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2011 Red Hat, Inc.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include <gtk/gtk.h>
-#include "preferences-dialog.h"
-#include <eek/eek.h>
-
-struct _PreferencesDialog {
-    GtkWidget *dialog;
-    GtkWidget *repeat_toggle;
-    GtkWidget *repeat_delay_scale;
-    GtkWidget *repeat_speed_scale;
-    GtkWidget *auto_hide_toggle;
-    GtkWidget *auto_hide_delay_scale;
-    GtkWidget *selected_keyboards_treeview;
-    GtkWidget *up_button;
-    GtkWidget *down_button;
-    GtkWidget *add_button;
-    GtkWidget *remove_button;
-
-    GtkWidget *new_keyboard_dialog;
-    GtkWidget *available_keyboards_treeview;
-
-    GList *available_keyboards;
-    GSettings *settings;
-};
-
-static gboolean
-get_rate (GValue   *value,
-          GVariant *variant,
-          gpointer  user_data)
-{
-    int rate;
-    gdouble fraction;
-
-    rate = g_variant_get_uint32 (variant);
-    fraction = 1.0 / ((gdouble) rate / 1000.0);
-    g_value_set_double (value, fraction);
-    return TRUE;
-}
-
-static GVariant *
-set_rate (const GValue       *value,
-          const GVariantType *expected_type,
-          gpointer            user_data)
-{
-    gdouble rate;
-    int msecs;
-
-    rate = g_value_get_double (value);
-    msecs = (1 / rate) * 1000;
-    return g_variant_new_uint32 (msecs);
-}
-
-static void
-add_keyboard_to_treeview (GtkTreeView *treeview,
-                          const gchar *id,
-                          const gchar *longname)
-{
-    GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_get_iter_first (model, &iter)) {
-        do {
-            gchar *_id;
-            gtk_tree_model_get (model, &iter, 0, &_id, -1);
-            if (g_strcmp0 (id, _id) == 0) {
-                g_free (_id);
-                return;
-            }
-            g_free (_id);
-        } while (gtk_tree_model_iter_next (model, &iter));
-    }
-
-    gtk_list_store_append (GTK_LIST_STORE(model),
-                           &iter);
-    gtk_list_store_set (GTK_LIST_STORE(model),
-                        &iter,
-                        0, id,
-                        1, longname,
-                        -1);
-}
-
-static void
-add_keyboard (GtkWidget *button, PreferencesDialog *dialog)
-{
-    gint retval = gtk_dialog_run (GTK_DIALOG(dialog->new_keyboard_dialog));
-    if (retval == GTK_RESPONSE_OK) {
-        GtkTreeSelection *selection;
-        GtkTreeModel *model;
-        GList *rows, *p;
-
-        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->available_keyboards_treeview));
-        rows = gtk_tree_selection_get_selected_rows (selection, &model);
-        for (p = rows; p; p = p->next) {
-            GtkTreeIter iter;
-            if (gtk_tree_model_get_iter (model, &iter, p->data)) {
-                gchar *id, *longname;
-                gtk_tree_model_get (model, &iter, 0, &id, 1, &longname, -1);
-                add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->selected_keyboards_treeview),
-                                          id,
-                                          longname);
-                g_free (id);
-                g_free (longname);
-            }
-        }
-    }
-    gtk_widget_hide (dialog->new_keyboard_dialog);
-}
-
-static void
-remove_keyboard (GtkWidget *button, PreferencesDialog *dialog)
-{
-    GtkTreeSelection *selection;
-    GtkTreeModel *model;
-    GList *rows, *p;
-
-    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
-    rows = gtk_tree_selection_get_selected_rows (selection, &model);
-    for (p = rows; p; p = p->next) {
-        GtkTreeIter iter;
-        if (gtk_tree_model_get_iter (model, &iter, p->data))
-            gtk_list_store_remove (GTK_LIST_STORE(model), &iter);
-    }
-}
-
-static void
-up_keyboard (GtkWidget *button, PreferencesDialog *dialog)
-{
-    GtkTreeSelection *selection;
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-
-    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
-    if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-        GtkTreeIter prev = iter;
-        if (gtk_tree_model_iter_previous (model, &prev))
-            gtk_list_store_swap (GTK_LIST_STORE(model), &iter, &prev);
-    }
-}
-
-static void
-down_keyboard (GtkWidget *button, PreferencesDialog *dialog)
-{
-    GtkTreeSelection *selection;
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-
-    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
-    if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-        GtkTreeIter next = iter;
-        if (gtk_tree_model_iter_next (model, &next))
-            gtk_list_store_swap (GTK_LIST_STORE(model), &iter, &next);
-    }
-}
-
-static void
-selection_changed_cb (GtkTreeSelection *selection, PreferencesDialog *dialog)
-{
-    gint count = gtk_tree_selection_count_selected_rows (selection);
-    if (count > 0) {
-        gtk_widget_set_sensitive (dialog->remove_button, TRUE);
-        gtk_widget_set_sensitive (dialog->up_button, TRUE);
-        gtk_widget_set_sensitive (dialog->down_button, TRUE);
-    } else {
-        gtk_widget_set_sensitive (dialog->remove_button, FALSE);
-        gtk_widget_set_sensitive (dialog->up_button, FALSE);
-        gtk_widget_set_sensitive (dialog->down_button, FALSE);
-    }
-}
-
-static gint
-compare_keyboard_id (const EekXmlKeyboardDesc *desc, const char *id)
-{
-    return g_strcmp0 (desc->id, id);
-}
-
-static void
-populate_selected_keyboards (PreferencesDialog *dialog)
-{
-    gchar **strv, **p;
-
-    strv = g_settings_get_strv (dialog->settings, "keyboards");
-    for (p = strv; *p != NULL; p++) {
-        GList *head = g_list_find_custom (dialog->available_keyboards,
-                                            *p,
-                                            (GCompareFunc) compare_keyboard_id);
-        if (head == NULL) {
-            g_warning ("unknown keyboard %s", *p);
-        } else {
-            EekXmlKeyboardDesc *desc = head->data;
-            add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->selected_keyboards_treeview),
-                                      desc->id,
-                                      desc->longname);
-        }
-    }
-    g_strfreev (strv);
-}
-
-static void
-populate_available_keyboards (PreferencesDialog *dialog)
-{
-    GList *p;
-
-    for (p = dialog->available_keyboards; p; p = p->next) {
-        EekXmlKeyboardDesc *desc = p->data;
-        add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->available_keyboards_treeview),
-                                  desc->id,
-                                  desc->longname);
-    }
-}
-
-static void
-save_keyboards (PreferencesDialog *dialog)
-{
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    GList *list = NULL, *head;
-    gchar **strv, **p;
-
-    model = gtk_tree_view_get_model (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
-    if (gtk_tree_model_get_iter_first (model, &iter)) {
-        do {
-            gchar *id;
-            gtk_tree_model_get (model, &iter, 0, &id, -1);
-            list = g_list_prepend (list, id);
-        } while (gtk_tree_model_iter_next (model, &iter));
-    }
-    list = g_list_reverse (list);
-
-    strv = g_new0 (gchar *, g_list_length (list) + 1);
-    for (head = list, p = strv; head; head = head->next, p++) {
-        *p = head->data;
-    }
-    g_settings_set_strv (dialog->settings,
-                         "keyboards",
-                         (const gchar * const *)strv);
-    g_strfreev (strv);
-    g_list_free (list);
-}
-
-PreferencesDialog *
-preferences_dialog_new (void)
-{
-    PreferencesDialog *dialog;
-    gchar *ui_path;
-    GtkBuilder *builder;
-    GObject *object;
-    GError *error;
-    GtkListStore *store;
-    GtkCellRenderer *renderer;
-    GtkTreeViewColumn *column;
-    GtkTreeSelection *selection;
-
-    dialog = g_slice_new0 (PreferencesDialog);
-    dialog->settings = g_settings_new ("org.fedorahosted.eekboard");
-
-    builder = gtk_builder_new ();
-    gtk_builder_set_translation_domain (builder, "eekboard");
-    ui_path = g_build_filename (PKGDATADIR,
-                                "preferences-dialog.ui",
-                                NULL);
-    error = NULL;
-    if (gtk_builder_add_from_file (builder, ui_path, &error) == 0) {
-        g_warning ("can't load %s: %s", ui_path, error->message);
-        g_error_free (error);
-    }
-    g_free (ui_path);
-
-    object = gtk_builder_get_object (builder, "dialog");
-    dialog->dialog = GTK_WIDGET(object);
-
-    object = gtk_builder_get_object (builder, "repeat_toggle");
-    dialog->repeat_toggle = GTK_WIDGET(object);
-
-    g_settings_bind (dialog->settings, "repeat",
-                     dialog->repeat_toggle, "active",
-                     G_SETTINGS_BIND_DEFAULT);
-
-    object = gtk_builder_get_object (builder, "repeat_delay_scale");
-    dialog->repeat_delay_scale = GTK_WIDGET(object);
-
-    g_settings_bind (dialog->settings, "repeat-delay",
-                     gtk_range_get_adjustment (GTK_RANGE (dialog->repeat_delay_scale)), "value",
-                     G_SETTINGS_BIND_DEFAULT);
-
-    object = gtk_builder_get_object (builder, "repeat_speed_scale");
-    dialog->repeat_speed_scale = GTK_WIDGET(object);
-
-    g_settings_bind_with_mapping (dialog->settings, "repeat-interval",
-                                  gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (builder, "repeat_speed_scale"))), "value",
-                                  G_SETTINGS_BIND_DEFAULT,
-                                  get_rate, set_rate, NULL, NULL);
-
-    object = gtk_builder_get_object (builder, "auto_hide_toggle");
-    dialog->auto_hide_toggle = GTK_WIDGET(object);
-
-    g_settings_bind (dialog->settings, "auto-hide",
-                     dialog->auto_hide_toggle, "active",
-                     G_SETTINGS_BIND_DEFAULT);
-
-    object = gtk_builder_get_object (builder, "auto_hide_delay_scale");
-    dialog->auto_hide_delay_scale = GTK_WIDGET(object);
-
-    g_settings_bind (dialog->settings, "auto-hide-delay",
-                     gtk_range_get_adjustment (GTK_RANGE (dialog->auto_hide_delay_scale)), "value",
-                     G_SETTINGS_BIND_DEFAULT);
-
-    object = gtk_builder_get_object (builder,
-                                     "selected_keyboards_treeview");
-    dialog->selected_keyboards_treeview = GTK_WIDGET(object);
-
-    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
-    g_signal_connect (G_OBJECT(selection), "changed",
-                      G_CALLBACK(selection_changed_cb), dialog);
-
-    renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new ());
-    column = gtk_tree_view_column_new_with_attributes ("Keyboard",
-                                                       renderer,
-                                                       "text",
-                                                       1,
-                                                       NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (object), column);
-
-    object = gtk_builder_get_object (builder, "up_button");
-    dialog->up_button = GTK_WIDGET(object);
-    g_signal_connect (object, "clicked",
-                      G_CALLBACK(up_keyboard), dialog);
-
-    object = gtk_builder_get_object (builder, "down_button");
-    dialog->down_button = GTK_WIDGET(object);
-    g_signal_connect (object, "clicked",
-                      G_CALLBACK(down_keyboard), dialog);
-
-    object = gtk_builder_get_object (builder, "add_button");
-    dialog->add_button = GTK_WIDGET(object);
-    g_signal_connect (object, "clicked",
-                      G_CALLBACK(add_keyboard), dialog);
-
-    object = gtk_builder_get_object (builder, "remove_button");
-    dialog->remove_button = GTK_WIDGET(object);
-    g_signal_connect (object, "clicked",
-                      G_CALLBACK(remove_keyboard), dialog);
-
-    object = gtk_builder_get_object (builder, "new_keyboard_dialog");
-    dialog->new_keyboard_dialog = GTK_WIDGET(object);
-
-    object = gtk_builder_get_object (builder,
-                                     "available_keyboards_treeview");
-    dialog->available_keyboards_treeview = GTK_WIDGET(object);
-
-    renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new ());
-    column = gtk_tree_view_column_new_with_attributes ("Keyboard",
-                                                       renderer,
-                                                       "text",
-                                                       1,
-                                                       NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (object), column);
-
-    object = gtk_builder_get_object (builder,
-                                     "available_keyboards_liststore");
-    store = GTK_LIST_STORE(object);
-
-    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
-                                          1,
-                                          GTK_SORT_ASCENDING);
-
-    dialog->available_keyboards = eek_xml_list_keyboards ();
-
-    populate_selected_keyboards (dialog);
-    populate_available_keyboards (dialog);
-
-    g_object_unref (builder);
-
-    return dialog;
-}
-
-void
-preferences_dialog_run (PreferencesDialog *dialog)
-{
-    gtk_window_present (GTK_WINDOW(dialog->dialog));
-    gtk_dialog_run (GTK_DIALOG(dialog->dialog));
-    save_keyboards (dialog);
-}
-
-void
-preferences_dialog_free (PreferencesDialog *dialog)
-{
-    gtk_widget_destroy (dialog->dialog);
-    // gtk_widget_destroy (dialog->new_keyboard_dialog);
-
-    g_object_unref (dialog->settings);
-    g_list_free_full (dialog->available_keyboards,
-                      (GDestroyNotify) eek_xml_keyboard_desc_free);
-
-    g_slice_free (PreferencesDialog, dialog);
-}
--- a/src/preferences-dialog.h
+++ b/src/preferences-dialog.h
@ -1,32 +0,0 @@
-/* 
- * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2011 Red Hat, Inc.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef PREFERENCES_DIALOG_H
-#define PREFERENCES_DIALOG_H 1
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _PreferencesDialog PreferencesDialog;
-
-PreferencesDialog *preferences_dialog_new  (void);
-void               preferences_dialog_run  (PreferencesDialog *dialog);
-void               preferences_dialog_free (PreferencesDialog *dialog);
-
-G_END_DECLS
-#endif  /* PREFERENCES_DIALOG_H */
--- a/src/preferences-dialog.ui
+++ b/src/preferences-dialog.ui
@ -1,729 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAction" id="action1">
-    <property name="stock_id">gtk-close</property>
-  </object>
-  <object class="GtkAction" id="action2">
-    <property name="stock_id">gtk-cancel</property>
-  </object>
-  <object class="GtkAction" id="action3">
-    <property name="label" translatable="yes">Select</property>
-    <property name="stock_id">gtk-ok</property>
-  </object>
-  <object class="GtkAdjustment" id="auto_hide_delay_adjustment">
-    <property name="lower">100</property>
-    <property name="upper">2000</property>
-    <property name="value">500</property>
-    <property name="step_increment">10</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" id="available_keyboards_liststore">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Keyboard</property>
-    <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="related_action">action1</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkNotebook" id="keyboard_notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">10</property>
-            <child>
-              <object class="GtkVBox" id="general_page">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkVBox" id="vbox22">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label300">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Repeat Keys</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox19">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" id="label43">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label">    </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="vbox100">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="repeat_toggle">
-                                <property name="label" translatable="yes">Key presses _repeat when key is held down</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="repeat_table">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="repeat_speed_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Speed:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="justify">center</property>
-                                    <property name="mnemonic_widget">repeat_speed_scale</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="delay_short_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
-                                    <property name="xpad">10</property>
-                                    <property name="label" translatable="yes">Short</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="repeat_slow_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
-                                    <property name="xpad">10</property>
-                                    <property name="label" translatable="yes">Slow</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHScale" id="repeat_delay_scale">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="adjustment">repeat_delay_adjustment</property>
-                                    <property name="draw_value">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHScale" id="repeat_speed_scale">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="adjustment">repeat_speed_adjustment</property>
-                                    <property name="draw_value">False</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="repeat_speed_scale-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes">Repeat keys speed</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="delay_long_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Long</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="repeat_fast_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Fast</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="repeat_delay_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Delay:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="justify">center</property>
-                                    <property name="mnemonic_widget">repeat_delay_scale</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox230">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Focus following</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox20">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" id="label44">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label">    </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="appearances_vbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="auto_hide_toggle">
-                                <property name="label" translatable="yes">Auto hide window when focus is out</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkTable" id="table1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_columns">4</property>
-                                <child>
-                                  <object class="GtkLabel" id="auto_hide_delay_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Delay:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="justify">center</property>
-                                    <property name="mnemonic_widget">auto_hide_delay_scale</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="auto_hide_delay_short_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">1</property>
-                                    <property name="xpad">10</property>
-                                    <property name="label" translatable="yes">Short</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHScale" id="auto_hide_delay_scale">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="adjustment">auto_hide_delay_adjustment</property>
-                                    <property name="draw_value">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="auto_hide_delay_long_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Long</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="scale" value="0.82999999999999996"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="x_options">GTK_SHRINK</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Typing</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="keyboards_page">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="spacing">18</property>
-                <child>
-                  <object class="GtkTreeView" id="selected_keyboards_treeview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="model">selected_keyboards_liststore</property>
-                    <property name="headers_visible">False</property>
-                    <property name="headers_clickable">False</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection2"/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButtonBox" id="buttonbox1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">2</property>
-                    <property name="layout_style">end</property>
-                    <child>
-                      <object class="GtkButton" id="up_button">
-                        <property name="label">gtk-go-up</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="down_button">
-                        <property name="label">gtk-go-down</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="add_button">
-                        <property name="label">gtk-add</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="remove_button">
-                        <property name="label">gtk-remove</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Keyboards</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">button1</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="new_keyboard_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="default_height">430</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="transient_for">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="related_action">action2</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="related_action">action3</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTreeView" id="available_keyboards_treeview">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">available_keyboards_liststore</property>
-                <property name="headers_visible">False</property>
-                <property name="headers_clickable">False</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection3"/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">button2</action-widget>
-      <action-widget response="-5">button3</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkAdjustment" id="repeat_delay_adjustment">
-    <property name="lower">100</property>
-    <property name="upper">2000</property>
-    <property name="value">500</property>
-    <property name="step_increment">10</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="repeat_speed_adjustment">
-    <property name="lower">0.5</property>
-    <property name="upper">50</property>
-    <property name="value">33.299999999999997</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkListStore" id="selected_keyboards_liststore">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-</interface>
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -65,10 +65,10 @@ static void set_dock      (GtkWidget            *widget,
                           GtkAllocation        *allocation);

 static void
-on_monitors_changed (GdkScreen *screen,
-                     gpointer   user_data)
+on_monitors_changed (GdkScreen            *screen,
+                     ServerContextService *context)
+
 {
-    ServerContextService *context = user_data;
    if (context->window)
        set_geometry (context);
 }
@ -87,18 +87,16 @@ on_destroy (GtkWidget *widget, gpointer user_data)
 }

 static void
-on_notify_keyboard (GObject    *object,
-                    GParamSpec *spec,
-                    gpointer    user_data)
+on_notify_keyboard (GObject              *object,
+                    GParamSpec           *spec,
+                    ServerContextService *context)
 {
-    ServerContextService *context = user_data;
    const EekKeyboard *keyboard;

    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));

-    if (!keyboard) {
+    if (!keyboard)
        g_error("Programmer error: keyboard layout was unset!");
-    }

    // The keymap will get set even if the window is hidden.
    // It's not perfect,
@ -109,8 +107,7 @@ on_notify_keyboard (GObject    *object,
    if (context->window) {
        if (keyboard == NULL) {
            gtk_widget_hide (context->window);
-            gtk_widget_destroy (context->widget);
-            context->widget = NULL;
+            g_clear_pointer (&context->widget, gtk_widget_destroy);
        } else {
            gboolean was_visible = gtk_widget_get_visible (context->window);
            /* avoid to send KeyboardVisibilityChanged */
@ -127,19 +124,19 @@ on_notify_keyboard (GObject    *object,
 }

 static void
-on_notify_fullscreen (GObject    *object,
-                      GParamSpec *spec,
-                      gpointer    user_data)
+on_notify_fullscreen (GObject              *object,
+                      GParamSpec           *spec,
+                      ServerContextService *context)
 {
-    ServerContextService *context = user_data;
    if (context->window)
        set_geometry (context);
 }

 static void
-on_notify_visible (GObject *object, GParamSpec *spec, gpointer user_data)
+on_notify_visible (GObject    *object,
+                   GParamSpec *spec,
+                   ServerContextService *context)
 {
-    ServerContextService *context = user_data;
    gboolean visible;

    g_object_get (object, "visible", &visible, NULL);
@ -198,10 +195,9 @@ on_size_allocate_set_dock (GtkWidget *widget,
 }

 static void
-on_realize_set_non_maximizable (GtkWidget *widget,
-                                gpointer   user_data)
+on_realize_set_non_maximizable (GtkWidget            *widget,
+                                ServerContextService *context)
 {
-    ServerContextService *context = user_data;

    g_assert (context && context->window == widget);

@ -216,20 +212,16 @@ on_realize_set_non_maximizable (GtkWidget *widget,
 static void
 set_geometry (ServerContextService *context)
 {
-    GdkScreen *screen;
-    GdkDisplay *display;
-    GdkWindow *root;
-    GdkMonitor *monitor;
+    GdkScreen   *screen   = gdk_screen_get_default ();
+    GdkWindow   *root     = gdk_screen_get_root_window (screen);
+    GdkDisplay  *display  = gdk_display_get_default ();
+    GdkMonitor  *monitor  = gdk_display_get_monitor_at_window (display, root);
+    EekKeyboard *keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
+
    GdkRectangle rect;
-    EekKeyboard *keyboard;
    EekBounds bounds;

-    screen = gdk_screen_get_default ();
-    root = gdk_screen_get_root_window (screen);
-    display = gdk_display_get_default();
-    monitor = gdk_display_get_monitor_at_window (display, root);
    gdk_monitor_get_geometry (monitor, &rect);
-    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);

    g_signal_handlers_disconnect_by_func (context->window,
@ -240,14 +232,14 @@ set_geometry (ServerContextService *context)
                                          context);

    if (eekboard_context_service_get_fullscreen (EEKBOARD_CONTEXT_SERVICE(context))) {
-        gint width = rect.width;
+        gint width  = rect.width;
        gint height = rect.height;

        if (width > height) {
-            width *= context->size_constraint_landscape[0];
+            width  *= context->size_constraint_landscape[0];
            height *= context->size_constraint_landscape[1];
        } else {
-            width *= context->size_constraint_portrait[0];
+            width  *= context->size_constraint_portrait[0];
            height *= context->size_constraint_portrait[1];
        }

@ -284,16 +276,16 @@ set_geometry (ServerContextService *context)
 }

 static void
-make_window (ServerContextService *context) {
-    if (context->window) {
+make_window (ServerContextService *context)
+{
+    if (context->window)
        g_error("Window already present");
-        return;
-    }
-    context->window = GTK_WIDGET(g_object_new (
+
+    context->window = g_object_new (
        PHOSH_TYPE_LAYER_SURFACE,
        "layer-shell", squeek_wayland->layer_shell,
        "wl-output", g_ptr_array_index(squeek_wayland->outputs, 0), // TODO: select output as needed,
-        "height", 200,
+        "height", 210,
        "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
@ -302,12 +294,16 @@ make_window (ServerContextService *context) {
        "exclusive-zone", 200,
        //"namespace", "phosh home",
        NULL
-    ));
+    );
+
    g_signal_connect (context->window, "destroy",
-                      G_CALLBACK(on_destroy), context);
+                      G_CALLBACK(on_destroy),
+                      context);
+
    context->notify_visible_handler =
        g_signal_connect (context->window, "notify::visible",
-                          G_CALLBACK(on_notify_visible), context);
+                          G_CALLBACK(on_notify_visible),
+                          context);

    // The properties below are just to make hacking easier.
    // The way we use layer-shell overrides some,
@ -323,7 +319,8 @@ make_window (ServerContextService *context) {
 }

 static void
-destroy_window (ServerContextService *context) {
+destroy_window (ServerContextService *context)
+{
    context->window = NULL;
 }

@ -331,8 +328,6 @@ static void
 update_widget (ServerContextService *context)
 {
    EekKeyboard *keyboard;
-    EekBounds bounds;
-    gchar *theme_path;
    EekTheme *theme;

    if (context->widget) {
@ -340,16 +335,16 @@ update_widget (ServerContextService *context)
        context->widget = NULL;
    }

-    theme_path = g_build_filename (THEMESDIR, "default.css", NULL);
-
-    theme = eek_theme_new (theme_path, NULL, NULL);
-    g_free (theme_path);
+    theme = eek_theme_new ("resource:///sm/puri/squeekboard/style.css",
+                           NULL,
+                           NULL);

    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
-    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
+
    context->widget = eek_gtk_keyboard_new (keyboard);
+
    eek_gtk_keyboard_set_theme (EEK_GTK_KEYBOARD(context->widget), theme);
-    g_object_unref (theme);
+    g_clear_object (&theme);

    gtk_widget_set_has_tooltip (context->widget, TRUE);
    gtk_container_add (GTK_CONTAINER(context->window), context->widget);
@ -374,8 +369,8 @@ server_context_service_real_hide_keyboard (EekboardContextService *_context)
    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);

    gtk_widget_hide (context->window);
-    gtk_container_remove(GTK_CONTAINER(context->window), context->widget);
-    context->widget = NULL; // When GTK removes the widget, it doesn't just unlink it, but also frees it
+    g_clear_pointer (&context->widget, gtk_widget_destroy);
+
    destroy_window (context);

    EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
@ -397,8 +392,7 @@ server_context_service_real_disabled (EekboardContextService *_context)
    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);

    if (context->window) {
-        context->was_visible =
-            gtk_widget_get_visible (context->window);
+        context->was_visible = gtk_widget_get_visible (context->window);
        gtk_widget_hide (context->window);
    }
 }
@ -442,10 +436,8 @@ server_context_service_dispose (GObject *object)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);

-    if (context->window) {
-        gtk_widget_destroy (context->window);
-        context->window = NULL;
-    }
+    g_clear_pointer (&context->window, gtk_widget_destroy);
+    context->widget = NULL;

    G_OBJECT_CLASS (server_context_service_parent_class)->dispose (object);
 }
@ -490,9 +482,8 @@ server_context_service_class_init (ServerContextServiceClass *klass)
 static void
 server_context_service_init (ServerContextService *context)
 {
-    GdkScreen *screen;
+    GdkScreen *screen = gdk_screen_get_default ();

-    screen = gdk_screen_get_default ();
    g_signal_connect (screen,
                      "monitors-changed",
                      G_CALLBACK(on_monitors_changed),
@ -501,6 +492,7 @@ server_context_service_init (ServerContextService *context)
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
                      context);
+
    g_signal_connect (context,
                      "notify::fullscreen",
                      G_CALLBACK(on_notify_fullscreen),
@ -510,6 +502,5 @@ server_context_service_init (ServerContextService *context)
 EekboardContextService *
 server_context_service_new ()
 {
-    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE,
-                         NULL));
+    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL));
 }
--- a/src/setup-main.c
+++ b/src/setup-main.c
@ -1,41 +0,0 @@
-/* 
- * Copyright (C) 2012 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2012 Red Hat, Inc.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "preferences-dialog.h"
-#include <gtk/gtk.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-    PreferencesDialog *dialog;
-
-    if (!gtk_init_check (&argc, &argv)) {
-        g_printerr ("Can't init GTK\n");
-        return EXIT_FAILURE;
-    }
-
-    dialog = preferences_dialog_new ();
-    preferences_dialog_run (dialog);
-    preferences_dialog_free (dialog);
-
-    return EXIT_SUCCESS;
-}
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
David Boddie	c0ac5e540f	Merge branch 'add-key-icons' into 'master' Add key icons Closes #44 See merge request Librem5/squeekboard!65	2019-07-12 19:17:29 +00:00
David Boddie	fb5ec5557b	Make icons smaller	2019-07-12 20:12:09 +02:00
David Boddie	74d94e6792	Merge branch 'remove-unused-xml' into 'master' Remove unused XML from the US definitions See merge request Librem5/squeekboard!64	2019-07-12 18:08:55 +00:00
David Boddie	63f4c6b4da	Use icons for Shift and Return in the US layout	2019-07-12 20:04:50 +02:00
David Boddie	2774c1c988	Try to load icons from app resources first	2019-07-12 20:04:22 +02:00
David Boddie	469b0c0a9a	Add icons to the resource manifest	2019-07-12 20:04:02 +02:00
David Boddie	2ddd217737	Add Enter and Shift icons	2019-07-12 19:16:21 +02:00
David Boddie	c4e8e34ad6	Remove unused XML from the US definitions	2019-07-12 17:15:38 +00:00
David Boddie	4dc18c0af4	Merge branch '27-period-should-not-change-when-caps-lock-is-active' into 'master' Resolve "Period should not change when caps lock is active" Closes #27 See merge request Librem5/squeekboard!63	2019-07-12 17:11:10 +00:00
David Boddie	55c6911b87	Remove level with > character from . key	2019-07-12 17:17:11 +02:00
David Boddie	9bf0da5409	Merge branch 'adjust-scaling' into 'master' Reduce icon size to match platform guidelines See merge request Librem5/squeekboard!62	2019-07-12 15:15:43 +00:00
David Boddie	7d5b2dd1de	Reduce icon size to match platform guidelines	2019-07-12 16:10:31 +02:00
David Boddie	6091632e40	Merge branch 'simplify-geometry-xml' into 'master' Simplify geometry XML See merge request Librem5/squeekboard!61	2019-07-12 14:09:57 +00:00
David Boddie	44110fd4d9	Remove bounds for everything except the geometry element	2019-07-12 14:00:20 +00:00
David Boddie	74d76ebfeb	Remove unused XML elements	2019-07-12 14:00:20 +00:00
David Boddie	760bc138b0	Test effect of setting attributes to zero	2019-07-12 14:00:20 +00:00
David Boddie	2a4763d4f3	Merge branch 'fix-bottom-margin' into 'master' Include extra space in the window object Closes #47 See merge request Librem5/squeekboard!60	2019-07-12 13:42:20 +00:00
David Boddie	4b92f205ef	Include extra space in the window object	2019-07-12 10:30:44 +00:00
David Boddie	a5668fa1db	Merge branch 'remove-pressed-key-popups' into 'master' Remove pop-ups for pressed keys See merge request Librem5/squeekboard!59	2019-07-11 23:42:34 +00:00
David Boddie	de39256377	Remove pop-ups for pressed keys	2019-07-11 23:39:33 +00:00
David Boddie	f53709c83d	Merge branch 'fix-bottom-margin' into 'master' Fix clipping issue at bottom of keyboard Closes #47 See merge request Librem5/squeekboard!58	2019-07-11 23:07:01 +00:00
David Boddie	8ad0192e55	Fix clipping issue at bottom of keyboard Closes #47.	2019-07-11 23:04:29 +00:00
David Boddie	791e454cb6	Merge branch 'functioning-views' into 'master' Basic functioning views See merge request Librem5/squeekboard!57	2019-07-11 22:58:50 +00:00
David Boddie	c85638be4d	Use a dummy, non-emitting key to switch views	2019-07-11 19:38:02 +00:00
Guido Gunther	a61b1fdf06	Merge branch 'implement-more-view-behavior' into 'master' Improve view behavior to more closely reflect #38 See merge request Librem5/squeekboard!55	2019-07-11 16:29:26 +00:00
David Boddie	07c25d1d91	Improve view behavior to more closely reflect #38	2019-07-11 16:29:26 +00:00
Guido Gunther	83dafd87a4	Merge branch 'copyright' into 'master' Copyright See merge request Librem5/squeekboard!6	2019-07-11 13:49:00 +00:00
David Boddie	25a8733957	Merge branch 'scale' into 'master' Simplify icon rendering a bit See merge request Librem5/squeekboard!52	2019-07-11 13:42:50 +00:00
Guido Günther	c529e9ed9c	render: Simplify drawing Instead of doing scale guessing we know that we get a properly sized image from GTK+ so just scale it down a bit so it gets some border within the drawing area.	2019-07-11 15:40:18 +02:00
Guido Günther	d6a8a85b5e	render: Get foreground color only once	2019-07-11 15:40:18 +02:00
Guido Günther	3a945535f7	render: Remove trailing white space	2019-07-11 15:40:18 +02:00
Guido Günther	0fc4374193	gtk-renderer: Simplify	2019-07-11 15:40:18 +02:00
David Boddie	e350b4ab92	Merge branch 'some-bugfixes' into 'master' MERGE these: Some bugfixes - the buildsystem is acting up again See merge request Librem5/squeekboard!53	2019-07-11 13:39:56 +00:00
David Boddie	626527ee09	Merge branch 'feature-xml-resources' into 'master' FINAL: bundle xml resources, allows running uninstalled from git repo Closes #29 and #21 See merge request Librem5/squeekboard!49	2019-07-11 13:33:45 +00:00
David Boddie	c4a462c385	Merge branch 'ci' into 'master' gitlab-ci: No need for our ci repository See merge request Librem5/squeekboard!54	2019-07-11 13:16:32 +00:00
Guido Günther	706a04dbfc	gitlab-ci: No need for our ci repository Just using debian buster makes things more stable.	2019-07-11 14:31:25 +02:00
Guido Günther	7fd51af4de	debian: Drop virtboard build-dependency	2019-07-11 14:31:25 +02:00
Guido Günther	c1af9b2ba4	Add dbus protocol definition This let's us drop the virtboard build dependency.	2019-07-11 14:31:25 +02:00
Hysterical Raisins	5efb4cc58d	Bundle keyboard definitions This allows running uninstalled from a git repo Closes: #21, #29	2019-07-11 13:40:03 +02:00
Hysterical Raisins	4b2977d601	Plug 3 leaks	2019-07-11 13:26:04 +02:00
Hysterical Raisins	2f1c1c2fb1	Remove unused variable and remove damage from botched rebase - remove bounds it is not used. - remove the g_clear_pointer, it does the same thing as the if-block above, the were both there as the result of the merge, and it is apparently easily overlooked - cleanup after myself (FIXMEs)	2019-07-11 13:24:48 +02:00
David Boddie	f47ef09a1f	Merge branch 'implement-basic-views' into 'master' Implement basic keyboard views See merge request Librem5/squeekboard!51	2019-07-11 10:24:29 +00:00
David Boddie	47041b0fac	Implement basic keyboard views Use existing concepts of levels and modifier latches and locks to implement the three view design of issue #38. The use of a lock to switch from letter to numbers and a latch to handle upper and lower case has side effects, but these can be addressed in a future commit.	2019-07-10 23:33:45 +00:00
Sebastian Krzyszkowiak	b6111b5e00	Merge branch 'fix-backspace-key' into 'master' Specify a keyval to make the backspace key work again Closes #45 See merge request Librem5/squeekboard!50	2019-07-10 23:12:59 +00:00
David Boddie	b8a2b2d7c8	Specify a keyval to make the backspace key work again	2019-07-11 01:09:04 +02:00
David Boddie	0765ea1b86	Merge branch 'update-symbols' into 'master' Update symbols to more closely resemble #38 See merge request Librem5/squeekboard!48	2019-07-10 22:20:30 +00:00
David Boddie	64223704e0	Update symbols to more closely resemble #38	2019-07-10 23:50:34 +02:00
Guido Gunther	8c14763ea4	Merge branch 'theme-path' into 'master' Drop now unused theme_path See merge request Librem5/squeekboard!46	2019-07-10 17:09:58 +00:00
Guido Gunther	10cd93022a	Merge branch 'update-icons' into 'master' Use an icon for backspace See merge request Librem5/squeekboard!47	2019-07-10 16:57:09 +00:00
David Boddie	d006aede6a	Merge branch 'top-margin' into 'master' Add some border at the top Closes #28 See merge request Librem5/squeekboard!43	2019-07-10 15:46:16 +00:00
Guido Günther	b57e1ce660	Drop now unused theme_path	2019-07-10 15:39:16 +02:00
David Boddie	1b59c4dad3	Use an icon for backspace	2019-07-10 14:36:19 +02:00
David Boddie	189c721d7e	Merge branch 'use_gresource' into 'master' Use a gresource to store the css See merge request Librem5/squeekboard!28	2019-07-10 11:36:53 +00:00
David Boddie	1ff1592f24	Merge branch 'master' into 'use_gresource' # Conflicts: # src/server-context-service.c	2019-07-10 11:35:40 +00:00
Guido Günther	7f5f310bf0	Add some border at the top Closes: #28	2019-07-10 11:31:24 +02:00
David Boddie	f999861228	Merge branch 'remove-more-unused-code-and-data' into 'master' Remove unused color definitions See merge request Librem5/squeekboard!42	2019-07-09 21:40:36 +00:00
David Boddie	a571bd7dca	Remove unused color definitions	2019-07-09 17:55:40 +02:00
David Boddie	3d0d28fa01	Merge branch 'remove-unused-eekboard-context-service-code' into 'master' Remove currently unused eekboard code See merge request Librem5/squeekboard!41	2019-07-09 15:48:59 +00:00
David Boddie	4c54b49ef5	Merge branch 'remove-unused-sources' into 'master' Remove unlisted files See merge request Librem5/squeekboard!38	2019-07-09 14:44:00 +00:00
David Boddie	eb940bcf52	Remove currently unused eekboard code	2019-07-09 16:34:16 +02:00
David Boddie	be0e773879	Merge branch 'quick-review-fast-lane-very-speedy' into 'master' Some cleanups, and some FIXME hints for future work (no functional changes) See merge request Librem5/squeekboard!39	2019-07-09 14:25:45 +00:00
David Boddie	056e07e80e	Merge branch 'prevent-warnings' into 'master' Prevent compiler warnings by commenting out unused code See merge request Librem5/squeekboard!37	2019-07-09 13:44:54 +00:00
David Boddie	83b36d07d0	Add note about unused code	2019-07-09 15:28:02 +02:00
Hysterical Raisins	89aaf05aff	Some minor cleanups	2019-07-09 13:52:23 +02:00
Hysterical Raisins	2f87fd46fb	Improve codeflow	2019-07-09 13:50:14 +02:00
Hysterical Raisins	e04276ee38	Use properly typed and named variables for user_data	2019-07-09 13:46:44 +02:00
Hysterical Raisins	05c3061f08	Add some FIXME hints for future work	2019-07-09 13:41:20 +02:00
Hysterical Raisins	c33006bcbc	use g_clear_pointer with gtk_widget_destroy brief, clear, idiomatic and grep friendly	2019-07-09 13:33:49 +02:00
David Boddie	4bf4500ae1	Remove unlisted files	2019-07-09 01:07:19 +02:00
David Boddie	e2944ff4a7	Use a macro to declare a type with private data	2019-07-09 00:46:03 +02:00
David Boddie	f79b5dadbb	Use a macro to declare a type with private data	2019-07-09 00:41:25 +02:00
David Boddie	4d44129b04	Prevent compiler warnings by commenting out unused code	2019-07-09 00:24:57 +02:00
Guido Günther	abf8f4daa8	eek-theme: Remove code for old croko versions These versions aren't even in Debian's oldstable release.	2019-07-04 16:21:18 +02:00
Guido Günther	aba242301d	Use a gresource to store the css This makes build / test faster since one can skip install. It's also more obvious which file is being used.	2019-07-04 16:16:04 +02:00
Dorota Czaplejewicz	47026b669b	Make copyright more granular	2019-06-29 10:50:30 +00:00