Release 1.8.1 "Corona"

- Landscape layout doesn't crash - CSS font is actually taken into account - Failed start due to dbus is now communicated - Better log messages - Fixed Enter in numbers layout - More consistent terminal layout - Proper font sizes in terminal layout
2020-01-31 10:08:59 +00:00
50 changed files with 273 additions and 1118 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -84,13 +84,3 @@ test:
  script:
    - apt-get -y build-dep .
    - ninja -C _build test
 check_release:
  <<: *tags
  stage: test
  only:
    refs:
      - master
  script:
    - apt-get install git python3
    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,10 +2,10 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.7.9"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -15,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -33,7 +33,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -44,7 +44,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -89,7 +89,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -104,7 +104,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -115,7 +115,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -129,7 +129,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -146,7 +146,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -156,7 +156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -169,7 +169,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -177,7 +177,7 @@ name = "glib-sys"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -187,7 +187,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -211,7 +211,7 @@ dependencies = [
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -227,7 +227,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -239,7 +239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.67"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -254,7 +254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -262,7 +262,7 @@ name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -276,7 +276,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -287,7 +287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "1.0.9"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -306,10 +306,10 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -317,16 +317,16 @@ name = "regex"
 version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "regex-syntax"
-version = "0.6.16"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -363,9 +363,9 @@ name = "serde_derive"
 version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -381,11 +381,11 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "1.0.16"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -444,7 +444,7 @@ name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -457,7 +457,7 @@ dependencies = [
 ]
 [metadata]
-"checksum aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec"
+"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
 "checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
@ -478,22 +478,22 @@ dependencies = [
 "checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
 "checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
 "checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
-"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
-"checksum regex-syntax 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
-"checksum syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
 "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -3,42 +3,10 @@ Hacking
 This document describes the standards for modifying and maintaining the *squeekboard* project.
 Principles
 ----------
 The project was built upon some guiding principles, which should be respected primarily by the maintainers, but also by contributors to avoid needlessly rejected changes.
 The overarching principle of *squeekboard* is to empower users.
 Software is primarily meant to solve problems of its users. Often in the quest to make software better, a hard distinction is made between the developer, who becomes the creator, and the user, who takes the role of the consumer, without direct influence on the software they use.
 This project aims to give users the power to make the software work for them by blurring the lines between users and developers.
 Nonwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance:
 - to use the software,
 - to modify its resources,
 - to change its behaviour,
 - to contribute upstream.
 To give an idea of what it means in practice, those are some examples of what has been important for *squeekboard* so far:
 - being quick and useable,
 - allowing local overrides of resources and config,
 - storing resources and config as editable, standard files,
 - having complete, up to date documentation of interfaces,
 - having an easy process of sending contributions,
 - adapting to to user's settings and constrains without overriding them,
 - avoiding compiling whenever possible,
 - making it easy to build,
 - having code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/),
 - having an easy process of testing and accepting contributions.
 You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefitting the user compared to those benefitting regular contributors.
 Sending patches
 ---------------
-By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](./COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](./dco.txt).
 Development environment
 -----------------------
@ -56,7 +24,8 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```
-For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+For an explicit list of dependencies check the `Build-Depends` entry in the
 [`debian/control`](./debian/control) file.
 Testing
 -------
--- a/README.md
+++ b/README.md
@ -56,4 +56,4 @@ $ src/squeekboard
 Developing
 ----------
-See [`docs/hacking.md`](docs/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
+See `HACKING.md`
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/keyboards/el.yaml
+++ b/data/keyboards/el.yaml
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@ -1,80 +1,16 @@
 ---
 outlines:
    default: { width: 52, height: 52 }
-    altline: { width: 40, height: 52 }
+    altline: { width: 52, height: 52 }
    narrow: { width: 22, height: 52 }
 views:
    base:
        - "😀 😁 😅 😂 😊 😇 🙃"
        - "😍 😘 😋 😜 😎 🥳 😔"
        - "😢 😭 😡 😱 🤔 😬 🙄"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+        - "preferences 🤨 🤓 😴 🤢 🤮 😈"
    two:
        - "🤩 🤨 🤓 😴 🤢 🤮 😈"
        - "💩 🙌 👏 👍 👎 👌 👋"
        - "💪 🖕 🙏 💋 🤦‍♀️ 🤷‍♀️ 💃"
        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
    three:
        - "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
        - "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
        - "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
    four:
        - "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
        - "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
        - "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
    five:
        - "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
        - "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
        - "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
    six:
        - "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
        - "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
        - "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
 buttons:
    1:
        action:
            set_view: "base"
        outline: "altline"
        label: "1"
    2:
        action:
            set_view: "two"
        outline: "altline"
        label: "2"
    3:
        action:
            set_view: "three"
        outline: "altline"
        label: "3"
    4:
        action:
            set_view: "four"
        outline: "altline"
        label: "4"
    5:
        action:
            set_view: "five"
        outline: "altline"
        label: "5"
    6:
        action:
            set_view: "six"
        outline: "altline"
        label: "6"
    preferences:
        action: "show_prefs"
        outline: "altline"
        icon: "keyboard-mode-symbolic"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        keysym: BackSpace
    blank:
        outline: "narrow"
        text: ""
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -44,7 +44,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -195,7 +195,7 @@ buttons:
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -195,7 +195,7 @@ buttons:
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/number.yaml
+++ b/data/keyboards/number.yaml
@ -16,7 +16,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    space:
        outline: spaceline
        text: " "
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -1,110 +0,0 @@
 ---
 outlines:
    default: { width: 35.33, height: 52 }
    altline: { width: 52.67, height: 52 }
    wide: { width: 59, height: 52 }
    spaceline: { width: 140, height: 52 }
    special: { width: 44, height: 52 }
 views:
    base:
        - "q w e r t y u i o p"
        - "a s d f g h j k l"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences         space        show_accents Return"
    upper:
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space        show_upper_accents Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    accents:
        - "q w ę r t y u i ó p"
        - "ą ś d f g h j k ł"
        - "accents_show_upper   ż ź ć v b ń m  BackSpace"
        - "show_numbers preferences         space        show_accents Return"
    upper_accents:
        - "Q W Ę R T Y U I Ó P"
        - "Ą Ś D F G H J K Ł"
        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
        - "show_numbers preferences         space        show_upper_accents Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    accents_show_upper:
        action:
            locking:
                lock_view: "upper_accents"
                unlock_view: "accents"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    show_accents:
        action:
            locking:
                lock_view: "accents"
                unlock_view: "base"
        outline: "altline"
        label: "ąę"
    show_upper_accents:
        action:
            locking:
                lock_view: "upper_accents"
                unlock_view: "upper"
        outline: "altline"
        label: "ĄĘ"
    period:
        outline: "altline"
        text: "."
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@ -1,102 +0,0 @@
 ---
 outlines:
    default: { width: 54, height: 42 }
    altline: { width: 81, height: 42 }
    wide: { width: 100, height: 42 }
    spaceline: { width: 206, height: 42 }
    special: { width: 54, height: 42 }
 views:
    base:
        - "q w e r t y u i o p"
        - "a s d f g h j k l"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences         space        show_accents Return"
    upper:
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space        show_upper_accents Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    accents:
        - "q w ę r t y u i ó p"
        - "ą ś d f g h j k ł"
        - "Shift_L   ż ź ć v b ń m  BackSpace"
        - "show_numbers preferences         space        show_accents Return"
    upper_accents:
        - "Q W Ę R T Y U I Ó P"
        - "Ą Ś D F G H J K Ł"
        - "Shift_L   Ż Ź Ć V B Ń M  BackSpace"
        - "show_numbers preferences         space        show_upper_accents Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    show_accents:
        action:
            locking:
                lock_view: "accents"
                unlock_view: "base"
        outline: "altline"
        label: "ąę"
    show_upper_accents:
        action:
            locking:
                lock_view: "upper_accents"
                unlock_view: "upper"
        outline: "altline"
        label: "ĄĘ"
    period:
        outline: "altline"
        text: "."
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -20,13 +20,13 @@ views:
        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
+        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "F1  F2  F3  F4  F5  F6"
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -69,14 +69,14 @@ buttons:
        action:
            set_view: "symbols"
        outline: "altline"
-        label: "τ=\\"
+        label: "*/="
    show_actions:
        action:
            set_view: "actions"
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "special"
        text: "."
    space:
        outline: "spaceline"
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -39,9 +39,9 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/langs/de-DE.txt
+++ b/data/langs/de-DE.txt
@ -0,0 +1,8 @@
 us Englisch (US)
 de Deutsch
 el Griechisch
 es Spanisch
 it Italienisch
 jp+kana Japanisch (Kana)
 no Norwegisch
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@ -1,2 +1,10 @@
-emoji Emoji
+us English (US)
-terminal Terminal
+de German
 el Greek
 es Spanish
 fi Finnish
 it Italian
 jp+kana Japanese (kana)
 no Norwegian
 se Swedish
--- a/data/langs/ja-JP.txt
+++ b/data/langs/ja-JP.txt
@ -0,0 +1,8 @@
 us 英語 (US)
 de ドイツ語
 el ギリシャ語
 es スペイン語
 it イタリア語
 jp+kana 日本語 (かな)
 nb ノルウェー語
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -1,2 +1,9 @@
-emoji emoji
+us angielski (USA)
-terminal terminal
+de niemiecki
 el grecki
 es hiszpański
 fi fiński
 it włoski
 jp+kana japoński (kana)
 no norweski
 se szwedzki
--- a/debian/changelog
+++ b/debian/changelog
@ -1,60 +1,3 @@
 squeekboard (1.9.1) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * layout: Improve press handling
  * settings: Handle empty settings
  * Variant: Use proper pointer conversion between C and Rust
  * meta: Add doap file
  * modifiers: Support Control and Alt
  * CI: Test that any bump to changelog has a corresponding tag
  * docs: Add the guiding principle
  * hacking: Move into docs/
  [ &t ]
  * Fix minor comment typos
  [ Dorota Czaplejewicz ]
  * cargo: Bump package versions before release
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sun, 08 Mar 2020 10:04:29 +0000
 squeekboard (1.9.0) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * imservice: Add commit_string method
  * submission: Handle submitting strings
  * input_method: Use for erasing
  * logging: Use in merged functions
  * translations: Remove redundant ones
  * translations: Translate builtin layouts
  * greek: Rename to gr which is used by gnome settings
  [ Sebastian Krzyszkowiak ]
  * layouts: Add Polish layouts
  [ Dorota Czaplejewicz ]
  * locks: Draw based on current view
  * locking: Lock keys statelessly
  * layouts: Better accented uppercase in PL
  * emoji: Add more choices
  * row: Eliminate angle
  * layout: Center views relative to each other and the layout bounds
  * drawing: Generalized foreach_visible_button
  * variant: Fix double-free
  * variant: Fix leak
  * keyboard_layout: Fix leak
  * layout: Improve scoping of locked variable
  * terminal: Make */ easier to reach
  [ Sebastian Krzyszkowiak ]
  * layouts: terminal: Use altline outline for dot key
  [ Dorota Czaplejewicz ]
  * text input: Disable erasing
  * cargo: Update deps
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 19 Feb 2020 14:32:39 +0000
 squeekboard (1.8.1) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
--- a/debian/check_release.py
+++ b/debian/check_release.py
@ -1,10 +0,0 @@
 #!/usr/bin/env python3
 """Checks tag before release.
 Feed it the first changelog line, and then all available tags.
 """
 import re, sys
 tag = "v" + re.findall("\\((.*)\\)", input())[0]
 if tag not in map(str.strip, sys.stdin.readlines()):
    raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
--- a/doc/index.md
+++ b/doc/index.md
@ -5,23 +5,17 @@ Contents
 --------
 * [Tutorial](tutorial.md)
 * [Contributing](hacking.md)
 Introduction
 ------------
-Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For more information, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
 Layouts
 -------
-Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
+Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](/tutorial.md) explains the process in detail.
 Layouts are created using a text-based format, based on YAML.
 TODO: Provide a description of the format.
 Contributions
 -------------
 Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -31,7 +31,7 @@ So at least I will try to start writing a short how-to here and edit this post a
 **Running squeekboard**
 * Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
+* Additionally take a look at https://source.puri.sm/Librem5/squeekboard/blob/master/HACKING.md#testing
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image ](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
  `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -99,7 +99,8 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
        eek_renderer_set_scale_factor (priv->renderer,
                                       gtk_widget_get_scale_factor (self));
    }
-    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr);
+
    eek_renderer_render_keyboard (priv->renderer, cr);
    return FALSE;
 }
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -214,10 +214,8 @@ render_button_label (cairo_t     *cr,
    g_object_unref (layout);
 }
 // FIXME: Pass just the active modifiers instead of entire submission
 void
 eek_renderer_render_keyboard (EekRenderer *self,
                              struct submission *submission,
                                   cairo_t     *cr)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
@ -237,7 +235,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);
    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
-    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr, submission);
+    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr);
    cairo_restore (cr);
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,7 +25,6 @@
 #include <pango/pangocairo.h>
 #include "eek-types.h"
 #include "src/submission.h"
 G_BEGIN_DECLS
@ -60,7 +59,7 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);
-void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct submission *submission,
+void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
                                                cairo_t         *cr);
 struct transformation
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -114,15 +114,8 @@ static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    GVariant *inputs = g_settings_get_value(settings, "sources");
-    if (g_variant_n_children(inputs) == 0) {
+    // current layout is always first
-        g_warning("No system layout present");
+    g_variant_get_child(inputs, 0, "(ss)", type, layout);
        *type = NULL;
        *layout = NULL;
    } else {
        // current layout is always first
        g_variant_get_child(inputs, 0, "(ss)", type, layout);
    }
    g_variant_unref(inputs);
 }
 void
@ -146,11 +139,9 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    switch (priv->purpose) {
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("number");
        break;
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("terminal");
        break;
    default:
--- a/squeekboard.doap
+++ b/squeekboard.doap
@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
 <name>squeekboard</name>
 <shortdesc>A Wayland virtual keyboard</shortdesc>
 <description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
 <homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
 <bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
 <os>Linux</os>
 <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
 <maintainer>
  <foaf:Person>
     <foaf:name>Dorota Czaplejewicz</foaf:name>
     <foaf:mbox rdf:resource="mailto:dorota.czaplejewicz@puri.sm" />
  </foaf:Person>
 </maintainer>
 </Project>
--- a/src/action.rs
+++ b/src/action.rs
@ -10,11 +10,8 @@ pub struct KeySym(pub String);
 type View = String;
 /// Use to send modified keypresses
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Modifier {
    /// Control and Alt are the only modifiers
    /// which doesn't interfere with levels,
    /// so it's simple to implement as levels are deprecated in squeekboard.
    Control,
    Alt,
 }
@ -30,33 +27,14 @@ pub enum Action {
        /// When unlocked by pressing it or emitting a key
        unlock: View,
    },
-    /// Hold this modifier for as long as the button is pressed
+    /// Set this modifier TODO: release?
-    ApplyModifier(Modifier),
+    SetModifier(Modifier),
    /// Submit some text
    Submit {
-        /// Text to submit with input-method.
+        /// Text to submit with input-method
        /// If None, then keys are to be submitted instead.
        text: Option<CString>,
        /// The key events this symbol submits when submitting text is not possible
        keys: Vec<KeySym>,
    },
    /// Erase a position behind the cursor
    Erase,
    ShowPreferences,
 }
 impl Action {
    pub fn is_locked(&self, view_name: &str) -> bool {
        match self {
            Action::LockView { lock, unlock: _ } => lock == view_name,
            _ => false,
        }
    }
    pub fn is_active(&self, view_name: &str) -> bool {
        match self {
            Action::SetView(view) => view == view_name,
            Action::LockView { lock, unlock: _ } => lock == view_name,
            _ => false,
        }
    }
 }
--- a/src/data.rs
+++ b/src/data.rs
@ -15,7 +15,6 @@ use std::vec::Vec;
 use xkbcommon::xkb;
 use ::action;
 use ::keyboard::{
    KeyState, PressType,
    generate_keymap, generate_keycodes, FormattingError
@ -240,20 +239,14 @@ type ButtonIds = String;
 #[derive(Debug, Default, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct ButtonMeta {
-    // TODO: structure (action, keysym, text, modifier) as an enum
+    /// Special action to perform on activation. Conflicts with keysym, text.
    // to detect conflicts and missing values at compile time
    /// Special action to perform on activation.
    /// Conflicts with keysym, text, modifier.
    action: Option<Action>,
    /// The name of the XKB keysym to emit on activation.
-    /// Conflicts with action, text, modifier.
+    /// Conflicts with action, text
    keysym: Option<String>,
    /// The text to submit on activation. Will be derived from ID if not present
-    /// Conflicts with action, keysym, modifier.
+    /// Conflicts with action, keysym
    text: Option<String>,
    /// The modifier to apply while the key is locked
    /// Conflicts with action, keysym, text
    modifier: Option<Modifier>,
    /// If not present, will be derived from text or the button ID
    label: Option<String>,
    /// Conflicts with label
@ -271,23 +264,6 @@ enum Action {
    SetView(String),
    #[serde(rename="show_prefs")]
    ShowPrefs,
    /// Remove last character
    #[serde(rename="erase")]
    Erase,
 }
 #[derive(Debug, Clone, PartialEq, Deserialize)]
 #[serde(deny_unknown_fields)]
 enum Modifier {
    Control,
    Shift,
    Lock,
    #[serde(alias="Mod1")]
    Alt,
    Mod2,
    Mod3,
    Mod4,
    Mod5,
 }
 #[derive(Debug, Clone, Deserialize, PartialEq)]
@ -410,16 +386,13 @@ impl Layout {
                            )
                    }).collect()
                },
                action::Action::Erase => vec![
                    *keymap.get("BackSpace")
                        .expect(&format!("BackSpace missing from keymap")),
                ],
                _ => Vec::new(),
            };
            (
                name.into(),
                KeyState {
                    pressed: PressType::Released,
                    locked: false,
                    keycodes,
                    action,
                }
@ -444,8 +417,8 @@ impl Layout {
            )}
        );
-        let views: Vec<_> = self.views.iter()
+        let views = HashMap::from_iter(
-            .map(|(name, view)| {
+            self.views.iter().map(|(name, view)| {
                let rows = view.iter().map(|row| {
                    let buttons = row.split_ascii_whitespace()
                        .map(|name| {
@ -459,7 +432,8 @@ impl Layout {
                                &mut warning_handler,
                            ))
                        });
-                    layout::Row {
+                    ::layout::Row {
                        angle: 0,
                        buttons: add_offsets(
                            buttons,
                            |button| button.size.width,
@ -472,25 +446,8 @@ impl Layout {
                    name.clone(),
                    layout::View::new(rows)
                )
-            }).collect();
+            })
-
+        );
        // Center views on the same point.
        let views = {
            let total_size = layout::View::calculate_super_size(
                views.iter().map(|(_name, view)| view).collect()
            );
            HashMap::from_iter(views.into_iter().map(|(name, view)| (
                name,
                (
                    layout::c::Point {
                        x: (total_size.width - view.get_width()) / 2.0,
                        y: (total_size.height - view.get_height()) / 2.0,
                    },
                    view,
                ),
            )))
        };
        (
            Ok(::layout::LayoutData {
@ -530,27 +487,22 @@ fn create_action<H: logging::Handler>(
        Action(Action),
        Text(String),
        Keysym(String),
        Modifier(Modifier),
    };
    let submission = match (
        &symbol_meta.action,
        &symbol_meta.keysym,
-        &symbol_meta.text,
+        &symbol_meta.text
        &symbol_meta.modifier,
    ) {
-        (Some(action), None, None, None) => SubmitData::Action(action.clone()),
+        (Some(action), None, None) => SubmitData::Action(action.clone()),
-        (None, Some(keysym), None, None) => SubmitData::Keysym(keysym.clone()),
+        (None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
-        (None, None, Some(text), None) => SubmitData::Text(text.clone()),
+        (None, None, Some(text)) => SubmitData::Text(text.clone()),
-        (None, None, None, Some(modifier)) => {
+        (None, None, None) => SubmitData::Text(name.into()),
            SubmitData::Modifier(modifier.clone())
        },
        (None, None, None, None) => SubmitData::Text(name.into()),
        _ => {
            warning_handler.handle(
                logging::Level::Warning,
                &format!(
-                    "Button {} has more than one of (action, keysym, text, modifier)",
+                    "Button {} has more than one of (action, keysym, text)",
                    name,
                ),
            );
@ -606,7 +558,6 @@ fn create_action<H: logging::Handler>(
        SubmitData::Action(
            Action::ShowPrefs
        ) => ::action::Action::ShowPreferences,
        SubmitData::Action(Action::Erase) => action::Action::Erase,
        SubmitData::Keysym(keysym) => ::action::Action::Submit {
            text: None,
            keys: vec!(::action::KeySym(
@ -638,27 +589,7 @@ fn create_action<H: logging::Handler>(
                    false => format!("U{:04X}", codepoint as u32),
                })
            }).collect(),
-        },
+        }
        SubmitData::Modifier(modifier) => match modifier {
            Modifier::Control => action::Action::ApplyModifier(
                action::Modifier::Control,
            ),
            Modifier::Alt => action::Action::ApplyModifier(
                action::Modifier::Alt,
            ),
            unsupported_modifier => {
                warning_handler.handle(
                    logging::Level::Bug,
                    &format!(
                        "Modifier {:?} unsupported", unsupported_modifier,
                    ),
                );
                action::Action::Submit {
                    text: None,
                    keys: Vec::new(),
                }
            },
        },
    }
 }
@ -756,7 +687,6 @@ mod tests {
                        keysym: None,
                        action: None,
                        text: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -813,7 +743,7 @@ mod tests {
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
                .buttons[0].1
                .label,
@ -828,7 +758,7 @@ mod tests {
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
                .buttons[0].1
                .label,
@ -844,7 +774,7 @@ mod tests {
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
                .buttons[0].1
                .state.borrow()
@ -898,7 +828,6 @@ mod tests {
                        keysym: None,
                        text: None,
                        action: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -3,11 +3,9 @@
 use cairo;
 use std::cell::RefCell;
 use ::action::Action;
 use ::keyboard;
 use ::layout::{ Button, Layout };
 use ::layout::c::{ EekGtkKeyboard, Point };
 use ::submission::Submission;
 use glib::translate::FromGlibPtrNone;
 use gtk::WidgetExt;
@ -39,37 +37,30 @@ mod c {
        );
    }
    /// Draws all buttons that are not in the base state
    #[no_mangle]
    pub extern "C"
    fn squeek_layout_draw_all_changed(
        layout: *mut Layout,
        renderer: EekRenderer,
        cr: *mut cairo_sys::cairo_t,
        submission: *const Submission,
    ) {
        let layout = unsafe { &mut *layout };
        let submission = unsafe { &*submission };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
        let active_modifiers = submission.get_active_modifiers();
-        layout.foreach_visible_button(|offset, button| {
+        let view = layout.get_current_view();
-            let state = RefCell::borrow(&button.state).clone();
+        for (row_offset, row) in &view.get_rows() {
-            let active_mod = match &state.action {
+            for (x_offset, button) in &row.buttons {
-                Action::ApplyModifier(m) => active_modifiers.contains(m),
+                let state = RefCell::borrow(&button.state).clone();
-                _ => false,
+                if state.pressed == keyboard::PressType::Pressed || state.locked {
-            };
+                    render_button_at_position(
-            let locked = state.action.is_active(&layout.current_view)
+                        renderer, &cr,
-                | active_mod;
+                        row_offset + Point { x: *x_offset, y: 0.0 },
-            if state.pressed == keyboard::PressType::Pressed || locked {
+                        button.as_ref(),
-                render_button_at_position(
+                        state.pressed, state.locked,
-                    renderer, &cr,
+                    );
-                    offset,
+                }
                    button.as_ref(),
                    state.pressed, locked,
                );
            }
-        })
+        }
    }
    #[no_mangle]
@ -81,15 +72,17 @@ mod c {
    ) {
        let layout = unsafe { &mut *layout };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
-        
+        let view = layout.get_current_view();
-        layout.foreach_visible_button(|offset, button| {
+        for (row_offset, row) in &view.get_rows() {
-            render_button_at_position(
+            for (x_offset, button) in &row.buttons {
-                renderer, &cr,
+                render_button_at_position(
-                offset,
+                    renderer, &cr,
-                button.as_ref(),
+                    row_offset + Point { x: *x_offset, y: 0.0 },
-                keyboard::PressType::Released, false,
+                    button.as_ref(),
-            );
+                    keyboard::PressType::Released, false,
-        })
+                );
            }
        }
    }
 }
--- a/src/imservice.c
+++ b/src/imservice.c
@ -49,23 +49,6 @@ void imservice_connect_listeners(struct zwp_input_method_v2 *im, struct imservic
    zwp_input_method_v2_add_listener(im, &input_method_listener, imservice);
 }
 void
 eek_input_method_commit_string(struct zwp_input_method_v2 *zwp_input_method_v2, const char *text)
 {
    zwp_input_method_v2_commit_string(zwp_input_method_v2, text);
 }
 void
 eek_input_method_delete_surrounding_text(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t before_length, uint32_t after_length) {
    zwp_input_method_v2_delete_surrounding_text(zwp_input_method_v2, before_length, after_length);
 };
 void
 eek_input_method_commit(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t serial)
 {
    zwp_input_method_v2_commit(zwp_input_method_v2, serial);
 }
 /// Declared explicitly because _destroy is inline,
 /// making it unavailable in Rust
 void imservice_destroy_im(struct zwp_input_method_v2 *im) {
--- a/src/imservice.rs
+++ b/src/imservice.rs
@ -1,8 +1,3 @@
 /*! Manages zwp_input_method_v2 protocol.
 * 
 * Library module.
 */
 use std::boxed::Box;
 use std::ffi::CString;
 use std::fmt;
@ -37,9 +32,6 @@ pub mod c {
        fn imservice_destroy_im(im: *mut c::InputMethod);
        #[allow(improper_ctypes)] // IMService will never be dereferenced in C
        pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
        pub fn eek_input_method_commit_string(im: *mut InputMethod, text: *const c_char);
        pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32);
        pub fn eek_input_method_commit(im: *mut InputMethod, serial: u32);
        fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32);
        fn server_context_service_show_keyboard(imservice: *const UIManager);
        fn server_context_service_hide_keyboard(imservice: *const UIManager);
@ -336,7 +328,7 @@ impl Default for IMProtocolState {
 pub struct IMService {
    /// Owned reference (still created and destroyed in C)
-    pub im: *mut c::InputMethod,
+    pub im: *const c::InputMethod,
    /// Unowned reference. Be careful, it's shared with C at large
    state_manager: *const c::StateManager,
    /// Unowned reference. Be careful, it's shared with C at large
@ -348,11 +340,6 @@ pub struct IMService {
    serial: Wrapping<u32>,
 }
 pub enum SubmitError {
    /// The input method had not been activated
    NotActive,
 }
 impl IMService {
    pub fn new(
        im: *mut c::InputMethod,
@ -377,51 +364,4 @@ impl IMService {
        }
        imservice
    }
    pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
                unsafe {
                    c::eek_input_method_commit_string(self.im, text.as_ptr())
                }
                Ok(())
            },
            false => Err(SubmitError::NotActive),
        }
    }
    pub fn delete_surrounding_text(
        &self,
        before: u32, after: u32,
    ) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
                unsafe {
                    c::eek_input_method_delete_surrounding_text(
                        self.im,
                        before, after,
                    )
                }
                Ok(())
            },
            false => Err(SubmitError::NotActive),
        }
    }
    pub fn commit(&mut self) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
                unsafe {
                    c::eek_input_method_commit(self.im, self.serial.0)
                }
                self.serial += Wrapping(1u32);
                Ok(())
            },
            false => Err(SubmitError::NotActive),
        }
    }
    pub fn is_active(&self) -> bool {
        self.current.active
    }
 }
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -1,17 +1,14 @@
 /*! State of the emulated keyboard and keys.
 * Regards the keyboard as if it was composed of switches. */
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::fmt;
 use std::io;
 use std::rc::Rc;
 use std::string::FromUtf8Error;
 use ::action::Action;
 use ::logging;
 // Traits
 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };
@ -23,39 +20,28 @@ pub enum PressType {
 pub type KeyCode = u32;
 bitflags!{
    /// Map to `virtual_keyboard.modifiers` modifiers values
    /// From https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Keyboard_State
    pub struct Modifiers: u8 {
        const SHIFT = 0x1;
        const LOCK = 0x2;
        const CONTROL = 0x4;
        /// Alt
        const MOD1 = 0x8;
        const MOD2 = 0x10;
        const MOD3 = 0x20;
        /// Meta
        const MOD4 = 0x40;
        /// AltGr
        const MOD5 = 0x80;
    }
 }
 /// When the submitted actions of keys need to be tracked,
 /// they need a stable, comparable ID
 #[derive(PartialEq)]
 pub struct KeyStateId(*const KeyState);
 #[derive(Debug, Clone)]
 pub struct KeyState {
    pub pressed: PressType,
-    /// A cache of raw keycodes derived from Action::Submit given a keymap
+    pub locked: bool,
    /// A cache of raw keycodes derived from Action::Sumbit given a keymap
    pub keycodes: Vec<KeyCode>,
    /// Static description of what the key does when pressed or released
    pub action: Action,
 }
 impl KeyState {
    #[must_use]
    pub fn into_activated(self) -> KeyState {
        match self.action {
            Action::LockView { lock: _, unlock: _ } => KeyState {
                locked: self.locked ^ true,
                ..self
            },
            _ => self,
        }
    }
    #[must_use]
    pub fn into_released(self) -> KeyState {
        KeyState {
@ -63,20 +49,6 @@ impl KeyState {
            ..self
        }
    }
    #[must_use]
    pub fn into_pressed(self) -> KeyState {
        KeyState {
            pressed: PressType::Pressed,
            ..self
        }
    }
    /// KeyStates instances are the unique identifiers of pressed keys,
    /// and the actions submitted with them.
    pub fn get_id(keystate: &Rc<RefCell<KeyState>>) -> KeyStateId {
        KeyStateId(keystate.as_ptr() as *const KeyState)
    }
 }
 /// Sorts an iterator by converting it to a Vector and back
@ -94,10 +66,9 @@ fn sorted<'a, I: Iterator<Item=&'a str>>(
 pub fn generate_keycodes<'a, C: IntoIterator<Item=&'a str>>(
    key_names: C
 ) -> HashMap<String, u32> {
    let special_keysyms = ["BackSpace", "Return"].iter().map(|&s| s);
    HashMap::from_iter(
        // sort to remove a source of indeterminism in keycode assignment
-        sorted(key_names.into_iter().chain(special_keysyms))
+        sorted(key_names.into_iter())
            .map(|name| String::from(name))
            .zip(9..)
    )
@ -124,10 +95,7 @@ impl From<io::Error> for FormattingError {
    }
 }
-/// Generates a de-facto single level keymap.
+/// Generates a de-facto single level keymap. TODO: actually drop second level
 // TODO: don't rely on keys and their order,
 // but rather on what keysyms and keycodes are in use.
 // Iterating actions makes it hard to deduplicate keysyms.
 pub fn generate_keymap(
    keystates: &HashMap::<String, KeyState>
 ) -> Result<String, FormattingError> {
@ -142,40 +110,22 @@ pub fn generate_keymap(
    )?;
    for (name, state) in keystates.iter() {
-        match &state.action {
+        if let Action::Submit { text: _, keys } = &state.action {
-            Action::Submit { text: _, keys } => {
+            if let 0 = keys.len() {
-                if let 0 = keys.len() {
+                log_print!(
-                    log_print!(
+                    logging::Level::Warning,
-                        logging::Level::Warning,
+                    "Key {} has no keysyms", name,
-                        "Key {} has no keysyms", name,
+                );
-                    );
+            };
-                };
+            for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
                for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
                    write!(
                        buf,
                        "
        <{}> = {};",
                        named_keysym.0,
                        keycode,
                    )?;
                }
            },
            Action::Erase => {
                let mut keycodes = state.keycodes.iter();
                write!(
                    buf,
                    "
-        <BackSpace> = {};",
+        <{}> = {};",
-                    keycodes.next().expect("Erase key has no keycode"),
+                    named_keysym.0,
                    keycode,
                )?;
-                if let Some(_) = keycodes.next() {
+            }
                    log_print!(
                        logging::Level::Bug,
                        "Erase key has multiple keycodes",
                    );
                }
            },
            _ => {},
        }
    }
@ -187,9 +137,7 @@ pub fn generate_keymap(
    xkb_symbols \"squeekboard\" {{
        name[Group1] = \"Letters\";
-        name[Group2] = \"Numbers/Symbols\";
+        name[Group2] = \"Numbers/Symbols\";"
        key <BackSpace> {{ [ BackSpace ] }};"
    )?;
    for (name, state) in keystates.iter() {
@ -247,6 +195,7 @@ mod tests {
                    keys: vec!(KeySym("a".into()), KeySym("c".into())),
                },
                keycodes: vec!(9, 10),
                locked: false,
                pressed: PressType::Released,
            },
        }).unwrap();
--- a/src/layout.h
+++ b/src/layout.h
@ -7,7 +7,6 @@
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
 #include "src/submission.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 enum squeek_arrangement_kind {
@ -54,6 +53,6 @@ void squeek_layout_drag(struct squeek_layout *layout,
                        struct transformation widget_to_layout,
                        uint32_t timestamp, EekboardContextService *manager,
                        EekGtkKeyboard *ui_keyboard);
-void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr, struct submission *submission);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
@ -26,10 +26,10 @@ use std::vec::Vec;
 use ::action::Action;
 use ::drawing;
-use ::keyboard::KeyState;
+use ::keyboard::{ KeyState, PressType };
 use ::logging;
 use ::manager;
-use ::submission::{ Submission, SubmitData, Timestamp };
+use ::submission::{ Submission, Timestamp };
 use ::util::find_max_double;
 // Traits
@ -249,7 +249,7 @@ pub mod c {
        unsafe { Box::from_raw(layout) };
    }
-    /// Entry points for more complex procedures and algorithms which span multiple modules
+    /// Entry points for more complex procedures and algoithms which span multiple modules
    pub mod procedures {
        use super::*;
@ -329,8 +329,11 @@ pub mod c {
                Point { x: x_widget, y: y_widget }
            );
-            let state = layout.find_button_by_position(point)
+            let state = {
-                .map(|place| place.button.state.clone());
+                let view = layout.get_current_view();
                view.find_button_by_position(point)
                    .map(|place| place.button.state.clone())
            };
            if let Some(state) = state {
                seat::handle_press_key(
@ -371,7 +374,8 @@ pub mod c {
            let pressed = layout.pressed_keys.clone();
            let button_info = {
-                let place = layout.find_button_by_position(point);
+                let view = layout.get_current_view();
                let place = view.find_button_by_position(point);
                place.map(|place| {(
                    place.button.state.clone(),
                    place.button.clone(),
@ -482,6 +486,8 @@ pub struct Button {
 pub struct Row {
    /// Buttons together with their offset from the left
    pub buttons: Vec<(f64, Box<Button>)>,
    /// Angle is not really used anywhere...
    pub angle: i32,
 }
 impl Row {    
@ -548,14 +554,14 @@ impl View {
        })
    }
-    pub fn get_width(&self) -> f64 {
+    fn get_width(&self) -> f64 {
        // No need to call `get_rows()`,
        // as the biggest row is the most far reaching in both directions
        // because they are all centered.
        find_max_double(self.rows.iter(), |(_offset, row)| row.get_width())
    }
-    pub fn get_height(&self) -> f64 {
+    fn get_height(&self) -> f64 {
        self.rows.iter().next_back()
            .map(|(y_offset, row)| row.get_height() + y_offset)
            .unwrap_or(0.0)
@ -572,21 +578,6 @@ impl View {
            row,
        )}).collect()
    }
    /// Returns a size which contains all the views
    /// if they are all centered on the same point.
    pub fn calculate_super_size(views: Vec<&View>) -> Size {
        Size {
            height: find_max_double(
                views.iter(),
                |view| view.get_height(),
            ),
            width: find_max_double(
                views.iter(),
                |view| view.get_width(),
            ),
        }
    }
 }
 /// The physical characteristic of layout for the purpose of styling
@ -614,8 +605,7 @@ pub struct Layout {
    // Views own the actual buttons which have state
    // Maybe they should own UI only,
    // and keys should be owned by a dedicated non-UI-State?
-    /// Point is the offset within the layout
+    pub views: HashMap<String, View>,
    pub views: HashMap<String, (c::Point, View)>,
    // Non-UI stuff
    /// xkb keymap applicable to the contained keys. Unchangeable
@ -629,12 +619,12 @@ pub struct Layout {
    // When the list tracks actual location,
    // it becomes possible to place popovers and other UI accurately.
    pub pressed_keys: HashSet<::util::Pointer<RefCell<KeyState>>>,
    pub locked_keys: HashSet<::util::Pointer<RefCell<KeyState>>>,
 }
 /// A builder structure for picking up layout data from storage
 pub struct LayoutData {
-    /// Point is the offset within layout
+    pub views: HashMap<String, View>,
    pub views: HashMap<String, (c::Point, View)>,
    pub keymap_str: CString,
    pub margins: Margins,
 }
@ -660,17 +650,13 @@ impl Layout {
            views: data.views,
            keymap_str: data.keymap_str,
            pressed_keys: HashSet::new(),
            locked_keys: HashSet::new(),
            margins: data.margins,
        }
    }
    pub fn get_current_view_position(&self) -> &(c::Point, View) {
        &self.views
            .get(&self.current_view).expect("Selected nonexistent view")
    }
    pub fn get_current_view(&self) -> &View {
-        &self.views.get(&self.current_view).expect("Selected nonexistent view").1
+        self.views.get(&self.current_view).expect("Selected nonexistent view")
    }
    fn set_view(&mut self, view: String) -> Result<(), NoSuchView> {
@ -684,9 +670,16 @@ impl Layout {
    /// Calculates size without margins
    fn calculate_inner_size(&self) -> Size {
-        View::calculate_super_size(
+        Size {
-            self.views.iter().map(|(_, (_offset, v))| v).collect()
+            height: find_max_double(
-        )
+                self.views.iter(),
                |(_name, view)| view.get_height(),
            ),
            width: find_max_double(
                self.views.iter(),
                |(_name, view)| view.get_width(),
            ),
        }
    }
    /// Size including margins
@ -721,42 +714,6 @@ impl Layout {
            scale: 1.0,
        })
    }
    fn find_button_by_position(&self, point: c::Point) -> Option<ButtonPlace> {
        let (offset, layout) = self.get_current_view_position();
        layout.find_button_by_position(point - offset)
    }
    pub fn foreach_visible_button<F>(&self, mut f: F)
        where F: FnMut(c::Point, &Box<Button>)
    {
        let (view_offset, view) = self.get_current_view_position();
        for (row_offset, row) in &view.get_rows() {
            for (x_offset, button) in &row.buttons {
                let offset = view_offset
                    + row_offset.clone()
                    + c::Point { x: *x_offset, y: 0.0 };
                f(offset, button);
            }
        }
    }
    pub fn get_locked_keys(&self) -> Vec<Rc<RefCell<KeyState>>> {
        let mut out = Vec::new();
        let view = self.get_current_view();
        for (_, row) in &view.get_rows() {
            for (_, button) in &row.buttons {
                let locked = {
                    let state = RefCell::borrow(&button.state).clone();
                    state.action.is_locked(&self.current_view)
                };
                if locked {
                    out.push(button.state.clone());
                }
            }
        }
        out
    }
 }
 mod procedures {
@ -808,6 +765,7 @@ mod procedures {
            let row = Row {
                buttons: vec!((0.1, button)),
                angle: 0,
            };
            let view = View {
@ -883,9 +841,9 @@ mod seat {
    #[must_use]
    fn unstick_locks(layout: &mut Layout) -> ViewChange {
        let mut new_view = None;
-        for key in layout.get_locked_keys().clone() {
+        for key in layout.locked_keys.clone() {
            let key: &Rc<RefCell<KeyState>> = key.borrow();
-            let key = RefCell::borrow(key);
+            let mut key = RefCell::borrow_mut(key);
            match &key.action {
                Action::LockView { lock: _, unlock: view } => {
                    new_view = Some(view.clone());
@ -896,6 +854,7 @@ mod seat {
                    a,
                ),
            };
            key.locked = false;
        }
        ViewChange {
@ -916,38 +875,13 @@ mod seat {
                "Key {:?} was already pressed", rckey,
            );
        }
-        let key: KeyState = {
+        let mut key = rckey.borrow_mut();
-            RefCell::borrow(rckey).clone()
+        submission.virtual_keyboard.switch(
-        };
+            &key.keycodes,
-        let action = key.action.clone();
+            PressType::Pressed,
-        match action {
+            time,
-            Action::Submit {
+        );
-                text: Some(text),
+        key.pressed = PressType::Pressed;
                keys: _,
            } => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Text(&text),
                &key.keycodes,
                time,
            ),
            Action::Submit {
                text: None,
                keys: _,
            } => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Keycodes,
                &key.keycodes,
                time,
            ),
            Action::Erase => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Erase,
                &key.keycodes,
                time,
            ),
            _ => {},
        };
        RefCell::replace(rckey, key.into_pressed());
    }
    pub fn handle_release_key(
@ -965,43 +899,38 @@ mod seat {
        // update
        let key = key.into_released();
        let key = match action {
            Action::LockView { lock: _, unlock: _ } => key.into_activated(),
            _ => key,
        };
        // process changes
        match action {
-            Action::Submit { text: _, keys: _ }
+            Action::Submit { text: _, keys: _ } => {
                | Action::Erase
            => {
                unstick_locks(layout).apply();
-                submission.handle_release(KeyState::get_id(rckey), time);
+                submission.virtual_keyboard.switch(
                    &key.keycodes,
                    PressType::Released,
                    time,
                );
            },
            Action::SetView(view) => {
                try_set_view(layout, view)
            },
            Action::LockView { lock, unlock } => {
-                let gets_locked = !key.action.is_locked(&layout.current_view);
+                // The button that triggered this will be in the right state
                // due to commit at the end.
                unstick_locks(layout)
                    // It doesn't matter what the resulting view should be,
                    // it's getting changed anyway.
                    .choose_view(
-                        match gets_locked {
+                        match key.locked {
                            true => lock.clone(),
                            false => unlock.clone(),
                        }
                    )
                    .apply()
            },
            Action::ApplyModifier(modifier) => {
                // FIXME: key id is unneeded with stateless locks
                let key_id = KeyState::get_id(rckey);
                let gets_locked = !submission.is_modifier_active(modifier.clone());
                match gets_locked {
                    true => submission.handle_add_modifier(
                        key_id,
                        modifier, time,
                    ),
                    false => submission.handle_drop_modifier(key_id, time),
                }
            }
            // only show when UI is present
            Action::ShowPreferences => if let Some(ui) = &ui {
                // only show when layout manager is available
@ -1028,11 +957,20 @@ mod seat {
                    }
                }
            },
            Action::SetModifier(_) => log_print!(
                logging::Level::Bug,
                "Modifiers unsupported",
            ),
        };
        let pointer = ::util::Pointer(rckey.clone());
        // Apply state changes
        layout.pressed_keys.remove(&pointer);
        if key.locked {
            layout.locked_keys.insert(pointer);
        } else {
            layout.locked_keys.remove(&pointer);
        }
        // Commit activated button state changes
        RefCell::replace(rckey, key);
    }
@ -1043,11 +981,11 @@ mod test {
    use super::*;
    use std::ffi::CString;
    use ::keyboard::PressType;
    pub fn make_state() -> Rc<RefCell<::keyboard::KeyState>> {
        Rc::new(RefCell::new(::keyboard::KeyState {
            pressed: PressType::Released,
            locked: false,
            keycodes: Vec::new(),
            action: Action::SetView("default".into()),
        }))
@ -1074,6 +1012,7 @@ mod test {
            (
                0.0,
                Row {
                    angle: 0,
                    buttons: vec![(
                        0.0,
                        Box::new(Button {
@ -1086,6 +1025,7 @@ mod test {
            (
                10.0,
                Row {
                    angle: 0,
                    buttons: vec![(
                        0.0,
                        Box::new(Button {
@ -1109,6 +1049,7 @@ mod test {
            (
                0.0,
                Row {
                    angle: 0,
                    buttons: vec![(
                        0.0,
                        Box::new(Button {
@ -1123,6 +1064,7 @@ mod test {
            current_view: String::new(),
            keymap_str: CString::new("").unwrap(),
            kind: ArrangementKind::Base,
            locked_keys: HashSet::new(),
            pressed_keys: HashSet::new(),
            // Lots of bottom margin
            margins: Margins {
@ -1132,7 +1074,7 @@ mod test {
                bottom: 1.0,
            },
            views: hashmap! {
-                String::new() => (c::Point { x: 0.0, y: 0.0 }, view),
+                String::new() => view,
            },
        };
        assert_eq!(
--- a/src/popover.rs
+++ b/src/popover.rs
@ -29,7 +29,6 @@ mod variants {
    use glib::ToVariant;
    use glib::translate::FromGlibPtrFull;
    use glib::translate::FromGlibPtrNone;
    use glib::translate::ToGlibPtr;
    /// Unpacks tuple & array variants
@ -92,7 +91,7 @@ mod variants {
            unsafe {
                let ret = glib_sys::g_variant_builder_end(builder);
                glib_sys::g_variant_builder_unref(builder);
-                glib::Variant::from_glib_none(ret)
+                glib::Variant::from_glib_full(ret)
            }
        }
    }
@ -142,7 +141,7 @@ fn set_layout(kind: String, name: String) {
        .chain(inputs).collect();
    settings.set_value(
        "sources",
-        &variants::ArrayPairString(inputs).to_variant(),
+        &variants::ArrayPairString(inputs).to_variant()
    );
    settings.apply();
 }
--- a/src/resources.rs
+++ b/src/resources.rs
@ -16,16 +16,14 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
    ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
    ("el", include_str!("../data/keyboards/el.yaml")),
    ("es", include_str!("../data/keyboards/es.yaml")),
    ("fi", include_str!("../data/keyboards/fi.yaml")),
    ("gr", include_str!("../data/keyboards/gr.yaml")),
    ("it", include_str!("../data/keyboards/it.yaml")),
    ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")),
    ("jp+kana_wide", include_str!("../data/keyboards/jp+kana_wide.yaml")),
    ("no", include_str!("../data/keyboards/no.yaml")),
    ("number", include_str!("../data/keyboards/number.yaml")),
    ("pl", include_str!("../data/keyboards/pl.yaml")),
    ("pl_wide", include_str!("../data/keyboards/pl_wide.yaml")),
    ("se", include_str!("../data/keyboards/se.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
--- a/src/submission.rs
+++ b/src/submission.rs
@ -17,18 +17,9 @@
 * and those events SHOULD NOT cause any lost events.
 * */
 use std::collections::HashSet;
 use std::ffi::CString;
 use ::action::Modifier;
 use ::imservice;
 use ::imservice::IMService;
 use ::keyboard::{ KeyCode, KeyStateId, Modifiers, PressType };
 use ::util::vec_remove;
 use ::vkeyboard::VirtualKeyboard;
 // traits
 use std::iter::FromIterator;
 /// Gathers stuff defined in C or called by C
 pub mod c {
    use super::*;
@ -65,9 +56,7 @@ pub mod c {
        Box::<Submission>::into_raw(Box::new(
            Submission {
                imservice,
                modifiers_active: Vec::new(),
                virtual_keyboard: VirtualKeyboard(vk),
                pressed: Vec::new(),
            }
        ))
    }
@ -103,144 +92,9 @@ pub mod c {
 #[derive(Clone, Copy)]
 pub struct Timestamp(pub u32);
 enum SubmittedAction {
    /// A collection of keycodes that were pressed
    VirtualKeyboard(Vec<KeyCode>),
    IMService,
 }
 pub struct Submission {
    // used by C callbacks internally, TODO: make use with virtual keyboard
    #[allow(dead_code)]
    imservice: Option<Box<IMService>>,
-    virtual_keyboard: VirtualKeyboard,
+    pub virtual_keyboard: VirtualKeyboard,
    modifiers_active: Vec<(KeyStateId, Modifier)>,
    pressed: Vec<(KeyStateId, SubmittedAction)>,
 }
 pub enum SubmitData<'a> {
    Text(&'a CString),
    Erase,
    Keycodes,
 }
 impl Submission {
    /// Sends a submit text event if possible;
    /// otherwise sends key press and makes a note of it
    pub fn handle_press(
        &mut self,
        key_id: KeyStateId,
        data: SubmitData,
        keycodes: &Vec<KeyCode>,
        time: Timestamp,
    ) {
        let mods_are_on = !self.modifiers_active.is_empty();
        let was_committed_as_text = match (&mut self.imservice, mods_are_on) {
            (Some(imservice), false) => {
                enum Outcome {
                    Submitted(Result<(), imservice::SubmitError>),
                    NotSubmitted,
                };
                let submit_outcome = match data {
                    SubmitData::Text(text) => {
                        Outcome::Submitted(imservice.commit_string(text))
                    },
                    SubmitData::Erase => {
                        /* Delete_surrounding_text takes byte offsets,
                         * so cannot work without get_surrounding_text.
                         * This is a bug in the protocol.
                         */
                        // imservice.delete_surrounding_text(1, 0),
                        Outcome::NotSubmitted
                    },
                    SubmitData::Keycodes => Outcome::NotSubmitted,
                };
                match submit_outcome {
                    Outcome::Submitted(result) => {
                        match result.and_then(|()| imservice.commit()) {
                            Ok(()) => true,
                            Err(imservice::SubmitError::NotActive) => false,
                        }
                    },
                    Outcome::NotSubmitted => false,
                }
            },
            (_, _) => false,
        };
        let submit_action = match was_committed_as_text {
            true => SubmittedAction::IMService,
            false => {
                self.virtual_keyboard.switch(
                    keycodes,
                    PressType::Pressed,
                    time,
                );
                SubmittedAction::VirtualKeyboard(keycodes.clone())
            },
        };
        self.pressed.push((key_id, submit_action));
    }
    pub fn handle_release(&mut self, key_id: KeyStateId, time: Timestamp) {
        let index = self.pressed.iter().position(|(id, _)| *id == key_id);
        if let Some(index) = index {
            let (_id, action) = self.pressed.remove(index);
            match action {
                // string already sent, nothing to do
                SubmittedAction::IMService => {},
                // no matter if the imservice got activated,
                // keys must be released
                SubmittedAction::VirtualKeyboard(keycodes) => {
                    self.virtual_keyboard.switch(
                        &keycodes,
                        PressType::Released,
                        time,
                    )
                },
            }
        };
    }
    pub fn handle_add_modifier(
        &mut self,
        key_id: KeyStateId,
        modifier: Modifier, _time: Timestamp,
    ) {
        self.modifiers_active.push((key_id, modifier));
        self.update_modifiers();
    }
    pub fn handle_drop_modifier(
        &mut self,
        key_id: KeyStateId,
        _time: Timestamp,
    ) {
        vec_remove(&mut self.modifiers_active, |(id, _)| *id == key_id);
        self.update_modifiers();
    }
    fn update_modifiers(&mut self) {
        let raw_modifiers = self.modifiers_active.iter()
            .map(|(_id, m)| match m {
                Modifier::Control => Modifiers::CONTROL,
                Modifier::Alt => Modifiers::MOD1,
            })
            .fold(Modifiers::empty(), |m, n| m | n);
        self.virtual_keyboard.set_modifiers_state(raw_modifiers);
    }
    pub fn is_modifier_active(&self, modifier: Modifier) -> bool {
        self.modifiers_active.iter()
            .position(|(_id, m)| *m == modifier)
            .is_some()
    }
    pub fn get_active_modifiers(&self) -> HashSet<Modifier> {
        HashSet::from_iter(
            self.modifiers_active.iter().map(|(_id, m)| m.clone())
        )
    }
 }
--- a/src/tests.rs
+++ b/src/tests.rs
@ -60,7 +60,7 @@ fn check_layout(layout: Layout) {
    let state = xkb::State::new(&keymap);
    // "Press" each button with keysyms
-    for (_pos, view) in layout.views.values() {
+    for view in layout.views.values() {
        for (_y, row) in &view.get_rows() {
            for (_x, button) in &row.buttons {
                let keystate = button.state.borrow();
--- a/src/util.rs
+++ b/src/util.rs
@ -195,12 +195,6 @@ pub trait WarningHandler {
    fn handle(&mut self, warning: &str);
 }
 /// Removes the first matcing item
 pub fn vec_remove<T, F: FnMut(&T) -> bool>(v: &mut Vec<T>, pred: F) -> Option<T> {
    let idx = v.iter().position(pred);
    idx.map(|idx| v.remove(idx))
 }
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/src/vkeyboard.rs
+++ b/src/vkeyboard.rs
@ -1,6 +1,6 @@
 /*! Managing the events belonging to virtual-keyboard interface. */
-use ::keyboard::{ KeyCode, Modifiers, PressType };
+use ::keyboard::{ KeyCode, PressType };
 use ::layout::c::LevelKeyboard;
 use ::submission::Timestamp;
@ -26,11 +26,6 @@ pub mod c {
            virtual_keyboard: ZwpVirtualKeyboardV1,
            keyboard: LevelKeyboard,
        );
        pub fn eek_virtual_keyboard_set_modifiers(
            virtual_keyboard: ZwpVirtualKeyboardV1,
            modifiers: u32,
        );
    }
 }
@ -38,7 +33,7 @@ pub mod c {
 pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);
 impl VirtualKeyboard {
-    // TODO: error out if keymap not set
+    // TODO: split out keyboard state management
    pub fn switch(
        &self,
        keycodes: &Vec<KeyCode>,
@ -73,16 +68,12 @@ impl VirtualKeyboard {
        }
    }
    pub fn set_modifiers_state(&self, modifiers: Modifiers) {
        let modifiers = modifiers.bits() as u32;
        unsafe {
            c::eek_virtual_keyboard_set_modifiers(self.0, modifiers);
        }
    }
    pub fn update_keymap(&self, keyboard: LevelKeyboard) {
        unsafe {
-            c::eek_virtual_keyboard_update_keymap(self.0, keyboard);
+            c::eek_virtual_keyboard_update_keymap(
                self.0,
                keyboard,
            );
        }
    }
 }
--- a/src/wayland.c
+++ b/src/wayland.c
@ -20,12 +20,6 @@ void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virt
        keyboard->keymap_fd, keyboard->keymap_len);
 }
 void
 eek_virtual_keyboard_set_modifiers(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, uint32_t mods_depressed) {
    zwp_virtual_keyboard_v1_modifiers(zwp_virtual_keyboard_v1,
                                      mods_depressed, 0, 0, 0);
 }
 int squeek_output_add_listener(struct wl_output *wl_output,
                                const struct wl_output_listener *listener, void *data) {
    return wl_output_add_listener(wl_output, listener, data);
--- a/tests/meson.build
+++ b/tests/meson.build
@ -50,14 +50,13 @@ endforeach
 foreach layout : [
    'us', 'us_wide',
    'de', 'de_wide',
    'el',
    'es',
    'fi',
    'gr',
    'it',
    'jp+kana','jp+kana_wide',
    'no',
    'number',
    'pl', 'pl_wide',
    'se',
    'terminal',