From c58d034494f84070d844e32eebfead5e78454b10 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Tue, 30 Jul 2019 14:18:20 +0000
Subject: [PATCH 1/2] Adjust bounds of the keyboard to better fit it in the
 available space

---
 data/keyboards/geometry/compact.xml | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 01240edb..2e0420ef 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <geometry version="0.90">
-  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
+  <bounds x="10" y="10" width="410.0000" height="229"/>
   <section angle="0">
     <row orientation="1">
       <key name="AD01" oref="outline2" />
@@ -54,67 +54,67 @@
   <outline id="outline2" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="37.46341" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="altline" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="48.39024" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline4" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="59.31707" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline5" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="59.31707" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline6" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="68.68292" y="0.000000"/>
-    <point x="68.68292" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="68.68292" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline7" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="88.97561" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline8" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="88.97561" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline9" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="109.2682" y="0.000000"/>
-    <point x="109.2682" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="109.2682" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline10" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="37.46341" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline13" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="79.60975" y="0.000000"/>
-    <point x="79.60975" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="79.60975" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="spaceline" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="150.5853" y="0.000000"/>
-    <point x="150.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="150.5853" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
 </geometry>

From 35ff93258e4b524c8cc54d1739dba66e4b78e807 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Tue, 30 Jul 2019 22:30:15 +0000
Subject: [PATCH 2/2] Adjust geometry to match the compact keyboard in places

---
 data/keyboards/geometry/extended.xml | 48 +++++++++++++---------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/data/keyboards/geometry/extended.xml b/data/keyboards/geometry/extended.xml
index 68794641..3646ff04 100644
--- a/data/keyboards/geometry/extended.xml
+++ b/data/keyboards/geometry/extended.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <geometry version="0.90">
   <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
-  <!-- Keycodes correspond to those used in /usr/share/X11/xkb/keycodes/evdev.
-       For Squeekboard, the values have no connection to evdev. They are only
-       used as indices into the keymap sent to the compositor. They must have
-       values in the range from 8 to 255. -->
   <section angle="0">
     <row orientation="1">
       <key name="AD01" oref="outline2" />
@@ -60,67 +56,67 @@
   <outline id="outline2" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="32" y="0.000000"/>
-    <point x="32" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="32" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="altline" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="48.39024" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline4" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="59.31707" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline5" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="59.31707" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline6" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="68.68292" y="0.000000"/>
-    <point x="68.68292" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="68.68292" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline7" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="88.97561" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline8" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="88.97561" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline9" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="109.2682" y="0.000000"/>
-    <point x="109.2682" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="109.2682" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline10" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="37.46341" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="outline13" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="79.60975" y="0.000000"/>
-    <point x="79.60975" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="79.60975" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
   <outline id="spaceline" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="150.5853" y="0.000000"/>
-    <point x="150.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
+    <point x="150.5853" y="52"/>
+    <point x="0.000000" y="52"/>
   </outline>
 </geometry>