Added update to cursor when string is committed

Fixed surrounding text not getting updated
Can preedit_string get removed?
2020-10-13 23:39:27 +02:00 · 2020-10-13 22:43:36 +02:00 · 2020-10-13 22:24:54 +02:00 · 2020-10-12 12:45:13 +00:00 · 2020-10-12 10:51:23 +00:00 · 2020-10-12 10:51:23 +00:00
108 changed files with 5287 additions and 2863 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: debian:buster
+image: debian:bullseye
 stages:
  - build
@ -11,7 +11,7 @@ stages:
 before_script:
  - apt-get -y update
  - apt-get -y install wget ca-certificates gnupg
-  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
  - apt-get -y update
@ -22,11 +22,13 @@ build_docs:
    paths:
      - _build
  script:
-      - apt-get -y install python3-recommonmark python3-sphinx
+      - apt-get -y install python3-pip python3-sphinx
      - pip3 install recommonmark
      - ./doc/build.sh _build
 build_meson:
-  <<: *tags
+  tags:
    - librem5
  stage: build
  artifacts:
    paths:
@ -34,7 +36,7 @@ build_meson:
    expire_in: 3h
  script:
    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
    - ninja -C _build install
 build_deb:
@ -45,20 +47,73 @@ build_deb:
      paths:
        - "*.deb"
    script:
        - rm -f ../*.deb
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
        - cp ../*.deb .
-build_deb:arm64:
+build_deb:amber:
    image: pureos/amber
    tags:
-        - librem5:arm64
+        - librem5
    allow_failure: true
    stage: build
    artifacts:
      paths:
        - "*.deb"
    script:
        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
        - apt-get -y update
        - rm -f ../*.deb
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
        - cp ../*.deb .
 build_deb:buster:
    image: "debian:buster"
    tags:
        - librem5
    stage: build
    artifacts:
      paths:
        - "*.deb"
    script:
        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
        - apt-get -y update
        - rm -f ../*.deb
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
        - cp ../*.deb .
 build_deb:arm64:
    tags:
        - librem5:arm64
    stage: build
    artifacts:
      paths:
        - "*.deb"
    script:
        - rm -f ../*.deb
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
        - cp ../*.deb .
 build_deb:arm64_buster:
    image: "debian:buster"
    tags:
        - librem5:arm64
    stage: build
    artifacts:
      paths:
        - "*.deb"
    script:
        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
        - apt-get -y update
        - rm -f ../*.deb
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
@ -74,10 +129,21 @@ test_lintian:
        - lintian *.deb
 test:
-  <<: *tags
+  tags:
    - librem5
  stage: test
  needs:
    - build_meson
  script:
    - apt-get -y build-dep .
    - ninja -C _build test
 check_release:
  <<: *tags
  stage: test
  only:
    refs:
      - master
  script:
    - apt-get -y install git python3
    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
--- a/Cargo.deps
+++ b/Cargo.deps
@ -0,0 +1,22 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
 regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
 [dependencies.cairo-rs]
 version = "0.7.*"
 [dependencies.gdk]
 version = "0.11.*"
 [dependencies.gio]
 version = "0.7.*"
 features = ["v2_44"]
 [dependencies.glib]
 version = "0.8.*"
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.7.*"
 features = ["v3_22"]
--- a/Cargo.deps.legacy
+++ b/Cargo.deps.legacy
@ -0,0 +1,22 @@
 # Dependencies which change based on build flags
 bitflags = "1.0.*"
 clap = { version = "2.32.*", default-features = false }
 regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
 [dependencies.cairo-rs]
 version = "0.5.*"
 [dependencies.gdk]
 version = "0.9.*"
 [dependencies.gio]
 version = "0.5.*"
 features = ["v2_44"]
 [dependencies.glib]
 version = "0.6.*"
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.5.*"
 features = ["v3_22"]
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,94 +1,75 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
-name = "aho-corasick"
+name = "atk"
-version = "0.7.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-[[package]]
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-name = "ansi_term"
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-version = "0.11.0"
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "atk-sys"
-version = "0.7.0"
+version = "0.9.1"
 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)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "atty"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hermit-abi 0.1.6 (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)",
 ]
 [[package]]
 name = "bitflags"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cairo-rs"
-version = "0.5.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cairo-sys-rs"
-version = "0.7.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (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.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)",
 ]
 [[package]]
 name = "cc"
-version = "1.0.50"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "clap"
-version = "2.32.0"
+version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "dtoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -98,170 +79,164 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "gdk"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-pixbuf"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gio"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gio-sys"
-version = "0.7.0"
+version = "0.9.1"
 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)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "glib"
-version = "0.6.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "glib-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gobject-sys"
-version = "0.7.0"
+version = "0.9.1"
 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)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gtk"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gtk-sys 0.9.2 (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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gtk-sys"
-version = "0.7.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "hermit-abi"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@ -269,12 +244,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.66"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "linked-hash-map"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -282,42 +257,37 @@ name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pango"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pango-sys"
-version = "0.7.0"
+version = "0.9.1"
 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)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -328,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "1.0.7"
+version = "1.0.18"
 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)",
@ -336,110 +306,93 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "regex"
-version = "1.1.9"
+version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (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.13 (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.13"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rs"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 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)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_yaml"
-version = "0.8.11"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "strsim"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "1.0.13"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "textwrap"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@ -450,16 +403,6 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "utf8-ranges"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "vec_map"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi"
 version = "0.3.8"
@ -484,68 +427,60 @@ name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "yaml-rust"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [metadata]
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
-"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
-"checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
-"checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
-"checksum gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc52c7244046df9d959df87289f1fc5cca23f9f850bab0c967963e2ecb83a96"
+"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
-"checksum gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
+"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
-"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
+"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
-"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
+"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
-"checksum gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29a44b051990573448edc80b1995237f8b97b5734d2aec05105b9242aa10af11"
+"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
-"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
+"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
-"checksum glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a333edf5b9f1411c246ef14e7881b087255f04c56dbef48c64a0cb039b4b340"
+"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
-"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
+"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
-"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
+"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
-"checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
+"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
-"checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
+"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
 "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 "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 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
-"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
+"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
+"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
-"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
-"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "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"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
+"checksum yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@ -2,46 +2,39 @@
 name = "rs"
 version = "0.1.0"
-[dependencies]
+[lib]
-bitflags = "1.0.*"
+name = "rs"
-clap = "2.32.*"
+path = "@path@/src/lib.rs"
-maplit = "1.0.*"
+crate-type = ["staticlib", "rlib"]
 regex = "1.1.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
-[dependencies.cairo-rs]
+# Cargo can't do autodiscovery if Cargo.toml is not in the root.
-version = "0.5.*"
+[[bin]]
 name = "test_layout"
 path = "@path@/src/bin/test_layout.rs"
 [[example]]
 name = "test_layout"
 path = "@path@/examples/test_layout.rs"
 [features]
 gio_v0_5 = []
 gtk_v0_5 = []
 # Dependencies which don't change based on build flags
 [dependencies.cairo-sys-rs]
 version = ""
 [dependencies.gdk]
 version = ""
 [dependencies.gio]
 version = ""
 features = ["v2_44"]
 [dependencies.glib]
 version = ""
 features = ["v2_44"]
 [dependencies.glib-sys]
 version = ""
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.5.*"
 features = ["v3_22"]
 [dependencies.gtk-sys]
 version = ""
 features = ["v3_22"]
-
+[dependencies]
-[lib]
+maplit = "1.0.*"
-name = "rs"
+serde = { version = "1.0.*", features = ["derive"] }
-path = "src/lib.rs"
+serde_yaml = "0.8.*"
-crate-type = ["staticlib", "rlib"]
+xkbcommon = { version = "0.4.*", features = ["wayland"] }
 # Here is inserted the Cargo.deps file
--- a/README.md
+++ b/README.md
@ -30,30 +30,43 @@ Building
 ### Dependencies
-See `.gitlab-ci.yml`.
+See `.gitlab-ci.yml` or run `apt-get build-dep .`
 ### Build from git repo
-```
+```bash
 $ git clone https://source.puri.sm/Librem5/squeekboard.git
 $ cd squeekboard
-$ mkdir ../build
+$ mkdir _build
-$ meson ../build/
+$ meson _build/
-$ cd ../build
+$ cd _build
-$ ninja test
+$ ninja
 $ ninja install
 ```
 To run tests use `ninja test`. To install squeekboard run `ninja install`.
 Running
 -------
-```
+```bash
 $ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```
 Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
 ```bash
 $ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
 ```
 To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with:
 ```bash
 busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 Developing
 ----------
-See `HACKING.md`
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
--- a/cargo.sh
+++ b/cargo.sh
@ -13,5 +13,10 @@ CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
 cd "$SOURCE_DIR"
-cargo "$@"
+
 # the 'run" command takes arguments at the end,
 # so --manifest-path must not be last
 CMD="$1"
 shift
 cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -0,0 +1,89 @@
 ---
 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:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -0,0 +1,89 @@
 ---
 outlines:
    default:   { width: 54,  height: 42 }
    altline:   { width: 81,  height: 42 }
    wide:      { width: 100, height: 42 }
    spaceline: { width: 205, height: 42 }
    special:   { width: 54,  height: 42 }
 views:
    base:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@ -0,0 +1,78 @@
 ---
 outlines:
    default: { width: 35.33, height: 52 }
    altline: { width: 52.67, height: 52 }
    wide: { width: 62, height: 52 }
    spaceline: { width: 142, 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     , 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     period Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "à À á Á ã Ã â Â é É"
        - "show_symbols   ê Ê í Í ó Ó ô Ô"
        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
    symbols:
        - "@ # $ % - + ÷ × = ≠"
        - "( ) § & < > / * { }"
        - "show_numbers_from_symbols     º \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: show_prefs
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "1ã"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "1ã"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    period:
        outline: "special"
        text: "."
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: "erase"
    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"
-        keysym: "BackSpace"
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -0,0 +1,98 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
    wide: { width: 62, height: 52 }
    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, 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        .    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        .    Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' : ; ! ?  BackSpace"
        - "show_letters preferences         space        .    Return"
    symbols:
        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
        outline: "altline"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    ".":
        outline: altline
    space:
        outline: spaceline
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    U00B7:
        text: "·"
    squareroot:
        text: "√"
    Greek_pi:
        text: "π"
    division:
        text: "÷"
    multiply:
        text: "×"
    paragraph:
        text: "¶"
    Greek_tau:
        text: "τ"
    copyright:
        text: "©"
    U00AE:
        text: "®"
    U00A3:
        text: "£"
    EuroSign:
        text: "€"
    U00A5:
        text: "¥"
    asciicircum:
        text: "^"
    degree:
        text: "°"
--- a/data/keyboards/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@ -1,16 +1,80 @@
 ---
 outlines:
    default: { width: 52, height: 52 }
-    altline: { width: 52, height: 52 }
+    altline: { width: 40, height: 52 }
    narrow: { width: 22, height: 52 }
 views:
    base:
        - "😀 😁 😅 😂 😊 😇 🙃"
        - "😍 😘 😋 😜 😎 🥳 😔"
        - "😢 😭 😡 😱 🤔 😬 🙄"
-        - "preferences 🤨 🤓 😴 🤢 🤮 😈"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
    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"
-        keysym: "BackSpace"
+        action: "erase"
    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"
-        keysym: "BackSpace"
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -0,0 +1,89 @@
 ---
 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:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -0,0 +1,89 @@
 ---
 outlines:
    default:   { width: 54,  height: 42 }
    altline:   { width: 81,  height: 42 }
    wide:      { width: 100, height: 42 }
    spaceline: { width: 205, height: 42 }
    special:   { width: 54,  height: 42 }
 views:
    base:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -13,22 +13,22 @@ views:
        - "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 show_eschars preferences         space        , period Return"
+        - "show_numbers show_eschars preferences         space        , . 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 show_eschars preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? . Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
    eschars:
        - "á é í ó ú Á É Í Ó Ú"
        - "à è ì ò « » ù ! { }"
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "default"
@ -76,12 +76,10 @@ buttons:
            set_view: "eschars"
        outline: "altline"
        label: "àè"
    period:
        outline: "default"
        label: "."
    space:
        outline: "spaceline"
        label: " "
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -195,7 +195,7 @@ buttons:
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: erase
    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"
-        keysym: "BackSpace"
+        action: erase
    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"
-        keysym: "BackSpace"
+        action: erase
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/number.yaml
+++ b/data/keyboards/number.yaml
@ -16,14 +16,14 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: erase
    space:
        outline: spaceline
        text: " "
    Return:
        outline: outline7
        icon: "key-enter"
-        keysym: "BackSpace"
+        keysym: "Return"
    asterisk:
        text: "*"
    numbersign:
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -0,0 +1,110 @@
 ---
 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
@ -0,0 +1,102 @@
 ---
 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/ru.yaml
+++ b/data/keyboards/ru.yaml
@ -0,0 +1,94 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 32, height: 52 }
    wide: { width: 57, height: 52 }
    narrow: { width: 26, height: 52 }
    spaceline: { width: 107, height: 52 }
    fill: { width: 159, height: 52 }
    special: { width: 42, height: 52 }
 views:
    base:
        - "й ц у к е н г ш щ з х"
        - "ф ы в а п р о л д ж э"
        - "Shift_L  я ч с м и т ь б ю  BackSpace"
        - "show_numbers preferences    ё  space  ъ  period Return"
    upper:
        - "Й Ц У К Е Н Г Ш Щ З Х"
        - "Ф Ы В А П Р О Л Д Ж Э"
        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ё  space  Ъ  comma Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space_fill   period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space_fill   period Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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: "wide"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "wide"
        label: "*/="
    period:
        outline: "special"
        text: "."
    comma:
        outline: "special"
        text: ","
    space:
        outline: "spaceline"
        text: " "
    space_fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    ё:
        outline: "narrow"
    Ё:
        outline: "narrow"
    ъ:
        outline: "narrow"
    Ъ:
        outline: "narrow"
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -2,9 +2,10 @@
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
+    wide: { width: 64,  height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 142, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    special: { width: 44, height: 52 }
 views:
    base:
@ -25,7 +26,7 @@ views:
    symbols:
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
@ -37,22 +38,27 @@ buttons:
        outline: "altline"
        icon: "key-shift"
    BackSpace:
-        outline: "altline"
+        outline: altline
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: erase
    preferences:
        action: "show_prefs"
-        outline: "altline"
+        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        outline: "wide"
        action:
            set_view: "numbers"
-        outline: "altline"
+        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: altline
        label: "123"
    show_letters:
        outline: "wide"
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
@ -60,7 +66,7 @@ buttons:
        outline: "altline"
        label: "*/="
    ".":
-        outline: altline
+        outline: "special"
    space:
        outline: spaceline
        text: " "
@ -156,4 +162,3 @@ buttons:
        text: "["
    bracketright:
        text: "]"
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -1,38 +1,44 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
+    default: { width: 35.33, height: 46 }
-    action:  { width: 59,    height: 52 }
+    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 52 }
+    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 52 }
+    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 52 }
+    spaceline: { width: 140, height: 46 }
-    special: { width: 44, height: 52 }
+    special: { width: 44, height: 46 }
    small: { width: 59, height: 22 }
 views:
    base:
        - "Ctrl Alt ↑ ↓ ← →"
        - "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 show_actions      space        preferences Return"
+        - "show_numbers preferences      space        show_actions Return"
    upper:
        - "Ctrl Alt PgUp PgDn Home End"
        - "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        period Return"
+        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
+        - "* # $ / & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "Ctrl Alt ↑ ↓ ← →"
        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
+        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Del PgUp ↑ PgDn"
+        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Home End ← ↓ →"
+        - "show_letters Menu Break Left Down Right"
 buttons:
    Shift_L:
@ -45,7 +51,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: erase
    preferences:
        action: "show_prefs"
        outline: "special"
@ -69,14 +75,14 @@ buttons:
        action:
            set_view: "symbols"
        outline: "altline"
-        label: "*/="
+        label: "τ=\\"
    show_actions:
        action:
            set_view: "actions"
        outline: "altline"
        label: ">_"
    period:
-        outline: "special"
+        outline: "altline"
        text: "."
    space:
        outline: "spaceline"
@ -132,28 +138,67 @@ buttons:
    Del:
        outline: "action"
        keysym: "Delete"
-    Home:
+    Insert:
        outline: "action"
        keysym: "Insert"
    Menu:
        outline: "action"
        keysym: "Menu"
    Pause:
        outline: "action"
        keysym: "Pause"
    Menu:
        outline: "action"
        keysym: "Menu"
    Break:
        outline: "action"
        keysym: "Break"
    Home:
        outline: "small"
        keysym: "Home"
    End:
-        outline: "action"
+        outline: "small"
        keysym: "End"
    PgUp:
-        outline: "action"
+        outline: "small"
        keysym: "Page_Up"
    PgDn:
-        outline: "action"
+        outline: "small"
        keysym: "Page_Down"
    "↑":
-        outline: "action"
+        outline: "small"
        keysym: "Up"
    "↓":
-        outline: "action"
+        outline: "small"
        keysym: "Down"
    "←":
-        outline: "action"
+        outline: "small"
        keysym: "Left"
    "→":
        outline: "small"
        keysym: "Right"
    Up:
        label: "↑"
        outline: "action"
        keysym: "Up"
    Left:
        label: "←"
        outline: "action"
        keysym: "Left"
    Down:
        label: "↓"
        outline: "action"
        keysym: "Down"
    Right:
        label: "→"
        outline: "action"
        keysym: "Right"
    Ctrl:
        modifier: "Control"
        outline: "small"
        label: "Ctrl"
    Alt:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
--- a/data/keyboards/terminal_wide.yaml
+++ b/data/keyboards/terminal_wide.yaml
@ -0,0 +1,211 @@
 ---
 outlines:
    default:   { width: 54,   height: 37 }
    action:    { width: 90,   height: 37 }
    altline:   { width: 81,   height: 37 }
    wide:      { width: 90,   height: 37 }
    spaceline: { width: 225,  height: 37 }
    special:   { width: 54,   height: 37 }
    small:     { width: 67.4, height: 22 }
 views:
    base:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "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_actions Return"
    upper:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "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_actions Return"
    numbers:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
        - "* # $ / & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° @ { }"
        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
        - "show_letters Menu Break Left Down Right"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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_actions:
        action:
            set_view: "actions"
        outline: "altline"
        label: ">_"
    period:
        outline: "altline"
        text: "."
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    F1:
        outline: "action"
        keysym: "F1"
    F2:
        outline: "action"
        keysym: "F2"
    F3:
        outline: "action"
        keysym: "F3"
    F4:
        outline: "action"
        keysym: "F4"
    F5:
        outline: "action"
        keysym: "F5"
    F6:
        outline: "action"
        keysym: "F6"
    F7:
        outline: "action"
        keysym: "F7"
    F8:
        outline: "action"
        keysym: "F8"
    F9:
        outline: "action"
        keysym: "F9"
    F10:
        outline: "action"
        keysym: "F10"
    F11:
        outline: "action"
        keysym: "F11"
    F12:
        outline: "action"
        keysym: "F12"
    Esc:
        outline: "action"
        keysym: "Escape"
    EscSmall:
        outline: "small"
        keysym: "Escape"
        label: "Esc"
    Tab:
        outline: "action"
        keysym: "Tab"
    TabSmall:
        outline: "small"
        keysym: "Tab"
        label: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
    Insert:
        outline: "action"
        keysym: "Insert"
    Menu:
        outline: "action"
        keysym: "Menu"
    Pause:
        outline: "action"
        keysym: "Pause"
    Menu:
        outline: "action"
        keysym: "Menu"
    Break:
        outline: "action"
        keysym: "Break"
    Home:
        outline: "small"
        keysym: "Home"
    End:
        outline: "small"
        keysym: "End"
    PgUp:
        outline: "small"
        keysym: "Page_Up"
    PgDn:
        outline: "small"
        keysym: "Page_Down"
    "↑":
        outline: "small"
        keysym: "Up"
    "↓":
        outline: "small"
        keysym: "Down"
    "←":
        outline: "small"
        keysym: "Left"
    "→":
        outline: "small"
        keysym: "Right"
    Up:
        label: "↑"
        outline: "action"
        keysym: "Up"
    Left:
        label: "←"
        outline: "action"
        keysym: "Left"
    Down:
        label: "↓"
        outline: "action"
        keysym: "Down"
    Right:
        label: "→"
        outline: "action"
        keysym: "Right"
    Ctrl:
        modifier: "Control"
        outline: "small"
        label: "Ctrl"
    Alt:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
--- a/data/keyboards/ua.yaml
+++ b/data/keyboards/ua.yaml
@ -0,0 +1,94 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 32, height: 52 }
    wide: { width: 57, height: 52 }
    narrow: { width: 26, height: 52 }
    spaceline: { width: 107, height: 52 }
    fill: { width: 159, height: 52 }
    special: { width: 42, height: 52 }
 views:
    base:
        - "й ц у к е н г ш щ з х"
        - "ф і в а п р о л д ж є"
        - "Shift_L  я ч с м и т ь б ю  BackSpace"
        - "show_numbers preferences    ґ  space  ї  period Return"
    upper:
        - "Й Ц У К Е Н Г Ш Щ З Х"
        - "Ф І В А П Р О Л Д Ж Є"
        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ґ  space  Ї  comma Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space_fill   period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space_fill   period Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    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: "wide"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "wide"
        label: "*/="
    period:
        outline: "special"
        text: "."
    comma:
        outline: "special"
        text: ","
    space:
        outline: "spaceline"
        text: " "
    space_fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    ґ:
        outline: "narrow"
    Ґ:
        outline: "narrow"
    ї:
        outline: "narrow"
    Ї:
        outline: "narrow"
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -39,9 +39,9 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
+        action: erase
    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"
-        keysym: "BackSpace"
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/langs/de-DE.txt
+++ b/data/langs/de-DE.txt
@ -1,8 +0,0 @@
 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,10 +1,2 @@
-us English (US)
+emoji Emoji
-de German
+terminal Terminal
 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
@ -1,8 +0,0 @@
 us 英語 (US)
 de ドイツ語
 el ギリシャ語
 es スペイン語
 it イタリア語
 jp+kana 日本語 (かな)
 nb ノルウェー語
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -1,9 +1,2 @@
-us angielski (USA)
+emoji emoji
-de niemiecki
+terminal terminal
 el grecki
 es hiszpański
 fi fiński
 it włoski
 jp+kana japoński (kana)
 no norweski
 se szwedzki
--- a/data/langs/ru-RU.txt
+++ b/data/langs/ru-RU.txt
@ -0,0 +1,11 @@
 de Немецкий
 es Испанский
 fi Финский
 gr Греческий
 it Итальянский
 no Норвежский
 pl Польский
 ru Русский
 se Шведский
 terminal Терминал
 us Английский (США)
--- a/data/meson.build
+++ b/data/meson.build
@ -7,13 +7,20 @@ squeekboard_resources = gnome.compile_resources(
   c_name: 'squeekboard',
 )
 desktopconf = configuration_data()
 desktopconf.set('bindir', bindir)
 desktop_file = 'sm.puri.Squeekboard.desktop'
 i18n.merge_file('desktop',
-    input: desktop_file + '.in',
+    input: configure_file(
      input: desktop_file + '.in.in',
      output: desktop_file + '.in',
      configuration: desktopconf
    ),
    output: desktop_file,
    po_dir: '../po',
    install: true,
-    install_dir: join_paths(datadir, 'applications'),
+    install_dir: desktopdir,
    type: 'desktop'
 )
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -2,7 +2,7 @@
 Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
-Exec=squeekboard
+Exec=@bindir@/squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -2,6 +2,7 @@ sq_view {
    background-color: rgba(0, 0, 0, 255);
    color: #ffffff;
    font-family: cantarell, sans-serif;
    font-size: 25px;
 }
 sq_view sq_button {
@ -35,6 +36,14 @@ sq_button.locked {
    color: #2b292f;
 }
 sq_button.action {
    font-size: 0.75em;
 }
 sq_button.small {
    font-size: 0.5em;
 }
 #Return {
    background: #1c71d8;
    border-color: #1a5fb4;
--- a/data/style.css
+++ b/data/style.css
@ -2,6 +2,7 @@ sq_view {
    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
    color: @theme_text_color; /*#ffffff;*/
    font-family: cantarell, sans-serif;
    font-size: 25px;
 }
 sq_view sq_button {
@ -38,6 +39,14 @@ sq_button.locked {
    color: @theme_bg_color; /*#2b292f;*/
 }
 sq_button.action {
    font-size: 0.75em;
 }
 sq_button.small {
    font-size: 0.5em;
 }
 #Return {
    background: @theme_selected_bg_color; /* #1c71d8; */
    border-color: @borders; /*#1a5fb4;*/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,197 @@
 squeekboard (1.9.3) amber-phone; urgency=medium
  [ Björn Tantau ]
  * Show more useful keys at the same time.
  * Add Ctrl and Alt modifier keys.
  * Add missing Ê key.
  * Make f-keys slightly wider.
  * Add Menu key.
  [ Guido Günther ]
  * d/rules: Only remove Cargo.lock if it exists
  * eek: Drop libcanberra usage
  * debian: Build-depend on libfeedback
  * eek-gtk-keyboard: Trigger event feedback on button press (Closes: #166)
  [ Dorota Czaplejewicz ]
  * build: Add missing gio-unix dependency
  * build: Make compatible with Debian Bullseye
  * debian: Add amber to legacy distro list
  * ci: Add amber job
  * debian: Require lsb-release
  * size: Hardcode size to work around screen rotation
  * ci: Re-add x64 Buster build
  * italian: Fix space and period
  [ Sebastian Krzyszkowiak ]
  * Revert "Merge branch 'btantau-master-patch-76686' into 'master'"
  * Terminal layout: another approach
  [ Luís Fernando Stürmer da Rosa ]
  * Brazilian Portuguese Keyboard Layout.
 -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Wed, 05 Aug 2020 16:16:08 +0200
 squeekboard (1.9.2) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * keyboard: Remove unused code
  * gsettings: Don't crash when unavailable
  * dbus: Don't crash if can't make a connection
  * gsettings: Don't crash on switching when unavailable
  * layout: Split out choice to a struct on its own
  * renderer: Simplify by dropping gobjectness
  * levelkeyboard: Rearrange to make future conversion easier
  * layout: Minor generalizations
  * Remove unused code
  * sizing: Create a standalone UI shape manager
  * sizing: Ignore scaling factor for layout selection
  * CI: Fix typo
  * Update rust deps for release
  [ Andreas Rönnquist ]
  * Swedish keyboard, wide button switching between numbers, symbols and base
  * More fixes of button sizes
  * Folder is doc, not docs
  [ uzanto ]
  * Add new file
  * Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing
  [ Arnaud Ferraris ]
  * keyboards: fr: fix keyboard layout
  * keyboards: fr: make sure the layout fits the screen
  * resources: include French keyboard layout
  * keyboards: fr: improve consistency with other layouts
  * keyboards: fr: improve diacritics layout
  * tests: add french layout
  [ Vlad ]
  * Fresh Russian layout
  [ Jordi Masip ]
  * Removed unused dependency 'libcroco'
  [ Florian Klink ]
  * sm.puri.Squeekboard.desktop: make path to Exec= absolute
  [ Ole Guldberg ]
  * Danish keyboard layout
  * Danish keyboard layout
  * add test for danish layout
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 01 Jun 2020 09:39:12 +0000
 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 ]
  * action: Rename Level to View
  * keyboard: Introduce a KeyCode type wrapping u32
  * layout: Centralize handling key releases
  * layout: Make handling presses uniform
  * UI: Drop indirection for show/hide functions
  * managers: Move visible flag to UI manager
  * dbus_service: Remove unused function
  * dbus: Remove unneeded gobjectness
  * dbus: Rename handler from eekboard_service
  * context: Moved keymap setting together with its generation
  * key-emitter: Remove unused
  * eekboard_context_service: Drop unused enable property
  * services: Split out layout management from EekboardContextService
  * submission: Move away from virtual-keyboard
  * submission: Create a new wrapper over imservice
  * imservice: Limited scope of unsafe
  * EekGtkKeyboard: Use a direct reference to EekboardContext
  * submission: Take over virtual_keyboard handling
  * keyboard: Cleanups of unused code
  * levelkeyboard: Drop unused manager references
  * keyboard: Gather up keymap handling, drop layout
  * submission: Remove wildcard reexport
  * imservice: Rename commit_state to done to match protocol
  * ci: Clean up `..` before it's searched for artifacts
  * dbus: Log error on dbus exit
  * logging: Try to improve common operations
  * imservice: Return something more resembling an Error on failure
  * logging: Unified to remove random eprint calls
  * press_key: Use proper logging
  * number: Fix keysym for Return
  * build: Strip clap of optional features
  * layouts: Fix segfault on switching to wide
  * font: Use font from style context
  * font: Only pass relevant data to label renderer
  [ Sebastian Krzyszkowiak ]
  * layout: terminal: Swap positions of preferences and actions button
  * layout: terminal: Show actions button on all views
  * layout: terminal: Replace actions button with period on symbols view
  [ Dorota Czaplejewicz ]
  * setup: Connect ui to the state manager
  * debian: Add missing commas
  [ David Boddie ]
  * Tidy build file and docs
  * Use pip to install recommonmark
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Fri, 31 Jan 2020 09:59:12 +0000
 squeekboard (1.8.0) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
--- a/debian/check_release.py
+++ b/debian/check_release.py
@ -0,0 +1,10 @@
 #!/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/debian/control
+++ b/debian/control
@ -11,7 +11,7 @@ Build-Depends:
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
- libcroco3-dev,
+ libfeedback-dev,
 librust-bitflags-1-dev (>= 1.0),
 librust-clap-2+default-dev (>= 2.32),
 librust-gio+v2-44-dev,
@ -25,6 +25,7 @@ Build-Depends:
 librust-serde-yaml-0.8-dev (>= 0.8),
 librust-xkbcommon-0.4+wayland-dev (>= 0.4),
 libwayland-dev (>= 1.16),
 lsb-release,
 rustc,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
@ -35,8 +36,10 @@ Architecture: linux-any
 Depends:
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
- ${shlibs:Depends}
+ ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
 Breaks:
 librem5-base (<< 24),
 Description: On-screen keyboard for Wayland
 Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
@ -45,8 +48,8 @@ Architecture: linux-any
 Depends:
 python3,
 python3-gi,
- ${shlibs:Depends}
+ ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
 Description: Resources for making Squeekboard layouts
 Tools for creating and testing Squeekboard layouts:
 .
--- a/debian/rules
+++ b/debian/rules
@ -3,13 +3,20 @@
 export CARGO_HOME = $(CURDIR)/debian/cargo
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 distrel := $(shell lsb_release --codename --short)
 ifneq (,$(filter $(distrel),buster amber))
 	legacy = true
 else
 	legacy = false
 endif
 %:
 	dh $@ --builddirectory=_build --buildsystem=meson
 # The Debian version of linked-hash-map doesn't provide any hash,
 # causing Cargo to refuse to build with a crates.io copy
-build-arch:
+override_dh_auto_configure:
-	rm Cargo.lock
+	[ ! -f Cargo.lock ] || rm Cargo.lock
-	dh $@ --builddirectory=_build --buildsystem=meson
+	dh_auto_configure -- -Dlegacy=$(legacy)
 override_dh_autoreconf:
--- a/doc/build.sh
+++ b/doc/build.sh
@ -12,6 +12,10 @@ TARGET_DIR="${1:-./}"
 SPHINX=sphinx-build
 if [ ! -d $DOCS_DIR/_static ]; then
    mkdir -p $DOCS_DIR/_static
 fi
 if ! which sphinx-build ; then
    SPHINX=sphinx-build-3
 fi
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -3,15 +3,47 @@ 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.
 Notwithstanding 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 behavior,
 - 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 usable,
 - 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 benefiting the user compared to those benefiting regular contributors.
 Sending patches
 ---------------
-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).
+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).
 Development environment
 -----------------------
-*Squeekboard* is regularly built and tested on [the develpment environment](https://developer.puri.sm/Librem5/Development_Environment.html).
+*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html).
 Recent Fedora releases are likely to be tested as well.
@ -24,8 +56,7 @@ 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
+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.
 [`debian/control`](./debian/control) file.
 Testing
 -------
@ -131,7 +162,7 @@ Maintenance
 Squeekboard uses Rust & Cargo for some of its dependencies.
-Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
+Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positional arguments: source directory, and output artifact. So, `cargo test` becomes:
 ```
 cd build_dir
@ -144,10 +175,11 @@ All Cargo dependencies must be selected in the version available in PureOS, and
 Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.
-`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
+`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It must correspond to the default dependency configuration: without flags to use older or newer versions of dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
 ```
 cd build_dir
 ninja build src/Cargo.toml
 sh /source_path/cargo.sh update
 ninja test
 ```
--- a/doc/index.md
+++ b/doc/index.md
@ -5,17 +5,23 @@ Contents
 --------
 * [Tutorial](tutorial.md)
 * [Contributing](hacking.md)
 Introduction
 ------------
-Squeekboard is the on-screen keyobard for the Librem 5 phone. For more information, 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 information about building, 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
@ -1,53 +1,92 @@
-Kareema's guide to creating layouts
+A guide to creating layouts
-===================================
+===========================
 This guide is based on the original Kareema's [forum post](https://forums.puri.sm/t/translations-and-virtual-touch-keyboards-tracking-localization/7669/48).
 It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.
-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections welcome.
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
-**Get one of the existing keyboard layouts**
+## Creating a new layout
 Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
 ### Get one of the existing keyboard layouts
 * You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory `data/keyboard/` in the `.yaml` files
+* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
 * Take a look and try to understand them :slight_smile:
-**Fork your own copy of squeekboard**
+
 ### Creating the keyboard layout
 * To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
 * The correct name of the .yaml file can be found with the command 
 ```
 gsettings get org.gnome.desktop.input-sources sources
 ```
 The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
 So for example “de.yaml” would be the correct name for the German keyboard layout.
 If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
 ### Testing the layout
 Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
 You can also use the `test_layout` tool from the -devel package to check it for errors:
 ```
 # squeekboard_test_layout ./mylayout.yaml
 Test result: OK
 ```
 ## Contributing your changes
 If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project.
 Above all, your layout should be working, be tested, not break anything, and make sense.
 ### Fork your own copy of squeekboard
 * Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
 * Clone your fork locally with `git clone` and use the uri of your forked repo there
-**Workflow to edit your keyboard and get it merged**
+### Edit your keyboard and get it merged
-* A generic guide how the workflow to contribute works, can be found at https://developer.puri.sm/Librem5/Contact/Contributing.html
+* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html)
 * Create a branch: Name it “keyboard-layout-mylanguage” or whatever
 * Checkout your branch, edit your keyboard layout and commit your changes
 * Your layout **must** be correctly named, and in `data/keyboards/`.
 * Your layout **must** pass the `test_layout` tool with zero problems.
 * Your translation **must** be correctly named, and in `data/langs/`.
 * Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
 ### Get it merged
 It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard).
 * Push the local changes (to the branch of your fork of squeekboard)
 * Create a merge request for the branch to get your changes merged to the official squeekboard git repository
-**Compile squeekboard**
+If your changes pass automated tests (CI), then the merge request will be reviewed by the maintainers, and you might be asked to change a thing or two.
 ## Compiling and running Squeekboard
 If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there.
 ### Compile squeekboard
 * Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
-**Running squeekboard**
+### Run 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 https://source.puri.sm/Librem5/squeekboard/blob/master/HACKING.md#testing
+* Additionally take a look at the contribution document for [testing info](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`
 Squeekboard can be installed from there as a Debian package, too (that’s what I often do). But beware - there be dragons! You could bork your system with these packages and you should probably disable this repository again after installing what you need - these packages are not meant for production systems (or so I heard :wink: )
 **Creating the keyboard layout**
 * To be written: For the time being, take a look at [Using non-latin language on Librem 5 ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
 * The correct name of the .yaml file can be found with the command `gsettings get org.gnome.desktop.input-sources sources`
 The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
 So f.ex. “de.yaml” would be the correct name for the German keyboard layout.
 * The translations for the keyboard layout names in the different languages can be found at `data/langs/`
 * Don’t forget to add your newly created layout or translation to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it)
 **Testing the layout**
 * Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard
 * To test the translations in `data/langs/` , you have to compile squeekboard
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -38,8 +38,6 @@ struct _EekElementClass
    GObjectClass parent_class;
 };
 GType        eek_element_get_type              (void) G_GNUC_CONST;
 void         eek_element_set_name              (EekElement  *element,
                                                const gchar *name);
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -25,10 +25,6 @@
 #include "config.h"
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
 #include <math.h>
 #include <string.h>
@ -39,24 +35,24 @@
 #include "eekboard/eekboard-context-service.h"
 #include "src/layout.h"
 #include "src/submission.h"
-enum {
+#define LIBFEEDBACK_USE_UNSTABLE_API
-    PROP_0,
+#include <libfeedback.h>
    PROP_LAST
 };
-/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
+#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
   GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif
 typedef struct _EekGtkKeyboardPrivate
 {
-    EekRenderer *renderer;
+    EekRenderer *renderer; // owned, nullable
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
+    EekboardContextService *eekboard_context; // unowned reference
    struct submission *submission; // unowned reference
    struct squeek_layout_state *layout; // unowned
    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
    GdkEventSequence *sequence; // unowned reference
    LfbEvent *event;
 } EekGtkKeyboardPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
@ -85,31 +81,57 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);
    if (!priv->keyboard) {
        return FALSE;
    }
    if (!priv->renderer) {
        PangoContext *pcontext = gtk_widget_get_pango_context (self);
-        priv->renderer = eek_renderer_new (priv->keyboard, pcontext);
+        priv->renderer = eek_renderer_new (
                    priv->keyboard,
                    pcontext);
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation.width,
                                          allocation.height);
        eek_renderer_set_scale_factor (priv->renderer,
                                       gtk_widget_get_scale_factor (self));
    }
-    eek_renderer_render_keyboard (priv->renderer, cr);
+    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
    return FALSE;
 }
 // Units of virtual pixels size
 static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 540) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
    EekGtkKeyboardPrivate *priv =
        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type(
                (uint32_t)(allocation->width - allocation->x),
                (uint32_t)(allocation->height - allocation->y));
    if (priv->layout->arrangement != new_type) {
        priv->layout->arrangement = new_type;
        uint32_t time = gdk_event_get_time(NULL);
        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
    }
    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation->width,
                                          allocation->height);
@ -117,12 +139,28 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
        size_allocate (self, allocation);
 }
 static void
 on_event_triggered (LfbEvent      *event,
                    GAsyncResult  *res,
                    gpointer      unused)
 {
    g_autoptr (GError) err = NULL;
    if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
        g_warning ("Failed to trigger feedback for '%s': %s",
                   lfb_event_get_event (event), err->message);
    }
 }
 static void depress(EekGtkKeyboard *self,
                    gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
-    squeek_layout_depress(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+        return;
    }
    squeek_layout_depress(priv->keyboard->layout,
                          priv->submission,
                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }
@ -130,18 +168,25 @@ static void drag(EekGtkKeyboard *self,
                 gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+    if (!priv->keyboard) {
        return;
    }
    squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                       priv->submission,
                       x, y, eek_renderer_get_transformation(priv->renderer), time,
-                       priv->keyboard->manager, self);
+                       priv->eekboard_context, self);
 }
 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
-    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+        return;
    }
    squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                          priv->submission,
                          eek_renderer_get_transformation(priv->renderer), time,
-                          priv->keyboard->manager, self);
+                          priv->eekboard_context, self);
 }
 static gboolean
@ -229,7 +274,8 @@ eek_gtk_keyboard_real_unmap (GtkWidget *self)
    if (priv->keyboard) {
        squeek_layout_release_all_only(
-            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            priv->keyboard->layout,
            priv->submission,
            gdk_event_get_time(NULL));
    }
@ -257,18 +303,24 @@ eek_gtk_keyboard_dispose (GObject *object)
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    if (priv->renderer) {
-        g_object_unref (priv->renderer);
+        eek_renderer_free(priv->renderer);
        priv->renderer = NULL;
        priv->renderer = NULL;
    }
    if (priv->keyboard) {
        squeek_layout_release_all_only(
-            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            priv->keyboard->layout,
            priv->submission,
            gdk_event_get_time(NULL));
        priv->keyboard = NULL;
    }
    if (priv->event) {
        g_clear_object (&priv->event);
        lfb_uninit ();
    }
    G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }
@ -300,26 +352,80 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    (void)self;
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    g_autoptr(GError) err = NULL;
    if (lfb_init(SQUEEKBOARD_APP_ID, &err))
        priv->event = lfb_event_new ("button-pressed");
    else
        g_warning ("Failed to init libfeedback: %s", err->message);
    GtkIconTheme *theme = gtk_icon_theme_get_default ();
    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
 }
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    EekGtkKeyboard *self) {
    (void)spec;
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
    priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
    if (priv->renderer) {
        eek_renderer_free(priv->renderer);
    }
    priv->renderer = NULL;
    gtk_widget_queue_draw(GTK_WIDGET(self));
 }
 /**
 * eek_gtk_keyboard_new:
 * @keyboard: an #EekKeyboard
 *
 * Create a new #GtkWidget displaying @keyboard.
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (LevelKeyboard *keyboard)
+eek_gtk_keyboard_new (EekboardContextService *eekservice,
                      struct submission *submission,
                      struct squeek_layout_state *layout)
 {
    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
-    priv->keyboard = keyboard;
+    priv->eekboard_context = eekservice;
    priv->submission = submission;
    priv->layout = layout;
    priv->renderer = NULL;
    g_signal_connect (eekservice,
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
                      ret);
    on_notify_keyboard(G_OBJECT(eekservice), NULL, ret);
    /* TODO: this is how a compound keyboard
     * made out of a layout and a suggestion bar could start.
     * GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
    GtkEntry *fill = GTK_ENTRY(gtk_entry_new());
    gtk_box_pack_start(box, GTK_WIDGET(fill), FALSE, FALSE, 0);
    gtk_box_pack_start(box, GTK_WIDGET(ret), TRUE, TRUE, 0);
    return GTK_WIDGET(box);*/
    return GTK_WIDGET(ret);
 }
-EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
+/**
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+ * eek_gtk_keyboard_emit_feedback:
-    return priv->renderer;
+ *
 * Emit button press haptic feedback via libfeedack.
 */
 void
 eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
 {
    EekGtkKeyboardPrivate *priv;
    g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
    priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    if (priv->event) {
        lfb_event_trigger_feedback_async (priv->event,
                                          NULL,
                                          (GAsyncReadyCallback)on_event_triggered,
                                          NULL);
    }
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -28,7 +28,10 @@
 #include <glib.h>
 #include <gtk/gtk.h>
-typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
+#include "eek/eek-types.h"
 struct submission;
 struct squeek_layout_state;
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@ -44,8 +47,8 @@ struct _EekGtkKeyboardClass
    gpointer pdummy[24];
 };
-GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
+GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
-GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard);
+void       eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self);
 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -18,41 +18,93 @@
 * 02110-1301 USA
 */
 /**
 * SECTION:eek-keyboard
 * @short_description: Base class of a keyboard
 * @see_also: #EekSection
 *
 * The #EekKeyboardClass class represents a keyboard, which consists
 * of one or more sections of the #EekSectionClass class.
 */
 #include "config.h"
 #include <glib/gprintf.h>
-#include "eekboard/eekboard-context-service.h"
+#define _XOPEN_SOURCE 500
-#include "eekboard/key-emitter.h"
+#include <errno.h>
-#include "keymap.h"
+#include <fcntl.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/random.h> // TODO: this is Linux-specific
 #include <xkbcommon/xkbcommon.h>
 #include "eek-keyboard.h"
-void level_keyboard_deinit(LevelKeyboard *self) {
+
-    xkb_keymap_unref(self->keymap);
+static void eek_key_map_deinit(struct keymap *self) {
-    close(self->keymap_fd);
+    if (self->fd < 0) {
-    squeek_layout_free(self->layout);
+        g_error("Deinit called multiple times on KeyMap");
    } else {
        close(self->fd);
    }
    self->fd = -1;
 }
 static struct keymap eek_key_map_from_str(const char *keymap_str) {
    struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
    if (!context) {
        g_error("No context created");
    }
    struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
        XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
    if (!keymap)
        g_error("Bad keymap:\n%s", keymap_str);
    xkb_context_unref(context);
    char *xkb_keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
    size_t keymap_len = strlen(xkb_keymap_str) + 1;
    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
    if (getrandom(r, 6, GRND_NONBLOCK) < 0)
        g_error("Failed to get random numbers: %s", strerror(errno));
    for (unsigned i = 0; i < 6; i++) {
        r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z
        r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good...
    }
    int keymap_fd = shm_open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
    if (keymap_fd < 0) {
        g_error("Failed to set up keymap fd");
    }
    shm_unlink(path);
    if (ftruncate(keymap_fd, (off_t)keymap_len)) {
        g_error("Failed to increase keymap fd size");
    }
    char *ptr = mmap(NULL, keymap_len, PROT_WRITE, MAP_SHARED,
        keymap_fd, 0);
    if ((void*)ptr == (void*)-1) {
        g_error("Failed to set up mmap");
    }
    strncpy(ptr, xkb_keymap_str, keymap_len);
    munmap(ptr, keymap_len);
    free(xkb_keymap_str);
    xkb_keymap_unref(keymap);
    struct keymap km = {
        .fd = keymap_fd,
        .fd_len = keymap_len,
    };
    return km;
 }
 void level_keyboard_free(LevelKeyboard *self) {
-    level_keyboard_deinit(self);
+    eek_key_map_deinit(&self->keymap);
    squeek_layout_free(self->layout);
    g_free(self);
 }
-void level_keyboard_init(LevelKeyboard *self, struct squeek_layout *layout) {
+LevelKeyboard*
-    self->layout = layout;
+level_keyboard_new (struct squeek_layout *layout)
-}
+{
 LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout) {
    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
-    level_keyboard_init(keyboard, layout);
+    if (!keyboard) {
-    keyboard->manager = manager;
+        g_error("Failed to create a keyboard");
    }
    keyboard->layout = layout;
    const gchar *keymap_str = squeek_layout_get_keymap(keyboard->layout);
    keyboard->keymap = eek_key_map_from_str(keymap_str);
    return keyboard;
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -32,24 +32,23 @@
 G_BEGIN_DECLS
 /// Keymap container for Rust interoperability.
 struct keymap {
    uint32_t fd; // keymap formatted as XKB string
    size_t fd_len; // length of the data inside keymap_fd
 };
 /// Keyboard state holder
 struct _LevelKeyboard {
    struct squeek_layout *layout; // owned
-    struct xkb_keymap *keymap; // owned
+    struct keymap keymap; // owned
    int keymap_fd; // keymap formatted as XKB string
    size_t keymap_len; // length of the data inside keymap_fd
    guint id; // as a key to layout choices
    EekboardContextService *manager; // unowned reference
 };
 typedef struct _LevelKeyboard LevelKeyboard;
-gchar *             eek_keyboard_get_keymap
+gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
                                     (LevelKeyboard *keyboard);
-LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
+LevelKeyboard*
-void level_keyboard_deinit(LevelKeyboard *self);
+level_keyboard_new (struct squeek_layout *layout);
 void level_keyboard_free(LevelKeyboard *self);
 G_END_DECLS
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -28,36 +28,10 @@
 #include "eek-renderer.h"
 #include "src/style.h"
 enum {
    PROP_0,
    PROP_PCONTEXT,
    PROP_LAST
 };
 typedef struct _EekRendererPrivate
 {
    LevelKeyboard *keyboard; // unowned
    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    gdouble border_width; // FIXME: border of what?
    gdouble allocation_width;
    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    struct transformation widget_to_layout;
    PangoFontDescription *font; // owned reference
 } EekRendererPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
 /* eek-keyboard-drawing.c */
-static void eek_renderer_render_button_label (EekRenderer *self, cairo_t *cr, GtkStyleContext *ctx,
+static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
-                                                const struct squeek_button *button);
+                                                const gchar *label, EekBounds bounds);
 void eek_render_button                         (EekRenderer *self,
                                                cairo_t     *cr, const struct squeek_button *button,
@ -86,8 +60,7 @@ render_outline (cairo_t     *cr,
        position.x, position.y, position.width, position.height);
 }
-static void render_button_in_context(EekRenderer *self,
+static void render_button_in_context(gint scale_factor,
                                     gint scale_factor,
                                     cairo_t     *cr,
                                     GtkStyleContext *ctx,
                                     const struct squeek_button *button) {
@ -130,7 +103,11 @@ static void render_button_in_context(EekRenderer *self,
            return;
        }
    }
-    eek_renderer_render_button_label (self, cr, ctx, button);
+
    const gchar *label = squeek_button_get_label(button);
    if (label) {
        render_button_label (cr, ctx, label, squeek_button_get_bounds(button));
    }
 }
 void
@ -140,9 +117,7 @@ eek_render_button (EekRenderer *self,
               gboolean     pressed,
               gboolean     locked)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    GtkStyleContext *ctx = self->button_context;
    GtkStyleContext *ctx = priv->button_context;
    /* Set the name of the button on the widget path, using the name obtained
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
@ -162,7 +137,7 @@ eek_render_button (EekRenderer *self,
    }
    gtk_style_context_add_class(ctx, outline_name);
-    render_button_in_context(self, priv->scale_factor, cr, ctx, button);
+    render_button_in_context(self->scale_factor, cr, ctx, button);
    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
@ -173,43 +148,16 @@ eek_render_button (EekRenderer *self,
 }
 static void
-eek_renderer_render_button_label (EekRenderer *self,
+render_button_label (cairo_t     *cr,
                                  cairo_t     *cr,
                     GtkStyleContext *ctx,
-                                  const struct squeek_button *button)
+                     const gchar *label,
                     EekBounds bounds)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    const gchar *label = squeek_button_get_label(button);
    if (!label) {
        return;
    }
    PangoFontDescription *font;
-    gdouble scale;
+    gtk_style_context_get(ctx,
-
+                          gtk_style_context_get_state(ctx),
-
+                          "font", &font,
-    if (!priv->font) {
+                          NULL);
        const PangoFontDescription *base_font;
        gdouble size;
        base_font = pango_context_get_font_description (priv->pcontext);
        // FIXME: Base font size on the same size unit used for button sizing,
        // and make the default about 1/3 of the current row height
        size = 30000.0;
        priv->font = pango_font_description_copy (base_font);
        pango_font_description_set_size (priv->font, (gint)round(size * 0.6));
    }
    EekBounds bounds = squeek_button_get_bounds(button);
    scale = MIN((bounds.width - priv->border_width) / bounds.width,
                (bounds.height - priv->border_width) / bounds.height);
    font = pango_font_description_copy (priv->font);
    pango_font_description_set_size (font,
                                     (gint)round(pango_font_description_get_size (font) * scale));
    PangoLayout *layout = pango_cairo_create_layout (cr);
    pango_layout_set_font_description (layout, font);
    pango_font_description_free (font);
@ -219,8 +167,7 @@ eek_renderer_render_button_label (EekRenderer *self,
    if (line->resolved_dir == PANGO_DIRECTION_RTL) {
        pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
    }
-    pango_layout_set_width (layout,
+    pango_layout_set_width (layout, PANGO_SCALE * bounds.width);
                            PANGO_SCALE * bounds.width * scale);
    PangoRectangle extents = { 0, };
    pango_layout_get_extents (layout, NULL, &extents);
@ -244,119 +191,46 @@ eek_renderer_render_button_label (EekRenderer *self,
    g_object_unref (layout);
 }
 // FIXME: Pass just the active modifiers instead of entire submission
 void
 eek_renderer_render_keyboard (EekRenderer *self,
-                                   cairo_t     *cr)
+                              struct submission *submission,
                                   cairo_t     *cr,
                              LevelKeyboard *keyboard)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    g_return_if_fail (self->allocation_width > 0.0);
-
+    g_return_if_fail (self->allocation_height > 0.0);
    g_return_if_fail (priv->keyboard);
    g_return_if_fail (priv->allocation_width > 0.0);
    g_return_if_fail (priv->allocation_height > 0.0);
    /* Paint the background covering the entire widget area */
-    gtk_render_background (priv->view_context,
+    gtk_render_background (self->view_context,
                           cr,
                           0, 0,
-                           priv->allocation_width, priv->allocation_height);
+                           self->allocation_width, self->allocation_height);
    cairo_save(cr);
-    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+    cairo_translate (cr, self->widget_to_layout.origin_x, self->widget_to_layout.origin_y);
-    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);
+    cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
-    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
+    squeek_draw_layout_base_view(keyboard->layout, self, cr);
-    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr);
+    squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
    cairo_restore (cr);
 }
-static void
+void
-eek_renderer_set_property (GObject      *object,
+eek_renderer_free (EekRenderer        *self)
                           guint         prop_id,
                           const GValue *value,
                           GParamSpec   *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+    if (self->pcontext) {
-            EEK_RENDERER(object));
+        g_object_unref (self->pcontext);
-
+        self->pcontext = NULL;
    switch (prop_id) {
    case PROP_PCONTEXT:
        priv->pcontext = g_value_get_object (value);
        g_object_ref (priv->pcontext);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
-}
+    g_object_unref(self->css_provider);
-
+    g_object_unref(self->view_context);
-static void
+    g_object_unref(self->button_context);
 eek_renderer_get_property (GObject    *object,
                           guint       prop_id,
                           GValue     *value,
                           GParamSpec *pspec)
 {
    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 eek_renderer_dispose (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER (object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    if (priv->keyboard) {
        priv->keyboard = NULL;
    }
    if (priv->pcontext) {
        g_object_unref (priv->pcontext);
        priv->pcontext = NULL;
    }
    // this is where renderer-specific surfaces would be released
-    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
+    free(self);
 }
 static void
 eek_renderer_finalize (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER(object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    g_object_unref(priv->css_provider);
    g_object_unref(priv->view_context);
    g_object_unref(priv->button_context);
    pango_font_description_free (priv->font);
    G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
 }
 static void
 eek_renderer_class_init (EekRendererClass *klass)
 {
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;
    gobject_class->set_property = eek_renderer_set_property;
    gobject_class->get_property = eek_renderer_get_property;
    gobject_class->dispose = eek_renderer_dispose;
    gobject_class->finalize = eek_renderer_finalize;
    pspec = g_param_spec_object ("pango-context",
                                 "Pango Context",
                                 "Pango Context",
                                 PANGO_TYPE_CONTEXT,
                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_PCONTEXT,
                                     pspec);
 }
 static GType new_type(char *name) {
    GTypeInfo info = {0};
    info.class_size = sizeof(GtkWidgetClass);
@ -367,7 +241,7 @@ static GType new_type(char *name) {
    );
 }
-static GType view_type() {
+static GType view_type(void) {
    static GType type = 0;
    if (!type) {
        type = new_type("sq_view");
@ -375,7 +249,7 @@ static GType view_type() {
    return type;
 }
-static GType button_type() {
+static GType button_type(void) {
    static GType type = 0;
    if (!type) {
        type = new_type("sq_button");
@ -384,83 +258,71 @@ static GType button_type() {
 }
 static void
-eek_renderer_init (EekRenderer *self)
+renderer_init (EekRenderer *self)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    self->pcontext = NULL;
    self->allocation_width = 0.0;
    self->allocation_height = 0.0;
    self->scale_factor = 1;
-    priv->keyboard = NULL;
+    self->css_provider = squeek_load_style();
    priv->pcontext = NULL;
    priv->border_width = 1.0;
    priv->allocation_width = 0.0;
    priv->allocation_height = 0.0;
    priv->scale_factor = 1;
    priv->font = NULL;
    GtkIconTheme *theme = gtk_icon_theme_get_default ();
    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
    priv->css_provider = squeek_load_style();
 }
 EekRenderer *
 eek_renderer_new (LevelKeyboard  *keyboard,
                  PangoContext *pcontext)
 {
-    EekRenderer *renderer = g_object_new (EEK_TYPE_RENDERER,
+    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
-                         "pango-context", pcontext,
+    renderer_init(renderer);
-                         NULL);
+    renderer->pcontext = pcontext;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    g_object_ref (renderer->pcontext);
    priv->keyboard = keyboard;
    /* Create a style context for the layout */
    GtkWidgetPath *path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    priv->view_context = gtk_style_context_new();
+    renderer->view_context = gtk_style_context_new();
-    gtk_style_context_set_path(priv->view_context, path);
+    gtk_style_context_set_path(renderer->view_context, path);
    gtk_widget_path_unref(path);
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
-        gtk_style_context_add_class(priv->view_context, "wide");
+        gtk_style_context_add_class(renderer->view_context, "wide");
    }
-    gtk_style_context_add_provider (priv->view_context,
+    gtk_style_context_add_provider (renderer->view_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    /* Create a style context for the buttons */
    path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_widget_path_iter_add_class(path, -1, "wide");
    }
    gtk_widget_path_append_type(path, button_type());
-    priv->button_context = gtk_style_context_new ();
+    renderer->button_context = gtk_style_context_new ();
-    gtk_style_context_set_path(priv->button_context, path);
+    gtk_style_context_set_path(renderer->button_context, path);
    gtk_widget_path_unref(path);
-    gtk_style_context_set_parent(priv->button_context, priv->view_context);
+    gtk_style_context_set_parent(renderer->button_context, renderer->view_context);
-    gtk_style_context_set_state (priv->button_context, GTK_STATE_FLAG_NORMAL);
+    gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
-    gtk_style_context_add_provider (priv->button_context,
+    gtk_style_context_add_provider (renderer->button_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    return renderer;
 }
 void
 eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  struct squeek_layout *layout,
                                  gdouble      width,
                                  gdouble      height)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    renderer->allocation_width = width;
    renderer->allocation_height = height;
-    priv->allocation_width = width;
+    renderer->widget_to_layout = squeek_layout_calculate_transformation(
-    priv->allocation_height = height;
+                layout,
-
+                renderer->allocation_width, renderer->allocation_height);
    priv->widget_to_layout = squeek_layout_calculate_transformation(
                priv->keyboard->layout,
                priv->allocation_width, priv->allocation_height);
    // This is where size-dependent surfaces would be released
 }
@ -468,10 +330,7 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
 void
 eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
 {
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
+    renderer->scale_factor = scale;
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    priv->scale_factor = scale;
 }
 cairo_surface_t *
@ -500,9 +359,5 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer) {
-    struct transformation failed = {0};
+    return renderer->widget_to_layout;
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    return priv->widget_to_layout;
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,31 +25,36 @@
 #include <pango/pangocairo.h>
 #include "eek-types.h"
 #include "src/submission.h"
-G_BEGIN_DECLS
+struct squeek_layout;
-#define EEK_TYPE_RENDERER (eek_renderer_get_type())
+/// Renders LevelKayboards
-G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+/// It cannot adjust styles at runtime.
-
+typedef struct EekRenderer
 struct _EekRendererClass
 {
-    GObjectClass parent_class;
+    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    /// Style class for rendering the view and button CSS.
    gchar *extra_style; // owned
-    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
+    // Mutable state
-                                             const gchar *icon_name,
+    /// Background extents
-                                             gint         size,
+    gdouble allocation_width;
-                                             gint         scale);
+    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    /// Coords transformation
    struct transformation widget_to_layout;
 } EekRenderer;
    /*< private >*/
    /* padding */
    gpointer pdummy[23];
 };
 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
 EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
                                                PangoContext    *pcontext);
 void             eek_renderer_set_allocation_size
-                                               (EekRenderer     *renderer,
+                                               (EekRenderer     *renderer, struct squeek_layout *layout,
                                                gdouble          width,
                                                gdouble          height);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
@ -59,8 +64,10 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);
-void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
+void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct submission *submission,
-                                                cairo_t         *cr);
+                                                cairo_t         *cr, LevelKeyboard *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer);
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -38,6 +38,7 @@ G_BEGIN_DECLS
 typedef struct _EekBounds EekBounds;
 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _ServerContextService ServerContextService;
 typedef struct _LevelKeyboard LevelKeyboard;
 /**
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -1,38 +0,0 @@
 /*
 * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2011 Red Hat, Inc.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:eek-xml-layout
 * @short_description: Layout engine which loads layout information from XML
 */
 #include "config.h"
 #include "eek-keyboard.h"
 #include "src/layout.h"
 #include "eek-xml-layout.h"
 LevelKeyboard *
 eek_xml_layout_real_create_keyboard (const char *keyboard_type,
                                     EekboardContextService *manager,
                                     enum squeek_arrangement_kind t)
 {
    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
    return level_keyboard_new(manager, layout);
 }
--- a/eek/eek-xml-layout.h
+++ b/eek/eek-xml-layout.h
@ -1,36 +0,0 @@
 /* 
 * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2011 Red Hat, Inc.
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
 #error "Only <eek/eek.h> can be included directly."
 #endif
 #ifndef EEK_XML_LAYOUT_H
 #define EEK_XML_LAYOUT_H 1
 #include "eek-types.h"
 #include "src/layout.h"
 G_BEGIN_DECLS
 LevelKeyboard *
 eek_xml_layout_real_create_keyboard (const char *keyboard_type,
                                     EekboardContextService *manager,
                                     enum squeek_arrangement_kind t);
 G_END_DECLS
 #endif  /* EEK_XML_LAYOUT_H */
--- a/eek/keymap.h
+++ b/eek/keymap.h
@ -1,8 +0,0 @@
 #include <gdk/gdk.h>
 #include <xkbcommon/xkbcommon.h>
 gboolean
 squeek_keymap_get_entries_for_keyval (struct xkb_keymap     *xkb_keymap,
                                      guint          keyval,
                                      GdkKeymapKey **keys,
                                      guint          *n_keys);
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -16,31 +16,15 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:eekboard-context-service
 * @short_description: base server implementation of eekboard input
 * context service
 *
 * The #EekboardService class provides a base server side
 * implementation of eekboard input context service.
 */
 #include "config.h"
 #include <fcntl.h>
 #include <stdio.h>
 #define _XOPEN_SOURCE 500
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/random.h> // TODO: this is Linux-specific
 #include <xkbcommon/xkbcommon.h>
 #include <gio/gio.h>
 #include "eekboard/key-emitter.h"
 #include "wayland.h"
-#include "eek/eek-xml-layout.h"
+#include "eek/eek-keyboard.h"
 #include "src/server-context-service.h"
 #include "eekboard/eekboard-context-service.h"
@ -48,104 +32,42 @@
 enum {
    PROP_0, // Magic: without this, keyboard is not useable in g_object_notify
    PROP_KEYBOARD,
    PROP_VISIBLE,
    PROP_LAST
 };
 enum {
    ENABLED,
    DISABLED,
    DESTROYED,
    LAST_SIGNAL
 };
 static guint signals[LAST_SIGNAL] = { 0, };
-#define EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(obj)                       \
+/**
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServicePrivate))
+ * EekboardContextService:
-
+ *
-struct _EekboardContextServicePrivate {
+ * Handles layout state, gsettings, and virtual-keyboard.
-    gboolean enabled;
+ *
-    gboolean visible;
+ * TODO: Restrict to managing keyboard layouts, and maybe button repeats,
 * and the virtual keyboard protocol.
 *
 * The #EekboardContextService structure contains only private data
 * and should only be accessed using the provided API.
 */
 struct _EekboardContextService {
    GObject parent;
    struct squeek_layout_state *layout; // Unowned
    LevelKeyboard *keyboard; // currently used keyboard
-    GHashTable *keyboard_hash; // a table of available keyboards, per layout
+    GSettings *settings; // Owned reference
-    char *overlay;
+    // Maybe TODO: it's used only for fetching layout type.
-
+    // Maybe let UI push the type to this structure?
-    GSettings *settings;
+    ServerContextService *ui; // unowned reference
-    uint32_t hint;
+    /// Needed for keymap changes after keyboard updates
-    uint32_t purpose;
+    struct submission *submission; // unowned
 };
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
 static LevelKeyboard *
 eekboard_context_service_real_create_keyboard (EekboardContextService *self,
                                               const gchar            *keyboard_type,
                                               enum squeek_arrangement_kind t)
 {
    LevelKeyboard *keyboard = eek_xml_layout_real_create_keyboard(keyboard_type, self, t);
    if (!keyboard) {
        g_error("Failed to create a keyboard");
    }
    struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
    if (!context) {
        g_error("No context created");
    }
    const gchar *keymap_str = squeek_layout_get_keymap(keyboard->layout);
    struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
        XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
    if (!keymap)
        g_error("Bad keymap:\n%s", keymap_str);
    xkb_context_unref(context);
    keyboard->keymap = keymap;
    keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
    keyboard->keymap_len = strlen(keymap_str) + 1;
    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
    getrandom(r, 6, GRND_NONBLOCK);
    for (unsigned i = 0; i < 6; i++) {
        r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z
        r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good...
    }
    int keymap_fd = shm_open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
    if (keymap_fd < 0) {
        g_error("Failed to set up keymap fd");
    }
    keyboard->keymap_fd = keymap_fd;
    shm_unlink(path);
    if (ftruncate(keymap_fd, (off_t)keyboard->keymap_len)) {
        g_error("Failed to increase keymap fd size");
    }
    char *ptr = mmap(NULL, keyboard->keymap_len, PROT_WRITE, MAP_SHARED,
        keymap_fd, 0);
    if ((void*)ptr == (void*)-1) {
        g_error("Failed to set up mmap");
    }
    strncpy(ptr, keymap_str, keyboard->keymap_len);
    munmap(ptr, keyboard->keymap_len);
    return keyboard;
 }
 static void
 eekboard_context_service_real_show_keyboard (EekboardContextService *self)
 {
    self->priv->visible = TRUE;
 }
 static void
 eekboard_context_service_real_hide_keyboard (EekboardContextService *self)
 {
    self->priv->visible = FALSE;
 }
 static void
 eekboard_context_service_set_property (GObject      *object,
@ -153,17 +75,8 @@ eekboard_context_service_set_property (GObject      *object,
                                       const GValue *value,
                                       GParamSpec   *pspec)
 {
-    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
+    (void)value;
    switch (prop_id) {
    case PROP_KEYBOARD:
        if (context->priv->keyboard)
            g_object_unref (context->priv->keyboard);
        context->priv->keyboard = g_value_get_object (value);
        break;
    case PROP_VISIBLE:
        context->priv->visible = g_value_get_boolean (value);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -180,10 +93,7 @@ eekboard_context_service_get_property (GObject    *object,
    switch (prop_id) {
    case PROP_KEYBOARD:
-        g_value_set_object (value, context->priv->keyboard);
+        g_value_set_object (value, context->keyboard);
        break;
    case PROP_VISIBLE:
        g_value_set_boolean (value, context->priv->visible);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -194,13 +104,6 @@ eekboard_context_service_get_property (GObject    *object,
 static void
 eekboard_context_service_dispose (GObject *object)
 {
    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
    if (context->priv->keyboard_hash) {
        g_hash_table_destroy (context->priv->keyboard_hash);
        context->priv->keyboard_hash = NULL;
    }
    G_OBJECT_CLASS (eekboard_context_service_parent_class)->
        dispose (object);
 }
@ -208,47 +111,58 @@ eekboard_context_service_dispose (GObject *object)
 static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    if (!settings) {
        return;
    }
    GVariant *inputs = g_settings_get_value(settings, "sources");
    if (g_variant_n_children(inputs) == 0) {
        g_warning("No system layout present");
        *type = NULL;
        *layout = NULL;
    } else {
        // current layout is always first
        g_variant_get_child(inputs, 0, "(ss)", type, layout);
    }
    g_variant_unref(inputs);
 }
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state, uint32_t timestamp) {
-{
+    gchar *layout_name = state->overlay_name;
    g_autofree gchar *keyboard_layout = NULL;
    if (context->priv->overlay) {
        keyboard_layout = g_strdup(context->priv->overlay);
    } else {
        g_autofree gchar *keyboard_type = NULL;
        settings_get_layout(context->priv->settings,
                            &keyboard_type, &keyboard_layout);
    }
-    if (!keyboard_layout) {
+    if (layout_name == NULL) {
-        keyboard_layout = g_strdup("us");
+        layout_name = state->layout_name;
    }
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+        switch (state->purpose) {
    switch (priv->purpose) {
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
-        keyboard_layout = g_strdup("number");
+            layout_name = "number";
            break;
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
-        keyboard_layout = g_strdup("terminal");
+            layout_name = "terminal";
            break;
        default:
            ;
        }
-    // generic part follows
+        if (layout_name == NULL) {
-    LevelKeyboard *keyboard = eekboard_context_service_real_create_keyboard(context, keyboard_layout, t);
+            layout_name = "us";
-    // set as current
+        }
-    LevelKeyboard *previous_keyboard = context->priv->keyboard;
+    }
    context->priv->keyboard = keyboard;
    // generic part follows
    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
    LevelKeyboard *keyboard = level_keyboard_new(layout);
    // set as current
    LevelKeyboard *previous_keyboard = context->keyboard;
    context->keyboard = keyboard;
    // Update the keymap if necessary.
    // TODO: Update submission on change event
    if (context->submission) {
        submission_set_keyboard(context->submission, keyboard, timestamp);
    }
    // Update UI
    g_object_notify (G_OBJECT(context), "keyboard");
    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
@ -257,8 +171,23 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    }
 }
-static void update_layout_and_type(EekboardContextService *context) {
+static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
-    eekboard_context_service_update_layout(context, server_context_service_get_layout_type(context));
+    g_autofree gchar *keyboard_layout = NULL;
    g_autofree gchar *keyboard_type = NULL;
    settings_get_layout(context->settings,
                        &keyboard_type, &keyboard_layout);
    if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
        g_free(context->layout->overlay_name);
        context->layout->overlay_name = NULL;
        if (keyboard_layout) {
            g_free(context->layout->layout_name);
            context->layout->layout_name = g_strdup(keyboard_layout);
        }
        // This must actually update the UI.
        uint32_t time = gdk_event_get_time(NULL);
        eekboard_context_service_use_layout(context, context->layout, time);
    }
 }
 static gboolean
@ -269,23 +198,14 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
-    g_free(context->priv->overlay);
+    eekboard_context_service_update_settings_layout(context);
    context->priv->overlay = NULL;
    update_layout_and_type(context);
    return TRUE;
 }
 static void
 eekboard_context_service_constructed (GObject *object)
 {
-    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
+    (void)object;
    context->virtual_keyboard = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(
                squeek_wayland->virtual_keyboard_manager,
                squeek_wayland->seat);
    if (!context->virtual_keyboard) {
        g_error("Programmer error: Failed to receive a virtual keyboard instance");
    }
    update_layout_and_type(context);
 }
 static void
@ -294,48 +214,10 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;
    klass->show_keyboard = eekboard_context_service_real_show_keyboard;
    klass->hide_keyboard = eekboard_context_service_real_hide_keyboard;
    gobject_class->constructed = eekboard_context_service_constructed;
    gobject_class->set_property = eekboard_context_service_set_property;
    gobject_class->get_property = eekboard_context_service_get_property;
    gobject_class->dispose = eekboard_context_service_dispose;
    /**
     * EekboardContextService::enabled:
     * @context: an #EekboardContextService
     *
     * Emitted when @context is enabled.
     */
    signals[ENABLED] =
        g_signal_new (I_("enabled"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_LAST,
                      G_STRUCT_OFFSET(EekboardContextServiceClass, enabled),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
                      0);
    /**
     * EekboardContextService::disabled:
     * @context: an #EekboardContextService
     *
     * Emitted when @context is enabled.
     */
    signals[DISABLED] =
        g_signal_new (I_("disabled"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_LAST,
                      G_STRUCT_OFFSET(EekboardContextServiceClass, disabled),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
                      0);
    /**
     * EekboardContextService::destroyed:
     * @context: an #EekboardContextService
@ -346,7 +228,7 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
        g_signal_new (I_("destroyed"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekboardContextServiceClass, destroyed),
+                      0,
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
@ -361,102 +243,39 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
    pspec = g_param_spec_pointer("keyboard",
                                 "Keyboard",
                                 "Keyboard",
-                                 G_PARAM_READWRITE);
+                                 G_PARAM_READABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_KEYBOARD,
                                     pspec);
    /**
     * EekboardContextService:visible:
     *
     * Flag to indicate if keyboard is visible or not.
     */
    pspec = g_param_spec_boolean ("visible",
                                  "Visible",
                                  "Visible",
                                  FALSE,
                                  G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
                                     PROP_VISIBLE,
                                     pspec);
 }
 static void
 eekboard_context_service_init (EekboardContextService *self)
 {
-    self->priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(self);
+    const char *schema_name = "org.gnome.desktop.input-sources";
    GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
    g_autoptr(GSettingsSchema) schema = NULL;
-    self->priv->keyboard_hash =
+    if (!ssrc) {
-        g_hash_table_new_full (g_direct_hash,
+        g_warning("No gsettings schemas installed. Layout switching unavailable.");
-                               g_direct_equal,
+        return;
-                               NULL,
+    }
                               (GDestroyNotify)g_object_unref);
-    self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
+    schema = g_settings_schema_source_lookup(ssrc, schema_name, TRUE);
-    gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
+    if (schema) {
        // Not referencing the found schema directly,
        // because it's not clear how...
        self->settings = g_settings_new (schema_name);
        gulong conn_id = g_signal_connect(self->settings, "change-event",
                                          G_CALLBACK(settings_handle_layout_changed),
                                          self);
        if (conn_id == 0) {
-        g_warning ("Could not connect to gsettings updates, layout"
+            g_warning ("Could not connect to gsettings updates, "
-                   " changing unavailable");
+                       "automatic layout changing unavailable");
        }
-
+    } else {
-    self->priv->overlay = NULL;
+        g_warning("Gsettings schema %s is not installed on the system. "
-}
+                  "Layout switching unavailable", schema_name);
 /**
 * eekboard_context_service_enable:
 * @context: an #EekboardContextService
 *
 * Enable @context.  This function is called when @context is pushed
 * by eekboard_service_push_context().
 */
 void
 eekboard_context_service_enable (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    if (!context->priv->enabled) {
        context->priv->enabled = TRUE;
        g_signal_emit (context, signals[ENABLED], 0);
    }
 }
 /**
 * eekboard_context_service_disable:
 * @context: an #EekboardContextService
 *
 * Disable @context.  This function is called when @context is pushed
 * by eekboard_service_pop_context().
 */
 void
 eekboard_context_service_disable (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    if (context->priv->enabled) {
        context->priv->enabled = FALSE;
        g_signal_emit (context, signals[DISABLED], 0);
    }
 }
 void
 eekboard_context_service_show_keyboard (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    if (!context->priv->visible) {
        EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context);
    }
 }
 void
 eekboard_context_service_hide_keyboard (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    if (context->priv->visible) {
        EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context);
    }
 }
@ -470,11 +289,6 @@ void
 eekboard_context_service_destroy (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    if (context->priv->enabled) {
        eekboard_context_service_disable (context);
    }
    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }
@ -488,36 +302,53 @@ eekboard_context_service_destroy (EekboardContextService *context)
 LevelKeyboard *
 eekboard_context_service_get_keyboard (EekboardContextService *context)
 {
-    return context->priv->keyboard;
+    return context->keyboard;
 }
 void eekboard_context_service_set_keymap(EekboardContextService *context,
                                         const LevelKeyboard *keyboard)
 {
    zwp_virtual_keyboard_v1_keymap(context->virtual_keyboard,
        WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
        keyboard->keymap_fd, keyboard->keymap_len);
 }
 void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint, uint32_t purpose)
 {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    if (context->layout->hint != hint || context->layout->purpose != purpose) {
-
+        context->layout->hint = hint;
-    if (priv->hint != hint || priv->purpose != purpose) {
+        context->layout->purpose = purpose;
-        priv->hint = hint;
+        uint32_t time = gdk_event_get_time(NULL);
-        priv->purpose = purpose;
+        eekboard_context_service_use_layout(context, context->layout, time);
        update_layout_and_type(context);
    }
 }
 void
 eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
-    context->priv->overlay = g_strdup(name);
+    if (g_strcmp0(context->layout->overlay_name, name)) {
-    update_layout_and_type(context);
+        g_free(context->layout->overlay_name);
        context->layout->overlay_name = g_strdup(name);
        uint32_t time = gdk_event_get_time(NULL);
        eekboard_context_service_use_layout(context, context->layout, time);
    }
 }
 const char*
 eekboard_context_service_get_overlay(EekboardContextService *context) {
-    return context->priv->overlay;
+    return context->layout->overlay_name;
 }
 EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
 {
    EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
    context->layout = state;
    eekboard_context_service_update_settings_layout(context);
    uint32_t time = gdk_event_get_time(NULL);
    eekboard_context_service_use_layout(context, context->layout, time);
    return context;
 }
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
    context->submission = submission;
    if (context->submission) {
        uint32_t time = gdk_event_get_time(NULL);
        submission_set_keyboard(context->submission, context->keyboard, time);
    }
 }
 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
    context->ui = ui;
 }
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -22,7 +22,8 @@
 #ifndef EEKBOARD_CONTEXT_SERVICE_H
 #define EEKBOARD_CONTEXT_SERVICE_H 1
-#include <eek/eek.h>
+#include "src/submission.h"
 #include "src/layout.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
@ -33,69 +34,12 @@ G_BEGIN_DECLS
 #define EEKBOARD_CONTEXT_SERVICE_INTERFACE "org.fedorahosted.Eekboard.Context"
 #define EEKBOARD_TYPE_CONTEXT_SERVICE (eekboard_context_service_get_type())
 #define EEKBOARD_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextService))
 #define EEKBOARD_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))
 #define EEKBOARD_IS_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE))
 #define EEKBOARD_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE))
 #define EEKBOARD_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))
 G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD, CONTEXT_SERVICE, GObject)
-typedef struct _EekboardContextServiceClass EekboardContextServiceClass;
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
-typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
+void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
-
+void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 /**
 * EekboardContextService:
 *
 * TODO: Restrict to managing keyboard layouts, and maybe button repeats,
 * and the virtual keyboard protocol.
 *
 * The #EekboardContextService structure contains only private data
 * and should only be accessed using the provided API.
 */
 struct _EekboardContextService {
    GObject parent;
    EekboardContextServicePrivate *priv;
    struct zwp_virtual_keyboard_v1 *virtual_keyboard;
 };
 /**
 * EekboardContextServiceClass:
 * @create_keyboard: virtual function for create a keyboard from string
 * @show_keyboard: virtual function for show a keyboard
 * @hide_keyboard: virtual function for hide a keyboard
 * @enabled: class handler for #EekboardContextService::enabled signal
 * @disabled: class handler for #EekboardContextService::disabled signal
 */
 struct _EekboardContextServiceClass {
    /*< private >*/
    GObjectClass parent_class;
    /*< public >*/
    struct squeek_view *(*create_keyboard)    (EekboardContextService *self,
                                        const gchar            *keyboard_type);
    void         (*show_keyboard)      (EekboardContextService *self);
    void         (*hide_keyboard)      (EekboardContextService *self);
    /* signals */
    void         (*enabled)            (EekboardContextService *self);
    void         (*disabled)           (EekboardContextService *self);
    void         (*destroyed)          (EekboardContextService *self);
    /*< private >*/
    /* padding */
    gpointer pdummy[24];
 };
 GType         eekboard_context_service_get_type
                                              (void) G_GNUC_CONST;
 void          eekboard_context_service_enable (EekboardContextService *context);
 void          eekboard_context_service_disable (EekboardContextService *context);
 void          eekboard_context_service_show_keyboard
                                              (EekboardContextService *context);
 void          eekboard_context_service_hide_keyboard
                                              (EekboardContextService *context);
 void          eekboard_context_service_destroy (EekboardContextService *context);
 LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
@ -106,6 +50,6 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint,
                                               uint32_t purpose);
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t);
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout, uint32_t timestamp);
 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/eekboard/eekboard-service.c
+++ b/eekboard/eekboard-service.c
@ -1,310 +0,0 @@
 /*
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:eekboard-service
 * @short_description: base implementation of eekboard service
 *
 * Provides a dbus object, and contains the context.
 *
 * The #EekboardService class provides a base server side
 * implementation of eekboard service.
 */
 #include "config.h"
 #include "sm.puri.OSK0.h"
 #include <stdio.h>
 #include <gio/gio.h>
 #include "eekboard/eekboard-service.h"
 enum {
    PROP_0,
    PROP_OBJECT_PATH,
    PROP_CONNECTION,
    PROP_LAST
 };
 enum {
    DESTROYED,
    LAST_SIGNAL
 };
 static guint signals[LAST_SIGNAL] = { 0, };
 typedef struct _EekboardServicePrivate
 {
    GDBusConnection *connection;
    SmPuriOSK0 *dbus_interface;
    GDBusNodeInfo *introspection_data;
    guint registration_id;
    char *object_path;
    EekboardContextService *context; // unowned reference
 } EekboardServicePrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekboardService, eekboard_service, G_TYPE_OBJECT)
 static void
 eekboard_service_set_property (GObject      *object,
                               guint         prop_id,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    GDBusConnection *connection;
    switch (prop_id) {
    case PROP_OBJECT_PATH:
        if (priv->object_path)
            g_free (priv->object_path);
        priv->object_path = g_value_dup_string (value);
        break;
    case PROP_CONNECTION:
        connection = g_value_get_object (value);
        if (priv->connection)
            g_object_unref (priv->connection);
        priv->connection = g_object_ref (connection);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 eekboard_service_get_property (GObject    *object,
                               guint       prop_id,
                               GValue     *value,
                               GParamSpec *pspec)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    switch (prop_id) {
    case PROP_OBJECT_PATH:
        g_value_set_string (value, priv->object_path);
        break;
    case PROP_CONNECTION:
        g_value_set_object (value, priv->connection);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 eekboard_service_dispose (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    if (priv->connection) {
        if (priv->registration_id > 0) {
            g_dbus_connection_unregister_object (priv->connection,
                                                 priv->registration_id);
            priv->registration_id = 0;
        }
        g_object_unref (priv->connection);
        priv->connection = NULL;
    }
    if (priv->introspection_data) {
        g_dbus_node_info_unref (priv->introspection_data);
        priv->introspection_data = NULL;
    }
    if (priv->context) {
        g_signal_handlers_disconnect_by_data (priv->context, service);
        priv->context = NULL;
    }
    G_OBJECT_CLASS (eekboard_service_parent_class)->dispose (object);
 }
 static void
 eekboard_service_finalize (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    g_free (priv->object_path);
    G_OBJECT_CLASS (eekboard_service_parent_class)->finalize (object);
 }
 static gboolean
 handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
                   gboolean arg_visible, gpointer user_data) {
    EekboardService *service = user_data;
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    if (priv->context) {
        if (arg_visible) {
            eekboard_context_service_show_keyboard (priv->context);
        } else {
            eekboard_context_service_hide_keyboard (priv->context);
        }
    }
    sm_puri_osk0_complete_set_visible(object, invocation);
    return TRUE;
 }
 static void on_visible(EekboardService *service,
                       GParamSpec *pspec,
                       EekboardContextService *context)
 {
    gboolean visible;
    EekboardServicePrivate *priv;
    g_return_if_fail (EEKBOARD_IS_SERVICE (service));
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE (context));
    priv = eekboard_service_get_instance_private (service);
    g_object_get (context, "visible", &visible, NULL);
    sm_puri_osk0_set_visible(priv->dbus_interface, visible);
 }
 static void
 eekboard_service_constructed (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    priv->dbus_interface = sm_puri_osk0_skeleton_new();
    g_signal_connect(priv->dbus_interface, "handle-set-visible",
                     G_CALLBACK(handle_set_visible), service);
    if (priv->connection && priv->object_path) {
        GError *error = NULL;
        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(priv->dbus_interface),
                                              priv->connection,
                                              priv->object_path,
                                              &error)) {
            g_warning("Error registering dbus object: %s\n", error->message);
            g_clear_error(&error);
        }
    }
 }
 static void
 eekboard_service_class_init (EekboardServiceClass *klass)
 {
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;
    klass->create_context = NULL;
    gobject_class->constructed = eekboard_service_constructed;
    gobject_class->set_property = eekboard_service_set_property;
    gobject_class->get_property = eekboard_service_get_property;
    gobject_class->dispose = eekboard_service_dispose;
    gobject_class->finalize = eekboard_service_finalize;
    /**
     * EekboardService::destroyed:
     * @service: an #EekboardService
     *
     * The ::destroyed signal is emitted when the service is vanished.
     */
    signals[DESTROYED] =
        g_signal_new (I_("destroyed"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_LAST,
                      0,
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
                      0);
    /**
     * EekboardService:object-path:
     *
     * D-Bus object path.
     */
    pspec = g_param_spec_string ("object-path",
                                 "Object-path",
                                 "Object-path",
                                 NULL,
                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
                                     PROP_OBJECT_PATH,
                                     pspec);
    /**
     * EekboardService:connection:
     *
     * D-Bus connection.
     */
    pspec = g_param_spec_object ("connection",
                                 "Connection",
                                 "Connection",
                                 G_TYPE_DBUS_CONNECTION,
                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
                                     PROP_CONNECTION,
                                     pspec);
 }
 static void
 eekboard_service_init (EekboardService *self)
 {
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (self);
    priv->context = NULL;
 }
 /**
 * eekboard_service_new:
 * @connection: a #GDBusConnection
 * @object_path: object path
 */
 EekboardService *
 eekboard_service_new (GDBusConnection *connection,
                      const gchar     *object_path)
 {
    return g_object_new (EEKBOARD_TYPE_SERVICE,
                         "object-path", object_path,
                         "connection", connection,
                         NULL);
 }
 void
 eekboard_service_set_context(EekboardService *service,
                             EekboardContextService *context)
 {
    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    g_return_if_fail (!priv->context);
    priv->context = context;
    g_signal_connect_swapped (priv->context,
                              "notify::visible",
                              G_CALLBACK(on_visible),
                              service);
 }
--- a/eekboard/eekboard-service.h
+++ b/eekboard/eekboard-service.h
@ -1,55 +0,0 @@
 /* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef EEKBOARD_SERVICE_H
 #define EEKBOARD_SERVICE_H 1
 #define __EEKBOARD_SERVICE_H_INSIDE__ 1
 #include "eekboard/eekboard-context-service.h"
 G_BEGIN_DECLS
 #define EEKBOARD_SERVICE_PATH "/sm/puri/OSK0"
 #define EEKBOARD_SERVICE_INTERFACE "sm.puri.OSK0"
 #define EEKBOARD_TYPE_SERVICE (eekboard_service_get_type())
 G_DECLARE_DERIVABLE_TYPE (EekboardService, eekboard_service, EEKBOARD, SERVICE, GObject)
 /**
 * EekboardServiceClass:
 * @create_context: virtual function for creating a context
 */
 struct _EekboardServiceClass {
    /*< private >*/
    GObjectClass parent_class;
    /*< public >*/
    EekboardContextService *(*create_context) (EekboardService *self);
    /*< private >*/
    /* padding */
    gpointer pdummy[24];
 };
 GType             eekboard_service_get_type (void) G_GNUC_CONST;
 EekboardService * eekboard_service_new      (GDBusConnection *connection,
                                             const gchar     *object_path);
 void              eekboard_service_set_context(EekboardService *service,
                                               EekboardContextService *context);
 G_END_DECLS
 #endif  /* EEKBOARD_SERVICE_H */
--- a/eekboard/key-emitter.c
+++ b/eekboard/key-emitter.c
@ -1,136 +0,0 @@
 /*
 * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2011 Red Hat, Inc.
 * Copyright (C) 2019 Purism, SPC
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* This file is responsible for managing keycode data and emitting keycodes. */
 #include "eekboard/key-emitter.h"
 #include <gdk/gdk.h>
 #include <X11/XKBlib.h>
 #include "eekboard/eekboard-context-service.h"
 // TODO: decide whether it's this struct that carries the keyboard around in key-emitter or if the whole manager should be dragged around
 // if this is the carrier, then it should be made part of the manager
 // hint: check which fields need to be persisted between keypresses; which between keyboards
 typedef struct {
    struct zwp_virtual_keyboard_v1 *virtual_keyboard; // unowned copy
    struct xkb_keymap *keymap; // unowned copy
    XkbDescRec *xkb;
    guint modifier_keycodes[8];
    guint modifier_indices[MOD_IDX_LAST];
    guint group;
 } SeatEmitter;
 int send_virtual_keyboard_key(
    struct zwp_virtual_keyboard_v1 *keyboard,
    unsigned int keycode,
    unsigned is_press,
    uint32_t timestamp
 ) {
    zwp_virtual_keyboard_v1_key(keyboard, timestamp, keycode, (unsigned)is_press);
    return 0;
 }
 /* Finds the first key code for each modifier and saves it in modifier_keycodes */
 static void
 update_modifier_info (SeatEmitter *client)
 {
    client->modifier_indices[MOD_IDX_SHIFT] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_SHIFT);
    client->modifier_indices[MOD_IDX_CAPS] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_CAPS);
    client->modifier_indices[MOD_IDX_CTRL] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_CTRL);
    client->modifier_indices[MOD_IDX_ALT] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_ALT);
    client->modifier_indices[MOD_IDX_NUM] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_NUM);
    client->modifier_indices[MOD_IDX_MOD3] = xkb_keymap_mod_get_index(client->keymap, "Mod3");
    client->modifier_indices[MOD_IDX_LOGO] = xkb_keymap_mod_get_index(client->keymap, XKB_MOD_NAME_LOGO);
    client->modifier_indices[MOD_IDX_ALTGR] = xkb_keymap_mod_get_index(client->keymap, "Mod5");
    client->modifier_indices[MOD_IDX_NUMLK] = xkb_keymap_mod_get_index(client->keymap, "NumLock");
    client->modifier_indices[MOD_IDX_ALSO_ALT] = xkb_keymap_mod_get_index(client->keymap, "Alt");
    client->modifier_indices[MOD_IDX_LVL3] = xkb_keymap_mod_get_index(client->keymap, "LevelThree");
    client->modifier_indices[MOD_IDX_LALT] = xkb_keymap_mod_get_index(client->keymap, "LAlt");
    client->modifier_indices[MOD_IDX_RALT] = xkb_keymap_mod_get_index(client->keymap, "RAlt");
    client->modifier_indices[MOD_IDX_RCONTROL] = xkb_keymap_mod_get_index(client->keymap, "RControl");
    client->modifier_indices[MOD_IDX_LCONTROL] = xkb_keymap_mod_get_index(client->keymap, "LControl");
    client->modifier_indices[MOD_IDX_SCROLLLK] = xkb_keymap_mod_get_index(client->keymap, "ScrollLock");
    client->modifier_indices[MOD_IDX_LVL5] = xkb_keymap_mod_get_index(client->keymap, "LevelFive");
    client->modifier_indices[MOD_IDX_ALSO_ALTGR] = xkb_keymap_mod_get_index(client->keymap, "AltGr");
    client->modifier_indices[MOD_IDX_META] = xkb_keymap_mod_get_index(client->keymap, "Meta");
    client->modifier_indices[MOD_IDX_SUPER] = xkb_keymap_mod_get_index(client->keymap, "Super");
    client->modifier_indices[MOD_IDX_HYPER] = xkb_keymap_mod_get_index(client->keymap, "Hyper");
    /*
    for (xkb_mod_index_t i = 0;
         i < xkb_keymap_num_mods(client->keymap);
         i++) {
        g_log("squeek", G_LOG_LEVEL_DEBUG, "%s", xkb_keymap_mod_get_name(client->keymap, i));
    }*/
 }
 static void
 send_fake_key (SeatEmitter *emitter,
               LevelKeyboard *keyboard,
               guint    keycode,
               gboolean pressed,
               uint32_t timestamp)
 {
    zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, 0);
    send_virtual_keyboard_key (emitter->virtual_keyboard, keycode - 8, (unsigned)pressed, timestamp);
    zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, 0);
 }
 void
 emit_key_activated (EekboardContextService *manager,
                    LevelKeyboard     *keyboard,
                    guint            keycode,
                    gboolean pressed,
                    uint32_t timestamp)
 {
    /* FIXME: figure out how to deal with Client after key presses go through
    if (g_strcmp0 (eek_symbol_get_name (symbol), "cycle-keyboard") == 0) {
        client->keyboards_head = g_slist_next (client->keyboards_head);
        if (client->keyboards_head == NULL)
            client->keyboards_head = client->keyboards;
        eekboard_context_set_keyboard (client->context,
                                       GPOINTER_TO_UINT(client->keyboards_head->data),
                                       NULL);
        return;
    }
    if (g_strcmp0 (eek_symbol_get_name (symbol), "preferences") == 0) {
        gchar *argv[2];
        GError *error;
        argv[0] = g_build_filename (LIBEXECDIR, "eekboard-setup", NULL);
        argv[1] = NULL;
        error = NULL;
        if (!g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error)) {
            g_warning ("can't spawn %s: %s", argv[0], error->message);
            g_error_free (error);
        }
        g_free (argv[0]);
        return;
    }
 */
    SeatEmitter emitter = {0};
    emitter.virtual_keyboard = manager->virtual_keyboard;
    update_modifier_info (&emitter);
    send_fake_key (&emitter, keyboard, keycode, pressed, timestamp);
 }
--- a/eekboard/key-emitter.h
+++ b/eekboard/key-emitter.h
@ -1,45 +0,0 @@
 #ifndef KEYEMITTER_H
 #define KEYEMITTER_H
 #include <inttypes.h>
 #include <glib.h>
 #include "eek/eek.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 /// Indices obtained by xkb_keymap_mod_get_name
 enum mod_indices {
    MOD_IDX_SHIFT,
    MOD_IDX_CAPS,
    MOD_IDX_CTRL,
    MOD_IDX_ALT,
    MOD_IDX_NUM,
    MOD_IDX_MOD3,
    MOD_IDX_LOGO,
    MOD_IDX_ALTGR,
    MOD_IDX_NUMLK, // Caution, not sure which is the right one
    MOD_IDX_ALSO_ALT, // Not sure why, alt emits the first alt on my setup
    MOD_IDX_LVL3,
    // Not sure if the next 4 are used at all
    MOD_IDX_LALT,
    MOD_IDX_RALT,
    MOD_IDX_RCONTROL,
    MOD_IDX_LCONTROL,
    MOD_IDX_SCROLLLK,
    MOD_IDX_LVL5,
    MOD_IDX_ALSO_ALTGR, // Not used on my layout
    MOD_IDX_META,
    MOD_IDX_SUPER,
    MOD_IDX_HYPER,
    MOD_IDX_LAST,
 };
 void
 emit_key_activated (EekboardContextService *manager, LevelKeyboard *keyboard,
                    guint            keycode,
                    gboolean pressed, uint32_t timestamp);
 #endif // KEYEMITTER_H
--- a/examples/test_layout.rs
+++ b/examples/test_layout.rs
@ -5,6 +5,7 @@ use std::env;
 fn main() -> () {
    check_builtin_layout(
-        env::args().nth(1).expect("No argument given").as_str()
+        env::args().nth(1).expect("No argument given").as_str(),
        env::args().nth(2).map(|s| s == "allow_missing_return").unwrap_or(false),
    );
 }
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.8.0',
+    version: '1.9.3',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -19,6 +19,15 @@ add_project_arguments(
    '-Werror=missing-field-initializers',
    '-Werror=incompatible-pointer-types',
    '-Werror=int-conversion',
    '-Werror=redundant-decls',
    '-Wformat-nonliteral',
    '-Wformat-security',
    '-Winit-self',
    '-Wmaybe-uninitialized',
    '-Wold-style-definition',
    '-Wredundant-decls',
    '-Wstrict-prototypes',
    '-Wunused-function',
  ],
  language: 'c'
 )
@ -42,6 +51,7 @@ endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 desktopdir = join_paths(datadir, 'applications')
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
  depdatadir = datadir
@ -60,6 +70,32 @@ summary = [
 ]
 message('\n'.join(summary))
 # Rust deps are changing, depending on compile flags. Cargo can't handle it alone.
 cargo_toml_in = files('Cargo.toml.in')
 path_data = configuration_data()
 path_data.set('path', meson.source_root())
 cargo_toml_base = configure_file(
    input: 'Cargo.toml.in',
    output: 'Cargo.toml.base',
    configuration: path_data,
 )
 cargo_deps = files('Cargo.deps')
 if get_option('legacy') == true
    cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5']
    cargo_deps = files('Cargo.deps.legacy')
 endif
 cat = find_program('cat')
 cargo_toml = custom_target(
    'Cargo.toml',
    output: 'Cargo.toml',
    command: [cat, cargo_toml_base, cargo_deps],
    capture: true,
 )
 dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
 cargo_build = find_program('cargo_build.sh')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -6,3 +6,7 @@ option('depdatadir',
 option('tests',
       type: 'boolean', value: true,
       description: 'Whether to compile unit tests')
 option('legacy',
       type: 'boolean', value: false,
       description: 'Build with Deban Buster versions of dependencies')
--- a/squeekboard.doap
+++ b/squeekboard.doap
@ -0,0 +1,17 @@
 <?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
@ -6,12 +6,15 @@ use std::ffi::CString;
 #[derive(Debug, Clone, PartialEq)]
 pub struct KeySym(pub String);
-/// Use to switch layouts
+/// Use to switch views
-type Level = String;
+type View = String;
 /// Use to send modified keypresses
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 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,
 }
@ -20,21 +23,40 @@ pub enum Modifier {
 #[derive(Debug, Clone, PartialEq)]
 pub enum Action {
    /// Switch to this view
-    SetLevel(Level),
+    SetView(View),
    /// Switch to a view and latch
-    LockLevel {
+    LockView {
-        lock: Level,
+        lock: View,
        /// When unlocked by pressing it or emitting a key
-        unlock: Level,
+        unlock: View,
    },
-    /// Set this modifier TODO: release?
+    /// Hold this modifier for as long as the button is pressed
-    SetModifier(Modifier),
+    ApplyModifier(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,13 +15,14 @@ use std::vec::Vec;
 use xkbcommon::xkb;
 use ::action;
 use ::keyboard::{
    KeyState, PressType,
    generate_keymap, generate_keycodes, FormattingError
 };
 use ::layout;
 use ::layout::ArrangementKind;
-use ::logging::PrintWarnings;
+use ::logging;
 use ::resources;
 use ::util::c::as_str;
 use ::util::hash_map_map;
@ -31,7 +32,7 @@ use ::xdg;
 use serde::Deserialize;
 use std::io::BufReader;
 use std::iter::FromIterator;
-use ::logging::WarningHandler;
+use ::logging::Warn;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -157,7 +158,7 @@ fn list_layout_sources(
 fn load_layout_data(source: DataSource)
    -> Result<::layout::LayoutData, LoadError>
 {
-    let handler = PrintWarnings{};
+    let handler = logging::Print {};
    match source {
        DataSource::File(path) => {
            Layout::from_file(path.clone())
@ -190,16 +191,21 @@ fn load_layout_data_with_fallback(
                (
                    LoadError::BadData(Error::Missing(e)),
                    DataSource::File(file)
-                ) => eprintln!( // TODO: print in debug logging level
+                ) => log_print!(
                    logging::Level::Debug,
                    "Tried file {:?}, but it's missing: {}",
                    file, e
                ),
-                (e, source) => eprintln!(
+                (e, source) => log_print!(
                    logging::Level::Warning,
                    "Failed to load layout from {}: {}, skipping",
                    source, e
                ),
            },
-            Ok(layout) => return (kind, layout),
+            Ok(layout) => {
                log_print!(logging::Level::Info, "Loaded layout {}", source);
                return (kind, layout);
            }
        }
    }
@ -234,14 +240,20 @@ type ButtonIds = String;
 #[derive(Debug, Default, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct ButtonMeta {
-    /// Special action to perform on activation. Conflicts with keysym, text.
+    // TODO: structure (action, keysym, text, modifier) as an enum
    // 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
+    /// Conflicts with action, text, modifier.
    keysym: Option<String>,
    /// The text to submit on activation. Will be derived from ID if not present
-    /// Conflicts with action, keysym
+    /// Conflicts with action, keysym, modifier.
    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
@ -259,6 +271,23 @@ 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)]
@ -330,7 +359,7 @@ impl Layout {
        serde_yaml::from_reader(infile).map_err(Error::Yaml)
    }
-    pub fn build<H: WarningHandler>(self, mut warning_handler: H)
+    pub fn build<H: logging::Handler>(self, mut warning_handler: H)
        -> (Result<::layout::LayoutData, FormattingError>, H)
    {
        let button_names = self.views.values()
@ -353,53 +382,43 @@ impl Layout {
                )
            )}).collect();
-        let keymap: HashMap<String, u32> = generate_keycodes(
+        let symbolmap: HashMap<String, u32> = generate_keycodes(
-            button_actions.iter()
+            extract_symbol_names(&button_actions)
                .filter_map(|(_name, action)| {
                    match action {
                        ::action::Action::Submit {
                            text: _, keys,
                        } => Some(keys),
                        _ => None,
                    }
                })
                .flatten()
                .map(|named_keysym| named_keysym.0.as_str())
        );
-        let button_states = button_actions.into_iter().map(|(name, action)| {
+        let button_states = HashMap::<String, KeyState>::from_iter(
            button_actions.into_iter().map(|(name, action)| {
                let keycodes = match &action {
                    ::action::Action::Submit { text: _, keys } => {
-                    keys.iter().map(|named_keycode| {
+                        keys.iter().map(|named_keysym| {
-                        *keymap.get(named_keycode.0.as_str())
+                            *symbolmap.get(named_keysym.0.as_str())
                                .expect(
                                    format!(
-                                    "keycode {} in key {} missing from keymap",
+                                        "keysym {} in key {} missing from symbol map",
-                                    named_keycode.0,
+                                        named_keysym.0,
                                        name
                                    ).as_str()
                                )
                        }).collect()
                    },
                    action::Action::Erase => vec![
                        *symbolmap.get("BackSpace")
                            .expect(&format!("BackSpace missing from symbol map")),
                    ],
                    _ => Vec::new(),
                };
                (
                    name.into(),
                    KeyState {
                        pressed: PressType::Released,
                    locked: false,
                        keycodes,
                        action,
                    }
                )
-        });
+            })
        let button_states = HashMap::<String, KeyState>::from_iter(
            button_states
        );
-        // TODO: generate from symbols
+        let keymap_str = match generate_keymap(symbolmap) {
        let keymap_str = match generate_keymap(&button_states) {
            Err(e) => { return (Err(e), warning_handler) },
            Ok(v) => v,
        };
@ -412,8 +431,8 @@ impl Layout {
            )}
        );
-        let views = HashMap::from_iter(
+        let views: Vec<_> = self.views.iter()
-            self.views.iter().map(|(name, view)| {
+            .map(|(name, view)| {
                let rows = view.iter().map(|row| {
                    let buttons = row.split_ascii_whitespace()
                        .map(|name| {
@ -427,23 +446,39 @@ impl Layout {
                                &mut warning_handler,
                            ))
                        });
-                    ::layout::Row {
+                    layout::Row::new(
-                        angle: 0,
+                        add_offsets(
                        buttons: add_offsets(
                            buttons,
                            |button| button.size.width,
                        ).collect()
-                    }
+                    )
                });
-                let rows = add_offsets(rows, |row| row.get_height())
+                let rows = add_offsets(rows, |row| row.get_size().height)
                    .collect();
                (
                    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_size().width) / 2.0,
                        y: (total_size.height - view.get_size().height) / 2.0,
                    },
                    view,
                ),
            )))
        };
        (
            Ok(::layout::LayoutData {
                views: views,
@ -464,7 +499,7 @@ impl Layout {
    }
 }
-fn create_action<H: WarningHandler>(
+fn create_action<H: logging::Handler>(
    button_info: &HashMap<String, ButtonMeta>,
    name: &str,
    view_names: Vec<&String>,
@ -482,27 +517,35 @@ fn create_action<H: WarningHandler>(
        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) => SubmitData::Action(action.clone()),
+        (Some(action), None, None, None) => SubmitData::Action(action.clone()),
-        (None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
+        (None, Some(keysym), None, None) => SubmitData::Keysym(keysym.clone()),
-        (None, None, Some(text)) => SubmitData::Text(text.clone()),
+        (None, None, Some(text), None) => SubmitData::Text(text.clone()),
-        (None, None, None) => SubmitData::Text(name.into()),
+        (None, None, None, Some(modifier)) => {
            SubmitData::Modifier(modifier.clone())
        },
        (None, None, None, None) => SubmitData::Text(name.into()),
        _ => {
-            warning_handler.handle(&format!(
+            warning_handler.handle(
-                "Button {} has more than one of (action, keysym, text)",
+                logging::Level::Warning,
-                name
+                &format!(
-            ));
+                    "Button {} has more than one of (action, keysym, text, modifier)",
                    name,
                ),
            );
            SubmitData::Text("".into())
        },
    };
-    fn filter_view_name<H: WarningHandler>(
+    fn filter_view_name<H: logging::Handler>(
        button_name: &str,
        view_name: String,
        view_names: &Vec<&String>,
@ -511,10 +554,13 @@ fn create_action<H: WarningHandler>(
        if view_names.contains(&&view_name) {
            view_name
        } else {
-            warning_handler.handle(&format!("Button {} switches to missing view {}",
+            warning_handler.handle(
                logging::Level::Warning,
                &format!("Button {} switches to missing view {}",
                    button_name,
                    view_name,
-            ));
+                ),
            );
            "base".into()
        }
    }
@ -522,7 +568,7 @@ fn create_action<H: WarningHandler>(
    match submission {
        SubmitData::Action(
            Action::SetView(view_name)
-        ) => ::action::Action::SetLevel(
+        ) => ::action::Action::SetView(
            filter_view_name(
                name, view_name.clone(), &view_names,
                warning_handler,
@ -530,7 +576,7 @@ fn create_action<H: WarningHandler>(
        ),
        SubmitData::Action(Action::Locking {
            lock_view, unlock_view
-        }) => ::action::Action::LockLevel {
+        }) => ::action::Action::LockView {
            lock: filter_view_name(
                name,
                lock_view.clone(),
@ -547,33 +593,31 @@ fn create_action<H: WarningHandler>(
        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(
                match keysym_valid(keysym.as_str()) {
                    true => keysym.clone(),
                    false => {
-                        warning_handler.handle(&format!(
+                        warning_handler.handle(
                            logging::Level::Warning,
                            &format!(
                                "Keysym name invalid: {}",
                                keysym,
-                        ));
+                            ),
                        );
                        "space".into() // placeholder
                    },
                }
            )),
        },
        SubmitData::Text(text) => ::action::Action::Submit {
-            text: {
+            text: CString::new(text.clone()).or_warn(
-                CString::new(text.clone())
+                warning_handler,
-                    .map_err(|e| {
+                logging::Problem::Warning,
-                        warning_handler.handle(&format!(
+                &format!("Text {} contains problems", text),
-                            "Text {} contains problems: {:?}",
+            ),
                            text,
                            e
                        ));
                        e
                    }).ok()
            },
            keys: text.chars().map(|codepoint| {
                let codepoint_string = codepoint.to_string();
                ::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
@ -581,13 +625,33 @@ fn create_action<H: WarningHandler>(
                    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(),
                }
            },
        },
    }
 }
 /// TODO: Since this will receive user-provided data,
 /// all .expect() on them should be turned into soft fails
-fn create_button<H: WarningHandler>(
+fn create_button<H: logging::Handler>(
    button_info: &HashMap<String, ButtonMeta>,
    outlines: &HashMap<String, Outline>,
    name: &str,
@ -611,14 +675,11 @@ fn create_button<H: WarningHandler>(
    } else if let Some(text) = &button_meta.text {
        ::layout::Label::Text(
            CString::new(text.as_str())
-                .unwrap_or_else(|e| {
+                .or_warn(
-                    warning_handler.handle(&format!(
+                    warning_handler,
-                        "Text {} is invalid: {}",
+                    logging::Problem::Warning,
-                        text,
+                    &format!("Text {} is invalid", text),
-                        e,
+                ).unwrap_or_else(|| CString::new("").unwrap())
                    ));
                    CString::new("").unwrap()
                })
        )
    } else {
        ::layout::Label::Text(cname.clone())
@ -629,7 +690,10 @@ fn create_button<H: WarningHandler>(
            if outlines.contains_key(outline) {
                outline.clone()
            } else {
-                warning_handler.handle(&format!("Outline named {} does not exist! Using default for button {}", outline, name));
+                warning_handler.handle(
                    logging::Level::Warning,
                    &format!("Outline named {} does not exist! Using default for button {}", outline, name)
                );
                "default".into()
            }
        }
@ -638,12 +702,11 @@ fn create_button<H: WarningHandler>(
    let outline = outlines.get(&outline_name)
        .map(|outline| (*outline).clone())
-        .unwrap_or_else(|| {
+        .or_warn(
-            warning_handler.handle(
+            warning_handler,
-                &format!("No default outline defined! Using 1x1!")
+            logging::Problem::Warning,
-            );
+            "No default outline defined! Using 1x1!",
-            Outline { width: 1f64, height: 1f64 }
+        ).unwrap_or(Outline { width: 1f64, height: 1f64 });
        });
    layout::Button {
        name: cname,
@ -658,17 +721,41 @@ fn create_button<H: WarningHandler>(
    }
 }
 fn extract_symbol_names<'a>(actions: &'a [(&str, action::Action)])
    -> impl Iterator<Item=&'a str>
 {
    actions.iter()
        .filter_map(|(_name, act)| {
            match act {
                action::Action::Submit {
                    text: _, keys,
                } => Some(keys),
                _ => None,
            }
        })
        .flatten()
        .map(|named_keysym| named_keysym.0.as_str())
 }
 #[cfg(test)]
 mod tests {
    use super::*;
-    use std::error::Error as ErrorTrait;
+    use ::logging::ProblemPanic;
-    use ::logging::PanicWarn;
+
    const THIS_FILE: &str = file!();
    fn path_from_root(file: &'static str) -> PathBuf {
        PathBuf::from(THIS_FILE)
            .parent().unwrap()
            .parent().unwrap()
            .join(file)
    }
    #[test]
    fn test_parse_path() {
        assert_eq!(
-            Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
+            Layout::from_file(path_from_root("tests/layout.yaml")).unwrap(),
            Layout {
                margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
                views: hashmap!(
@ -680,6 +767,7 @@ mod tests {
                        keysym: None,
                        action: None,
                        text: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -694,13 +782,14 @@ mod tests {
    /// Check if the default protection works
    #[test]
    fn test_empty_views() {
-        let out = Layout::from_file(PathBuf::from("tests/layout2.yaml"));
+        let out = Layout::from_file(path_from_root("tests/layout2.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
                let mut handled = false;
                if let Error::Yaml(ye) = &e {
-                    handled = ye.description() == "missing field `views`";
+                    handled = ye.to_string()
                        .starts_with("missing field `views`");
                };
                if !handled {
                    println!("Unexpected error {:?}", e);
@ -712,13 +801,13 @@ mod tests {
    #[test]
    fn test_extra_field() {
-        let out = Layout::from_file(PathBuf::from("tests/layout3.yaml"));
+        let out = Layout::from_file(path_from_root("tests/layout3.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
                let mut handled = false;
                if let Error::Yaml(ye) = &e {
-                    handled = ye.description()
+                    handled = ye.to_string()
                        .starts_with("unknown field `bad_field`");
                };
                if !handled {
@ -731,14 +820,14 @@ mod tests {
    #[test]
    fn test_layout_punctuation() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key1.yaml"))
            .unwrap()
-            .build(PanicWarn).0
+            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"]
+            out.views["base"].1
                .get_rows()[0].1
-                .buttons[0].1
+                .get_buttons()[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -746,14 +835,14 @@ mod tests {
    #[test]
    fn test_layout_unicode() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key2.yaml"))
            .unwrap()
-            .build(PanicWarn).0
+            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"]
+            out.views["base"].1
                .get_rows()[0].1
-                .buttons[0].1
+                .get_buttons()[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -762,24 +851,41 @@ mod tests {
    /// Test multiple codepoints
    #[test]
    fn test_layout_unicode_multi() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key3.yaml"))
            .unwrap()
-            .build(PanicWarn).0
+            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"]
+            out.views["base"].1
                .get_rows()[0].1
-                .buttons[0].1
+                .get_buttons()[0].1
                .state.borrow()
                .keycodes.len(),
            2
        );
    }
    /// Test if erase yields a useable keycode
    #[test]
    fn test_layout_erase() {
        let out = Layout::from_file(path_from_root("tests/layout_erase.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
            out.views["base"].1
                .get_rows()[0].1
                .buttons[0].1
                .state.borrow()
                .keycodes.len(),
            1
        );
    }
    #[test]
    fn parsing_fallback() {
        assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
-            .map(|layout| layout.build(PanicWarn).0.unwrap())
+            .map(|layout| layout.build(ProblemPanic).0.unwrap())
            .is_ok()
        );
    }
@ -821,13 +927,14 @@ mod tests {
                        keysym: None,
                        text: None,
                        action: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
                },
                ".",
                Vec::new(),
-                &mut PanicWarn,
+                &mut ProblemPanic,
            ),
            ::action::Action::Submit {
                text: Some(CString::new(".").unwrap()),
@ -838,9 +945,9 @@ mod tests {
    #[test]
    fn test_layout_margins() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_margins.yaml"))
            .unwrap()
-            .build(PanicWarn).0
+            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
            out.margins,
@ -852,4 +959,35 @@ mod tests {
            }
        );
    }
    #[test]
    fn test_extract_symbols() {
        let actions = [(
            "ac",
            action::Action::Submit {
                text: None,
                keys: vec![
                    action::KeySym("a".into()),
                    action::KeySym("c".into()),
                ],
            },
        )];
        assert_eq!(
            extract_symbol_names(&actions[..]).collect::<Vec<_>>(),
            vec!["a", "c"],
        );
    }
    #[test]
    fn test_extract_symbols_erase() {
        let actions = [(
            "Erase",
            action::Action::Erase,
        )];
        assert_eq!(
            extract_symbol_names(&actions[..]).collect::<Vec<_>>(),
            Vec::<&str>::new(), //"BackSpace"], // TODO: centralize handling of BackSpace
        );
    }
 }
--- a/src/dbus.c
+++ b/src/dbus.c
@ -0,0 +1,124 @@
 /*
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
 #include "dbus.h"
 #include <stdio.h>
 #include <gio/gio.h>
 void
 dbus_handler_destroy(DBusHandler *service)
 {
    g_free (service->object_path);
    if (service->connection) {
        if (service->registration_id > 0) {
            g_dbus_connection_unregister_object (service->connection,
                                                 service->registration_id);
            service->registration_id = 0;
        }
        g_object_unref (service->connection);
        service->connection = NULL;
    }
    if (service->introspection_data) {
        g_dbus_node_info_unref (service->introspection_data);
        service->introspection_data = NULL;
    }
    if (service->context) {
        g_signal_handlers_disconnect_by_data (service->context, service);
        service->context = NULL;
    }
    free(service);
 }
 static gboolean
 handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
                   gboolean arg_visible, gpointer user_data) {
    DBusHandler *service = user_data;
    if (service->context) {
        if (arg_visible) {
            server_context_service_show_keyboard (service->context);
        } else {
            server_context_service_hide_keyboard (service->context);
        }
    }
    sm_puri_osk0_complete_set_visible(object, invocation);
    return TRUE;
 }
 static void on_visible(DBusHandler *service,
                       GParamSpec *pspec,
                       ServerContextService *context)
 {
    (void)pspec;
    gboolean visible;
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (context));
    g_object_get (context, "visible", &visible, NULL);
    sm_puri_osk0_set_visible(service->dbus_interface, visible);
 }
 DBusHandler *
 dbus_handler_new (GDBusConnection *connection,
                      const gchar     *object_path)
 {
    DBusHandler *self = calloc(1, sizeof(DBusHandler));
    self->object_path = g_strdup(object_path);
    self->connection = connection;
    self->dbus_interface = sm_puri_osk0_skeleton_new();
    g_signal_connect(self->dbus_interface, "handle-set-visible",
                     G_CALLBACK(handle_set_visible), self);
    if (self->connection && self->object_path) {
        GError *error = NULL;
        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(self->dbus_interface),
                                              self->connection,
                                              self->object_path,
                                              &error)) {
            g_warning("Error registering dbus object: %s\n", error->message);
            g_clear_error(&error);
            // TODO: return an error
        }
    }
    return self;
 }
 void
 dbus_handler_set_ui_context(DBusHandler *service,
                             ServerContextService *context)
 {
    g_return_if_fail (!service->context);
    service->context = context;
    g_signal_connect_swapped (service->context,
                              "notify::visible",
                              G_CALLBACK(on_visible),
                              service);
 }
--- a/src/dbus.h
+++ b/src/dbus.h
@ -0,0 +1,48 @@
 /* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 * Copyright (C) 2019-2020 Purism, SPC
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef DBUS_H_
 #define DBUS_H_ 1
 #include "server-context-service.h"
 #include "sm.puri.OSK0.h"
 G_BEGIN_DECLS
 #define DBUS_SERVICE_PATH "/sm/puri/OSK0"
 #define DBUS_SERVICE_INTERFACE "sm.puri.OSK0"
 typedef struct _DBusHandler
 {
    GDBusConnection *connection;
    SmPuriOSK0 *dbus_interface;
    GDBusNodeInfo *introspection_data;
    guint registration_id;
    char *object_path;
    ServerContextService *context; // unowned reference
 } DBusHandler;
 DBusHandler * dbus_handler_new      (GDBusConnection *connection,
                                             const gchar     *object_path);
 void              dbus_handler_set_ui_context(DBusHandler *service,
                                               ServerContextService *context);
 void dbus_handler_destroy(DBusHandler*);
 G_END_DECLS
 #endif  /* DBUS_H_ */
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -3,9 +3,11 @@
 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;
@ -37,30 +39,37 @@ 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();
-        let view = layout.get_current_view();
+        layout.foreach_visible_button(|offset, button| {
        for (row_offset, row) in &view.get_rows() {
            for (x_offset, button) in &row.buttons {
            let state = RefCell::borrow(&button.state).clone();
-                if state.pressed == keyboard::PressType::Pressed || state.locked {
+            let active_mod = match &state.action {
                Action::ApplyModifier(m) => active_modifiers.contains(m),
                _ => false,
            };
            let locked = state.action.is_active(&layout.current_view)
                | active_mod;
            if state.pressed == keyboard::PressType::Pressed || locked {
                render_button_at_position(
                    renderer, &cr,
-                        row_offset + Point { x: *x_offset, y: 0.0 },
+                    offset,
                    button.as_ref(),
-                        state.pressed, state.locked,
+                    state.pressed, locked,
                );
            }
-            }
+        })
        }
    }
    #[no_mangle]
@ -72,17 +81,15 @@ mod c {
    ) {
        let layout = unsafe { &mut *layout };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
-        let view = layout.get_current_view();
+        
-        for (row_offset, row) in &view.get_rows() {
+        layout.foreach_visible_button(|offset, button| {
            for (x_offset, button) in &row.buttons {
            render_button_at_position(
                renderer, &cr,
-                    row_offset + Point { x: *x_offset, y: 0.0 },
+                offset,
                button.as_ref(),
                keyboard::PressType::Released, false,
            );
-            }
+        })
        }
    }
 }
--- a/src/imservice.c
+++ b/src/imservice.c
@ -1,9 +1,17 @@
-#include "imservice.h"
+#include "submission.h"
 #include <glib.h>
-#include "eekboard/eekboard-context-service.h"
+struct imservice;
 void imservice_handle_input_method_activate(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method,
                                       const char *text, uint32_t cursor, uint32_t anchor);
 void imservice_handle_done(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
 void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause);
 void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method);
 static const struct zwp_input_method_v2_listener input_method_listener = {
    .activate = imservice_handle_input_method_activate,
@ -11,29 +19,51 @@ static const struct zwp_input_method_v2_listener input_method_listener = {
    .surrounding_text = imservice_handle_surrounding_text,
    .text_change_cause = imservice_handle_text_change_cause,
    .content_type = imservice_handle_content_type,
-    .done = imservice_handle_commit_state,
+    .done = imservice_handle_done,
    .unavailable = imservice_handle_unavailable,
 };
-struct imservice* get_imservice(EekboardContextService *context,
+struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
-                                struct zwp_input_method_manager_v2 *manager,
+                                  struct zwp_virtual_keyboard_manager_v1 *vkmanager,
                                  struct wl_seat *seat,
                                  EekboardContextService *state) {
    struct zwp_input_method_v2 *im = NULL;
    if (immanager) {
        im = zwp_input_method_manager_v2_get_input_method(immanager, seat);
    }
    struct zwp_virtual_keyboard_v1 *vk = NULL;
    if (vkmanager) {
        vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
    }
    return submission_new(im, vk, state);
 }
 /// Un-inlined
 struct zwp_input_method_v2 *imservice_manager_get_input_method(struct zwp_input_method_manager_v2 *manager,
                                   struct wl_seat *seat) {
-    struct zwp_input_method_v2 *im = zwp_input_method_manager_v2_get_input_method(manager, seat);
+    return zwp_input_method_manager_v2_get_input_method(manager, seat);
-    struct imservice *imservice = imservice_new(im, context);
+}
-    /* Add a listener, passing the imservice instance to make it available to
+/// Un-inlined to let Rust link to it
-       callbacks. */
+void imservice_connect_listeners(struct zwp_input_method_v2 *im, struct imservice* imservice) {
    zwp_input_method_v2_add_listener(im, &input_method_listener, imservice);
    return imservice;
 }
-void imservice_make_visible(EekboardContextService *context) {
+void
-    eekboard_context_service_show_keyboard (context);
+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 imservice_try_hide(EekboardContextService *context) {
+void
-    eekboard_context_service_hide_keyboard (context);
+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,
--- a/src/imservice.h
+++ b/src/imservice.h
@ -1,25 +0,0 @@
 #ifndef __IMSERVICE_H
 #define __IMSERVICE_H
 #include "input-method-unstable-v2-client-protocol.h"
 #include "eek/eek-types.h"
 struct imservice;
 struct imservice* get_imservice(EekboardContextService *context,
                                struct zwp_input_method_manager_v2 *manager,
                                struct wl_seat *seat);
 // Defined in Rust
 struct imservice* imservice_new(struct zwp_input_method_v2 *im,
                                EekboardContextService *context);
 void imservice_handle_input_method_activate(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method,
                                       const char *text, uint32_t cursor, uint32_t anchor);
 void imservice_handle_commit_state(void *data, struct zwp_input_method_v2 *input_method);
 void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
 void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause);
 void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method);
 #endif
--- a/src/imservice.rs
+++ b/src/imservice.rs
@ -1,12 +1,20 @@
 /*! Manages zwp_input_method_v2 protocol.
 * 
 * Library module.
 */
 use std::boxed::Box;
 use std::ffi::CString;
 use std::fmt;
 use std::num::Wrapping;
 use std::string::String;
 use ::logging;
 use ::util::c::into_cstring;
 // Traits
 use std::convert::TryFrom;
 use ::logging::Warn;
 /// Gathers stuff defined in C or called by C
@ -15,49 +23,38 @@ pub mod c {
    use std::os::raw::{c_char, c_void};
    pub use ::submission::c::UIManager;
    pub use ::submission::c::StateManager;
    // The following defined in C
    /// struct zwp_input_method_v2*
    #[repr(transparent)]
    pub struct InputMethod(*const c_void);
    /// EekboardContextService*
    #[repr(transparent)]
    pub struct UIManager(*const c_void);
    #[no_mangle]
    extern "C" {
        fn imservice_destroy_im(im: *mut c::InputMethod);
-        fn eekboard_context_service_set_hint_purpose(imservice: *const UIManager, hint: u32, purpose: u32);
+        #[allow(improper_ctypes)] // IMService will never be dereferenced in C
-        fn eekboard_context_service_show_keyboard(imservice: *const UIManager);
+        pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
-        fn eekboard_context_service_hide_keyboard(imservice: *const UIManager);
+        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);
    }
    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
    #[no_mangle]
    pub unsafe extern "C"
    fn imservice_new(im: *const InputMethod, ui_manager: *const UIManager) -> *mut IMService {
        Box::<IMService>::into_raw(Box::new(
            IMService {
                im: im,
                ui_manager: ui_manager,
                pending: IMProtocolState::default(),
                current: IMProtocolState::default(),
                preedit_string: String::new(),
                serial: Wrapping(0u32),
            }
        ))
    }
    // TODO: is unsafe needed here?
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_input_method_activate(imservice: *mut IMService,
        im: *const InputMethod)
    {
        let imservice = check_imservice(imservice, im).unwrap();
-        imservice.preedit_string = String::new();
+        imservice.preedit_string = String::new(); // I don't think this is ever used. Remove it?
        imservice.pending = IMProtocolState {
            active: true,
            ..IMProtocolState::default()
@ -65,7 +62,7 @@ pub mod c {
    }
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_input_method_deactivate(imservice: *mut IMService,
        im: *const InputMethod)
    {
@ -77,7 +74,7 @@ pub mod c {
    }
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_surrounding_text(imservice: *mut IMService,
        im: *const InputMethod,
        text: *const c_char, cursor: u32, _anchor: u32)
@ -87,13 +84,13 @@ pub mod c {
            surrounding_text: into_cstring(text)
                .expect("Received invalid string")
                .expect("Received null string"),
-            surrounding_cursor: cursor,
+            cursor,
            ..imservice.pending.clone()
        };
    }
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_content_type(imservice: *mut IMService,
        im: *const InputMethod,
        hint: u32, purpose: u32)
@ -101,23 +98,27 @@ pub mod c {
        let imservice = check_imservice(imservice, im).unwrap();
        imservice.pending = IMProtocolState {
            content_hint: {
-                ContentHint::from_bits(hint).unwrap_or_else(|| {
+                ContentHint::from_bits(hint)
-                    eprintln!("Warning: received invalid hint flags");
+                    .or_print(
-                    ContentHint::NONE
+                        logging::Problem::Warning,
-                })
+                        "Received invalid hint flags",
                    )
                    .unwrap_or(ContentHint::NONE)
            },
            content_purpose: {
-                ContentPurpose::try_from(purpose).unwrap_or_else(|_e| {
+                ContentPurpose::try_from(purpose)
-                    eprintln!("Warning: Received invalid purpose value");
+                    .or_print(
-                    ContentPurpose::Normal
+                        logging::Problem::Warning,
-                })
+                        "Received invalid purpose value",
                    )
                    .unwrap_or(ContentPurpose::Normal)
            },
            ..imservice.pending.clone()
        };
    }
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_text_change_cause(imservice: *mut IMService,
        im: *const InputMethod,
        cause: u32)
@ -125,55 +126,63 @@ pub mod c {
        let imservice = check_imservice(imservice, im).unwrap();
        imservice.pending = IMProtocolState {
            text_change_cause: {
-                ChangeCause::try_from(cause).unwrap_or_else(|_e| {
+                ChangeCause::try_from(cause)
-                    eprintln!("Warning: received invalid cause value");
+                    .or_print(
-                    ChangeCause::InputMethod
+                        logging::Problem::Warning,
-                })
+                        "Received invalid cause value",
                    )
                    .unwrap_or(ChangeCause::InputMethod)
            },
            ..imservice.pending.clone()
        };
    }
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
-    fn imservice_handle_commit_state(imservice: *mut IMService,
+    fn imservice_handle_done(imservice: *mut IMService,
        im: *const InputMethod)
    {
        let imservice = check_imservice(imservice, im).unwrap();
        let active_changed = imservice.current.active ^ imservice.pending.active;
        imservice.serial += Wrapping(1u32);
        imservice.current = imservice.pending.clone();
-        imservice.pending = IMProtocolState {
+
            active: imservice.current.active,
            ..IMProtocolState::default()
        };
        if active_changed {
            if imservice.current.active {
-                eekboard_context_service_show_keyboard(imservice.ui_manager);
+                if let Some(ui) = imservice.ui_manager {
                    unsafe { server_context_service_show_keyboard(ui); }
                }
                unsafe {
                    eekboard_context_service_set_hint_purpose(
-                    imservice.ui_manager,
+                        imservice.state_manager,
                        imservice.current.content_hint.bits(),
-                    imservice.current.content_purpose.clone() as u32);
+                        imservice.current.content_purpose.clone() as u32,
                    );
                }
            } else {
-                eekboard_context_service_hide_keyboard(imservice.ui_manager);
+                if let Some(ui) = imservice.ui_manager {
                    unsafe { server_context_service_hide_keyboard(ui); }
                }
            }
        }
    }
    // TODO: this is really untested
    #[no_mangle]
-    pub unsafe extern "C"
+    pub extern "C"
    fn imservice_handle_unavailable(imservice: *mut IMService,
        im: *mut InputMethod)
    {
        let imservice = check_imservice(imservice, im).unwrap();
-        imservice_destroy_im(im);
+        unsafe { imservice_destroy_im(im); }
        // no need to care about proper double-buffering,
        // the keyboard is already decommissioned
        imservice.current.active = false;
-        eekboard_context_service_hide_keyboard(imservice.ui_manager);
+        if let Some(ui) = imservice.ui_manager {
            unsafe { server_context_service_hide_keyboard(ui); }
        }
    }    
    // FIXME: destroy and deallocate
@ -246,10 +255,17 @@ pub enum ContentPurpose {
    Terminal = 13,
 }
 // Utilities from ::logging need a printable error type
 pub struct UnrecognizedValue;
 impl fmt::Display for UnrecognizedValue {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "Unrecognized value")
    }
 }
 impl TryFrom<u32> for ContentPurpose {
-    // There's only one way to fail: number not in protocol,
+    type Error = UnrecognizedValue;
    // so no special error type is needed
    type Error = ();
    fn try_from(num: u32) -> Result<Self, Self::Error> {
        use self::ContentPurpose::*;
        match num {
@ -267,7 +283,7 @@ impl TryFrom<u32> for ContentPurpose {
            11 => Ok(Time),
            12 => Ok(Datetime),
            13 => Ok(Terminal),
-            _ => Err(()),
+            _ => Err(UnrecognizedValue),
        }
    }
 }
@ -280,14 +296,12 @@ pub enum ChangeCause {
 }
 impl TryFrom<u32> for ChangeCause {
-    // There's only one way to fail: number not in protocol,
+    type Error = UnrecognizedValue;
    // so no special error type is needed
    type Error = ();
    fn try_from(num: u32) -> Result<Self, Self::Error> {
        match num {
            0 => Ok(ChangeCause::InputMethod),
            1 => Ok(ChangeCause::Other),
-            _ => Err(())
+            _ => Err(UnrecognizedValue)
        }
    }
 }
@ -296,7 +310,7 @@ impl TryFrom<u32> for ChangeCause {
 #[derive(Clone)]
 struct IMProtocolState {
    surrounding_text: CString,
-    surrounding_cursor: u32,
+    cursor: u32,
    content_purpose: ContentPurpose,
    content_hint: ContentHint,
    text_change_cause: ChangeCause,
@ -307,7 +321,7 @@ impl Default for IMProtocolState {
    fn default() -> IMProtocolState {
        IMProtocolState {
            surrounding_text: CString::default(),
-            surrounding_cursor: 0, // TODO: mark that there's no cursor
+            cursor: 0, // TODO: mark that there's no cursor
            content_hint: ContentHint::NONE,
            content_purpose: ContentPurpose::Normal,
            text_change_cause: ChangeCause::InputMethod,
@ -318,12 +332,103 @@ impl Default for IMProtocolState {
 pub struct IMService {
    /// Owned reference (still created and destroyed in C)
-    pub im: *const c::InputMethod,
+    pub im: *mut c::InputMethod,
    /// Unowned reference. Be careful, it's shared with C at large
-    ui_manager: *const c::UIManager,
+    state_manager: *const c::StateManager,
    /// Unowned reference. Be careful, it's shared with C at large
    pub ui_manager: Option<*const c::UIManager>,
    pending: IMProtocolState,
    current: IMProtocolState, // turn current into an idiomatic representation?
-    preedit_string: String,
+    preedit_string: String, // I don't think this is ever used. Remove it?
    serial: Wrapping<u32>,
 }
 pub enum SubmitError {
    /// The input method had not been activated
    NotActive,
 }
 impl IMService {
    pub fn new(
        im: *mut c::InputMethod,
        state_manager: *const c::StateManager,
    ) -> Box<IMService> {
        // IMService will be referenced to by C,
        // so it needs to stay in the same place in memory via Box
        let imservice = Box::new(IMService {
            im,
            ui_manager: None,
            state_manager,
            pending: IMProtocolState::default(),
            current: IMProtocolState::default(),
            preedit_string: String::new(), // I don't think this is ever used. Remove it?
            serial: Wrapping(0u32),
        });
        unsafe {
            c::imservice_connect_listeners(
                im,
                imservice.as_ref() as *const IMService,
            );
        }
        imservice
    }
    pub fn commit_string(&mut self, text: &CString) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
                let cursor_position = self.pending.cursor.try_into().unwrap(); // Converts u32 of cursor to usize
                self.pending
                    .surrounding_text
                    .insert_str(cursor_position, text);
                self.pending.cursor += text.len() as u32;
                unsafe {
                    c::eek_input_method_commit_string(self.im, text.as_ptr())
                }
                Ok(())
            },
            false => Err(SubmitError::NotActive),
        }
    }
    pub fn delete_surrounding_text(
        &mut self,
        before: u32, after: u32,
    ) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
                let cursor_position: usize = self.pending.cursor.try_into().unwrap(); // Converts u32 of cursor to usize
                self.pending.surrounding_text.replace_range(
                    cursor_position - (before as usize)..cursor_position + (after as usize),
                    "",
                );
                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);
                imservice_handle_done(self);
                Ok(())
            },
            false => Err(SubmitError::NotActive),
        }
    }
    pub fn is_active(&self) -> bool {
        self.current.active
    }
 }
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -1,13 +1,16 @@
 /*! 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;
 // Traits
 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };
@ -17,16 +20,64 @@ pub enum PressType {
    Pressed = 1,
 }
 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(Clone, PartialEq)]
 pub struct KeyStateId(*const KeyState);
 #[derive(Debug, Clone)]
 pub struct KeyState {
    pub pressed: PressType,
-    pub locked: bool,
+    /// A cache of raw keycodes derived from Action::Submit given a keymap
-    /// A cache of raw keycodes derived from Action::Sumbit given a keymap
+    pub keycodes: Vec<KeyCode>,
    pub keycodes: Vec<u32>,
    /// Static description of what the key does when pressed or released
    pub action: Action,
 }
 impl KeyState {
    #[must_use]
    pub fn into_released(self) -> KeyState {
        KeyState {
            pressed: PressType::Released,
            ..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
 fn sorted<'a, I: Iterator<Item=&'a str>>(
    iter: I
@ -40,11 +91,12 @@ fn sorted<'a, I: Iterator<Item=&'a str>>(
 /// HACK: starting from 9, because 8 results in keycode 0,
 /// which the compositor likes to discard
 pub fn generate_keycodes<'a, C: IntoIterator<Item=&'a str>>(
-    key_names: C
+    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())
+        sorted(key_names.into_iter().chain(special_keysyms))
            .map(|name| String::from(name))
            .zip(9..)
    )
@ -71,9 +123,10 @@ impl From<io::Error> for FormattingError {
    }
 }
-/// Generates a de-facto single level keymap. TODO: actually drop second level
+/// Generates a de-facto single level keymap.
 /// Key codes must not repeat and should remain between 9 and 255.
 pub fn generate_keymap(
-    keystates: &HashMap::<String, KeyState>
+    symbolmap: HashMap::<String, KeyCode>,
 ) -> Result<String, FormattingError> {
    let mut buf: Vec<u8> = Vec::new();
    writeln!(
@ -82,63 +135,75 @@ pub fn generate_keymap(
    xkb_keycodes \"squeekboard\" {{
        minimum = 8;
-        maximum = 255;"
+        maximum = 999;"
    )?;
-    for (name, state) in keystates.iter() {
+    // Xorg can only consume up to 255 keys, so this may not work in Xwayland.
-        if let Action::Submit { text: _, keys } = &state.action {
+    // Two possible solutions:
-            if let 0 = keys.len() { eprintln!("Key {} has no keysyms", name); };
+    // - use levels to cram multiple characters into one key
-            for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
+    // - swap layouts on key presses
    for keycode in symbolmap.values() {
        write!(
            buf,
            "
-        <{}> = {};",
+        <I{}> = {0};",
                    named_keysym.0,
            keycode,
        )?;
    }
        }
    }
    writeln!(
        buf,
        "
        indicator 1 = \"Caps Lock\"; // Xwayland won't accept without it.
    }};
    xkb_symbols \"squeekboard\" {{
-
+"
        name[Group1] = \"Letters\";
        name[Group2] = \"Numbers/Symbols\";"
    )?;
-    for (name, state) in keystates.iter() {
+    for (name, keycode) in symbolmap.iter() {
        if let Action::Submit { text: _, keys } = &state.action {
            for keysym in keys.iter() {
        write!(
            buf,
            "
-        key <{}> {{ [ {0} ] }};",
+key <I{}> {{ [ {} ] }};",
-                    keysym.0,
+            keycode,
            name,
        )?;
    }
-        }
+
    }
    writeln!(
        buf,
        "
    }};
    xkb_types \"squeekboard\" {{
        virtual_modifiers Squeekboard; // No modifiers! Needed for Xorg for some reason.
-	type \"TWO_LEVEL\" {{
+        // Those names are needed for Xwayland.
-            modifiers = Shift;
+        type \"ONE_LEVEL\" {{
-            map[Shift] = Level2;
+            modifiers= none;
-            level_name[Level1] = \"Base\";
+            level_name[Level1]= \"Any\";
            level_name[Level2] = \"Shift\";
        }};
        type \"TWO_LEVEL\" {{
            level_name[Level1]= \"Base\";
        }};
        type \"ALPHABETIC\" {{
            level_name[Level1]= \"Base\";
        }};
        type \"KEYPAD\" {{
            level_name[Level1]= \"Base\";
        }};
        type \"SHIFT+ALT\" {{
            level_name[Level1]= \"Base\";
        }};
    }};
    xkb_compatibility \"squeekboard\" {{
        // Needed for Xwayland again.
        interpret Any+AnyOf(all) {{
            action= SetMods(modifiers=modMapMods,clearLocks);
        }};
    }};
 }};"
    )?;
@ -153,22 +218,13 @@ mod tests {
    use xkbcommon::xkb;
    use ::action::KeySym;
    #[test]
    fn test_keymap_multi() {
        let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
-        let keymap_str = generate_keymap(&hashmap!{
+        let keymap_str = generate_keymap(hashmap!{
-            "ac".into() => KeyState {
+            "a".into() => 9,
-                action: Action::Submit {
+            "c".into() => 10,
                    text: None,
                    keys: vec!(KeySym("a".into()), KeySym("c".into())),
                },
                keycodes: vec!(9, 10),
                locked: false,
                pressed: PressType::Released,
            },
        }).unwrap();
        let keymap = xkb::Keymap::new_from_string(
--- a/src/layout.h
+++ b/src/layout.h
@ -7,13 +7,23 @@
 #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"
 #include "text-input-unstable-v3-client-protocol.h"
 enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_BASE = 0,
    ARRANGEMENT_KIND_WIDE = 1,
 };
 struct squeek_layout_state {
    enum squeek_arrangement_kind arrangement;
    enum zwp_text_input_v3_content_purpose purpose;
    enum zwp_text_input_v3_content_hint hint;
    char *layout_name;
    char *overlay_name;
 };
 struct squeek_layout;
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
@ -33,21 +43,26 @@ const char *squeek_layout_get_keymap(const struct squeek_layout*);
 enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *);
 void squeek_layout_free(struct squeek_layout*);
-void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
+void squeek_layout_release(struct squeek_layout *layout,
                           struct submission *submission,
                           struct transformation widget_to_layout,
                           uint32_t timestamp,
                           EekboardContextService *manager,
                           EekGtkKeyboard *ui_keyboard);
-void squeek_layout_release_all_only(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp);
+void squeek_layout_release_all_only(struct squeek_layout *layout,
-void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
+                                    struct submission *submission,
                                    uint32_t timestamp);
 void squeek_layout_depress(struct squeek_layout *layout,
                           struct submission *submission,
                           double x_widget, double y_widget,
                           struct transformation widget_to_layout,
                           uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
-void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
+void squeek_layout_drag(struct squeek_layout *layout,
                        struct submission *submission,
                        double x_widget, double y_widget,
                        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);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr, struct submission *submission);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
--- a/src/lib.rs
+++ b/src/lib.rs
@ -15,6 +15,9 @@ extern crate regex;
 extern crate serde;
 extern crate xkbcommon;
 #[macro_use]
 mod logging;
 mod action;
 pub mod data;
 mod drawing;
@ -24,13 +27,14 @@ mod keyboard;
 mod layout;
 mod locale;
 mod locale_config;
 mod logging;
 mod manager;
 mod outputs;
 mod popover;
 mod resources;
 mod submission;
 mod style;
 mod submission;
 pub mod tests;
 pub mod util;
 mod ui_manager;
 mod vkeyboard;
 mod xdg;
--- a/src/locale.rs
+++ b/src/locale.rs
@ -8,6 +8,7 @@
 use std::cmp;
 use std::ffi::{ CStr, CString };
 use std::fmt;
 use std::os::raw::c_char;
 use std::ptr;
 use std::str::Utf8Error;
@ -47,6 +48,12 @@ pub enum Error {
    NoInfo,
 }
 impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        fmt::Debug::fmt(&self, f)
    }
 }
 pub struct XkbInfo(c::GnomeXkbInfo);
 impl XkbInfo {
--- a/src/locale_config.rs
+++ b/src/locale_config.rs
@ -31,21 +31,15 @@ pub enum Error {
 impl ::std::fmt::Display for Error {
    fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        use ::std::error::Error;
+        out.write_str(match self {
        out.write_str(self.description())
    }
 }
 impl ::std::error::Error for Error {
    fn description(&self) -> &str {
        match self {
            &Error::NotWellFormed => "Language tag is not well-formed.",
            // this is exception: here we do want exhaustive match so we don't publish version with
            // missing descriptions by mistake.
            &Error::__NonExhaustive => panic!("Placeholder error must not be instantiated!"),
        })
    }
 }
-}
+
 /// Convenience Result alias.
 type Result<T> = ::std::result::Result<T, Error>;
--- a/src/logging.rs
+++ b/src/logging.rs
@ -26,13 +26,15 @@
 * 4. logging to an immutable destination type
 * 
 *   Same as above, except it can be parallelized.
 *   Logs being outputs, they get returned
 *   instead of being misleadingly passed back through arguments.
 *   It seems more difficult to pass the logger around,
 *   but this may be a solved problem from the area of functional programming.
 * 
 * This library generally aims at the approach in 3.
 * */
-use std::error::Error;
+use std::fmt::Display;
 /// Levels are not in order.
 pub enum Level {
@ -66,18 +68,84 @@ pub enum Level {
    Debug,
 }
-/// Sugar for logging errors in results.
+impl Level {
-/// Approach 2.
+    fn as_str(&self) -> &'static str {
-pub trait Warn {
+        match self {
-    type Value;
+            Level::Panic => "Panic",
-    fn or_warn(self, msg: &str) -> Option<Self::Value>;
+            Level::Bug => "Bug",
            Level::Error => "Error",
            Level::Warning => "Warning",
            Level::Surprise => "Surprise",
            Level::Info => "Info",
            Level::Debug => "Debug",
        }
    }
 }
-impl<T, E: Error> Warn for Result<T, E> {
+impl From<Problem> for Level {
    fn from(problem: Problem) -> Level {
        use self::Level::*;
        match problem {
            Problem::Panic => Panic,
            Problem::Bug => Bug,
            Problem::Error => Error,
            Problem::Warning => Warning,
            Problem::Surprise => Surprise,
        }
    }
 }
 /// Only levels which indicate problems
 /// To use with `Result::Err` handlers,
 /// which are needed only when something went off the optimal path.
 /// A separate type ensures that `Err`
 /// can't end up misclassified as a benign event like `Info`.
 pub enum Problem {
    Panic,
    Bug,
    Error,
    Warning,
    Surprise,
 }
 /// Sugar for approach 2
 // TODO: avoid, deprecate.
 // Handler instances should be long lived, not one per call.
 macro_rules! log_print {
    ($level:expr, $($arg:tt)*) => (::logging::print($level, &format!($($arg)*)))
 }
 /// Approach 2
 pub fn print(level: Level, message: &str) {
    Print{}.handle(level, message)
 }
 /// Sugar for logging errors in results.
 pub trait Warn where Self: Sized {
    type Value;
    /// Approach 2.
    fn or_print(self, level: Problem, message: &str) -> Option<Self::Value> {
        self.or_warn(&mut Print {}, level.into(), message)
    }
    /// Approach 3.
    fn or_warn<H: Handler>(
        self,
        handler: &mut H,
        level: Problem,
        message: &str,
    ) -> Option<Self::Value>;
 }
 impl<T, E: Display> Warn for Result<T, E> {
    type Value = T;
-    fn or_warn(self, msg: &str) -> Option<T> {
+    fn or_warn<H: Handler>(
        self,
        handler: &mut H,
        level: Problem,
        message: &str,
    ) -> Option<T> {
        self.map_err(|e| {
-            eprintln!("{}: {}", msg, e);
+            handler.handle(level.into(), &format!("{}: {}", message, e));
            e
        }).ok()
    }
@ -85,9 +153,14 @@ impl<T, E: Error> Warn for Result<T, E> {
 impl<T> Warn for Option<T> {
    type Value = T;
-    fn or_warn(self, msg: &str) -> Option<T> {
+    fn or_warn<H: Handler>(
        self,
        handler: &mut H,
        level: Problem,
        message: &str,
    ) -> Option<T> {
        self.or_else(|| {
-            eprintln!("{}", msg);
+            handler.handle(level.into(), message);
            None
        })
    }
@ -95,26 +168,34 @@ impl<T> Warn for Option<T> {
 /// A mutable handler for text warnings.
 /// Approach 3.
-pub trait WarningHandler {
+pub trait Handler {
-    /// Handle a warning
+    /// Handle a log message
-    fn handle(&mut self, warning: &str);
+    fn handle(&mut self, level: Level, message: &str);
 }
-/// Prints warnings to stderr
+/// Prints info to stdout, everything else to stderr
-pub struct PrintWarnings;
+pub struct Print;
-impl WarningHandler for PrintWarnings {
+impl Handler for Print {
-    fn handle(&mut self, warning: &str) {
+    fn handle(&mut self, level: Level, message: &str) {
-        eprintln!("{}", warning);
+        match level {
            Level::Info => println!("Info: {}", message),
            l => eprintln!("{}: {}", l.as_str(), message),
        }
    }
 }
-/// Warning handler that will panic at any warning.
+/// Warning handler that will panic
 /// at any warning, error, surprise, bug, or panic.
 /// Don't use except in tests
-pub struct PanicWarn;
+pub struct ProblemPanic;
-impl WarningHandler for PanicWarn {
+impl Handler for ProblemPanic {
-    fn handle(&mut self, warning: &str) {
+    fn handle(&mut self, level: Level, message: &str) {
-        panic!("{}", warning);
+        use self::Level::*;
        match level {
            Panic | Bug | Error | Warning | Surprise => panic!("{}", message),
            l => Print{}.handle(l, message),
        }
    }
 }
--- a/src/meson.build
+++ b/src/meson.build
@ -12,7 +12,9 @@ config_h = configure_file(
 sources = [
  config_h,
  'dbus.c',
  'imservice.c',
  'popover.c',
  'server-context-service.c',
  'wayland.c',
  '../eek/eek.c',
@ -21,12 +23,9 @@ sources = [
  '../eek/eek-keyboard.c',
  '../eek/eek-renderer.c',
  '../eek/eek-types.c',
  '../eek/eek-xml-layout.c',
  '../eek/layersurface.c',
  dbus_src,
  '../eekboard/key-emitter.c',
  '../eekboard/eekboard-context-service.c',
  '../eekboard/eekboard-service.c',
  #  '../eekboard/eekboard-xklutil.c',
  squeekboard_resources,
  wl_proto_sources,
@ -38,9 +37,10 @@ cc = meson.get_compiler('c')
 deps = [
 #  dependency('glib-2.0', version: '>=2.26.0'),
  dependency('gio-2.0', version: '>=2.26.0'),
  dependency('gio-unix-2.0'),
  dependency('gnome-desktop-3.0', version: '>=3.0'),
  dependency('gtk+-3.0', version: '>=3.0'),
-  dependency('libcroco-0.6'),
+  dependency('libfeedback-0.0'),
  dependency('wayland-client', version: '>=1.14'),
  dependency('xkbcommon'),
  cc.find_library('m'),
@ -57,7 +57,8 @@ rslibs = custom_target(
    output: ['librs.a'],
    install: false,
    console: true,
-    command: [cargo_build] + cargo_build_flags + ['@OUTPUT@', '--lib']
+    command: [cargo_build] + ['@OUTPUT@', '--lib'] + cargo_build_flags,
    depends: cargo_toml,
 )
 build_rstests = custom_target(
@ -71,17 +72,17 @@ build_rstests = custom_target(
    output: ['src'],
    install: false,
    console: true,
-    command: [cargo_script, 'test', '--no-run'],
+    command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
-    depends: rslibs, # no point building tests if the code itself fails
+    depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
 )
 test(
    'rstest',
    cargo_script,
-    args: ['test'],
+    args: ['test'] + cargo_build_flags,
    # this is a whole Carg-based test suite, let it run for a while
    timeout: 900,
-    depends: build_rstests,
+    depends: [build_rstests, cargo_toml],
 )
 libsqueekboard = static_library('libsqueekboard',
--- a/src/outputs.h
+++ b/src/outputs.h
@ -4,10 +4,14 @@
 #include "wayland-client-protocol.h"
 struct squeek_outputs;
 struct squeek_output_handle {
    struct wl_output *output;
    struct squeek_outputs *outputs;
 };
-struct squeek_outputs *squeek_outputs_new();
+struct squeek_outputs *squeek_outputs_new(void);
 void squeek_outputs_free(struct squeek_outputs*);
 void squeek_outputs_register(struct squeek_outputs*, struct wl_output *output);
-struct wl_output *squeek_outputs_get_current(struct squeek_outputs*);
+struct squeek_output_handle squeek_outputs_get_current(struct squeek_outputs*);
 int32_t squeek_outputs_get_perceptual_width(struct squeek_outputs*, struct wl_output *output);
 #endif
--- a/src/outputs.rs
+++ b/src/outputs.rs
@ -1,7 +1,10 @@
 /*! Managing Wayland outputs */
 use std::vec::Vec;
 use ::logging;
 // traits
 use ::logging::Warn;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -14,7 +17,7 @@ pub mod c {
    // Defined in C
    #[repr(transparent)]
-    #[derive(Clone, PartialEq)]
+    #[derive(Clone, PartialEq, Copy)]
    pub struct WlOutput(*const c_void);
    #[repr(C)]
@ -102,6 +105,24 @@ pub mod c {
    type COutputs = ::util::c::Wrapped<Outputs>;
    /// A stable reference to an output.
    #[derive(Clone)]
    #[repr(C)]
    pub struct OutputHandle {
        wl_output: WlOutput,
        outputs: COutputs,
    }
    impl OutputHandle {
        // Cannot return an Output reference
        // because COutputs is too deeply wrapped
        pub fn get_state(&self) -> Option<OutputState> {
            let outputs = self.outputs.clone_ref();
            let outputs = outputs.borrow();
            find_output(&outputs, self.wl_output.clone()).map(|o| o.current.clone())
        }
    }
    // Defined in Rust
    extern fn outputs_handle_geometry(
@ -113,14 +134,11 @@ pub mod c {
        _make: *const c_char, _model: *const c_char,
        transform: i32,
    ) {
-        let transform = Transform::from_u32(transform as u32).unwrap_or_else(
+        let transform = Transform::from_u32(transform as u32)
-            || {
+            .or_print(
-                eprintln!(
+                logging::Problem::Warning,
-                    "Warning: received invalid wl_output.transform value"
+                "Received invalid wl_output.transform value",
-                );
+            ).unwrap_or(Transform::Normal);
                Transform::Normal
            }
        );
        let outputs = outputs.clone_ref();
        let mut collection = outputs.borrow_mut();
@ -129,7 +147,10 @@ pub mod c {
                .map(|o| &mut o.pending);
        match output_state {
            Some(state) => { state.transform = Some(transform) },
-            None => eprintln!("Wayland error: Got mode on unknown output"),
+            None => log_print!(
                logging::Level::Warning,
                "Got geometry on unknown output",
            ),
        };
    }
@ -141,10 +162,12 @@ pub mod c {
        height: i32,
        _refresh: i32,
    ) {
-        let flags = Mode::from_bits(flags).unwrap_or_else(|| {
+        let flags = Mode::from_bits(flags)
-            eprintln!("Warning: received invalid wl_output.mode flags");
+            .or_print(
-            Mode::NONE
+                logging::Problem::Warning,
-        });
+                "Received invalid wl_output.mode flags",
            ).unwrap_or(Mode::NONE);
        let outputs = outputs.clone_ref();
        let mut collection = outputs.borrow_mut();
        let output_state: Option<&mut OutputState>
@ -156,7 +179,10 @@ pub mod c {
                    state.current_mode = Some(super::Mode { width, height});
                }
            },
-            None => eprintln!("Wayland error: Got mode on unknown output"),
+            None => log_print!(
                logging::Level::Warning,
                "Got mode on unknown output",
            ),
        };
    }
@ -169,7 +195,10 @@ pub mod c {
        let output = find_output_mut(&mut collection, wl_output);
        match output {
            Some(output) => { output.current = output.pending.clone(); }
-            None => eprintln!("Wayland error: Got done on unknown output"),
+            None => log_print!(
                logging::Level::Warning,
                "Got done on unknown output",
            ),
        };
    }
@ -185,7 +214,10 @@ pub mod c {
                .map(|o| &mut o.pending);
        match output_state {
            Some(state) => { state.scale = factor; }
-            None => eprintln!("Wayland error: Got done on unknown output"),
+            None => log_print!(
                logging::Level::Warning,
                "Got scale on unknown output",
            ),
        };
    }
@ -226,43 +258,15 @@ pub mod c {
    #[no_mangle]
    pub extern "C"
-    fn squeek_outputs_get_current(raw_collection: COutputs) -> WlOutput {
+    fn squeek_outputs_get_current(raw_collection: COutputs) -> OutputHandle {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
-        collection.outputs[0].output.clone()
+        OutputHandle {
            wl_output: collection.outputs[0].output.clone(),
            outputs: raw_collection.clone(),
        }
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_outputs_get_perceptual_width(
        raw_collection: COutputs,
        wl_output: WlOutput,
    ) -> i32 {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
        let output_state = find_output(&collection, wl_output)
            .map(|o| &o.current);
        match output_state {
            Some(OutputState {
                current_mode: Some(super::Mode { width, height } ),
                transform: Some(transform),
                scale,
            }) => {
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => width / scale,
                    _ => height / scale,
                }
            },
            _ => {
                eprintln!("Not enough info registered on output");
                0
            },
        }
    }
    // TODO: handle unregistration
    fn find_output(
@ -288,6 +292,14 @@ pub mod c {
    }
 }
 /// Generic size
 #[derive(Clone)]
 pub struct Size {
    pub width: u32,
    pub height: u32,
 }
 /// wl_output mode
 #[derive(Clone)]
 struct Mode {
    width: i32,
@ -298,10 +310,16 @@ struct Mode {
 pub struct OutputState {
    current_mode: Option<Mode>,
    transform: Option<c::Transform>,
-    scale: i32,
+    pub scale: i32,
 }
 impl OutputState {
    // More properly, this would have been a builder kind of struct,
    // with wl_output gradually adding properties to it
    // before it reached a fully initialized state,
    // when it would transform into a struct without all (some?) of the Options.
    // However, it's not clear which state is fully initialized,
    // and whether it would make things easier at all anyway.
    fn uninitialized() -> OutputState {
        OutputState {
            current_mode: None,
@ -309,6 +327,32 @@ impl OutputState {
            scale: 1,
        }
    }
    pub fn get_pixel_size(&self) -> Option<Size> {
        use self::c::Transform;
        match self {
            OutputState {
                current_mode: Some(Mode { width, height } ),
                transform: Some(transform),
                scale: _,
            } => Some(
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => Size {
                        width: *width as u32,
                        height: *height as u32,
                    },
                    _ => Size {
                        width: *height as u32,
                        height: *width as u32,
                    },
                }
            ),
            _ => None,
        }
    }
 }
 pub struct Output {
--- a/src/popover.c
+++ b/src/popover.c
@ -0,0 +1,69 @@
 #include <gio/gio.h>
 static void
 call_dbus_cb (GDBusProxy *proxy,
              GAsyncResult *res,
              gpointer user_data)
 {
  g_autoptr (GError) err = NULL;
  g_autoptr (GVariant) output = NULL;
  output = g_dbus_proxy_call_finish (proxy, res, &err);
  if (err) {
    g_warning ("Can't open panel %s", err->message);
  }
  g_object_unref (proxy);
 }
 static void
 create_dbus_proxy_cb (GObject *source_object, GAsyncResult *res, char *panel)
 {
  GDBusProxy *proxy;
  g_autoptr (GError) err = NULL;
  GVariantBuilder builder;
  GVariant *params[3];
  GVariant *array[1];
  proxy = g_dbus_proxy_new_for_bus_finish (res, &err);
  if (err != NULL) {
    g_warning ("Can't open panel %s: %s", panel, err->message);
    g_free (panel);
    return;
  }
  g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
  g_variant_builder_add (&builder, "v", g_variant_new_string (""));
  array[0] = g_variant_new ("v", g_variant_new ("(sav)", panel, &builder));
  params[0] = g_variant_new_string ("launch-panel");
  params[1] = g_variant_new_array (G_VARIANT_TYPE ("v"), array, 1);
  params[2] = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
  g_dbus_proxy_call (proxy,
             "Activate",
             g_variant_new_tuple (params, 3),
             G_DBUS_CALL_FLAGS_NONE,
             -1,
             NULL,
             (GAsyncReadyCallback) call_dbus_cb,
             NULL);
  g_free (panel);
 }
 void
 popover_open_settings_panel (char *panel)
 {
  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                G_DBUS_PROXY_FLAGS_NONE,
                NULL,
                "org.gnome.ControlCenter",
                "/org/gnome/ControlCenter",
                "org.gtk.Actions",
                NULL,
                (GAsyncReadyCallback) create_dbus_proxy_cb,
                g_strdup (panel));
 }
--- a/src/popover.rs
+++ b/src/popover.rs
@ -3,23 +3,38 @@
 use gio;
 use gtk;
 use std::ffi::CString;
 use std::cmp::Ordering;
 use ::layout::c::{ Bounds, EekGtkKeyboard };
 use ::locale;
 use ::locale::{ OwnedTranslation, Translation, compare_current_locale };
 use ::locale_config::system_locale;
 use ::logging;
 use ::manager;
 use ::resources;
 // Traits
 use gio::ActionMapExt;
 use gio::SettingsExt;
 #[cfg(feature = "gio_v0_5")]
 use gio::SimpleActionExt;
 use glib::translate::FromGlibPtrNone;
 use glib::variant::ToVariant;
 #[cfg(not(feature = "gtk_v0_5"))]
 use gtk::BuilderExtManual;
 use gtk::PopoverExt;
 use gtk::WidgetExt;
 use std::io::Write;
 use ::logging::Warn;
 mod c {
    use std::os::raw::c_char;
    #[no_mangle]
    extern "C" {
        pub fn popover_open_settings_panel(panel: *const c_char);
    }
 }
 mod variants {
    use glib;
    use glib::Variant;
@ -28,6 +43,7 @@ mod variants {
    use glib::ToVariant;
    use glib::translate::FromGlibPtrFull;
    use glib::translate::FromGlibPtrNone;
    use glib::translate::ToGlibPtr;
    /// Unpacks tuple & array variants
@ -90,7 +106,7 @@ mod variants {
            unsafe {
                let ret = glib_sys::g_variant_builder_end(builder);
                glib_sys::g_variant_builder_unref(builder);
-                glib::Variant::from_glib_full(ret)
+                glib::Variant::from_glib_none(ret)
            }
        }
    }
@ -122,6 +138,12 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
        xml,
        "
    </section>
    <section>
        <item>
            <attribute name=\"label\" translatable=\"yes\">Keyboard Settings</attribute>
            <attribute name=\"action\">settings</attribute>
        </item>
    </section>
  </menu>
 </interface>"
    ).unwrap();
@ -130,8 +152,28 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
    )
 }
 fn get_settings(schema_name: &str) -> Option<gio::Settings> {
    let mut error_handler = logging::Print{};
    gio::SettingsSchemaSource::get_default()
        .or_warn(
            &mut error_handler,
            logging::Problem::Surprise,
            "No gsettings schemas installed.",
        )
        .and_then(|sss| 
            sss.lookup(schema_name, true)
                .or_warn(
                    &mut error_handler,
                    logging::Problem::Surprise,
                    &format!("Gsettings schema {} not installed", schema_name),
                )
        )
        .map(|_sschema| gio::Settings::new(schema_name))
 }
 fn set_layout(kind: String, name: String) {
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
    if let Some(settings) = settings {
        let inputs = settings.get_value("sources").unwrap();
        let current = (kind.clone(), name.clone());
        let inputs = variants::get_tuples(inputs).into_iter()
@ -140,10 +182,11 @@ 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 reference to what the user wants to see
 #[derive(PartialEq, Clone, Debug)]
@ -221,14 +264,10 @@ fn translate_layout_names(layouts: &Vec<LayoutId>) -> Vec<OwnedTranslation> {
            LayoutId::System { name, kind: _ } => {
                xkb_translator.get_display_name(name)
                    .map(|s| Status::Translated(OwnedTranslation(s)))
-                    .unwrap_or_else(|e| {
+                    .or_print(
-                        eprintln!(
+                        logging::Problem::Surprise,
-                            "No display name for xkb layout {}: {:?}",
+                        &format!("No display name for xkb layout {}", name),
-                            name,
+                    ).unwrap_or_else(|| Status::Remaining(name.clone()))
                            e,
                        );
                        Status::Remaining(name.clone())
                    })
            },
            LayoutId::Local(name) => Status::Remaining(name.clone()),
        });
@ -242,10 +281,13 @@ fn translate_layout_names(layouts: &Vec<LayoutId>) -> Vec<OwnedTranslation> {
                .as_ref()
                .to_owned()
        )
-        .or_warn("No locale detected")
+        .or_print(logging::Problem::Surprise, "No locale detected")
        .and_then(|lang| {
            resources::get_layout_names(lang.as_str())
-                .or_warn(&format!("No translations for locale {}", lang))
+                .or_print(
                    logging::Problem::Surprise,
                    &format!("No translations for locale {}", lang),
                )
        });
    match builtin_translations {
@ -283,9 +325,13 @@ pub fn show(
    let overlay_layouts = resources::get_overlays().into_iter()
        .map(|name| LayoutId::Local(name.to_string()));
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
    let inputs = settings
        .map(|settings| {
            let inputs = settings.get_value("sources").unwrap();
-    let inputs = variants::get_tuples(inputs);
+            variants::get_tuples(inputs)
        })
        .unwrap_or_else(|| Vec::new());
    let system_layouts: Vec<LayoutId> = inputs.into_iter()
        .map(|(kind, name)| LayoutId::System { kind, name })
@ -304,8 +350,13 @@ pub fn show(
        .zip(all_layouts.clone().into_iter())
        .collect();
-    human_names.sort_unstable_by(|(tr_a, _), (tr_b, _)| {
+    human_names.sort_unstable_by(|(tr_a, layout_a), (tr_b, layout_b)| {
-        compare_current_locale(&tr_a.0, &tr_b.0)
+        // Sort first by layout then name
        match (layout_a, layout_b) {
            (LayoutId::Local(_), LayoutId::System { .. }) => Ordering::Greater,
            (LayoutId::System { .. }, LayoutId::Local(_)) => Ordering::Less,
            _ => compare_current_locale(&tr_a.0, &tr_b.0)
        }
    });
    // GVariant doesn't natively support `enum`s,
@ -361,10 +412,10 @@ pub fn show(
            match state {
                Some(v) => {
                    v.get::<String>()
-                        .or_else(|| {
+                        .or_print(
-                            eprintln!("Variant is not string: {:?}", v);
+                            logging::Problem::Bug,
-                            None
+                            &format!("Variant is not string: {:?}", v)
-                        })
+                        )
                        .map(|state| {
                            let (_id, layout) = choices.iter()
                                .find(
@ -376,13 +427,22 @@ pub fn show(
                            )
                        });
                },
-                None => eprintln!("No variant selected"),
+                None => log_print!(
                    logging::Level::Debug,
                    "No variant selected",
                ),
            };
            menu_inner.popdown();
        });
        let settings_action = gio::SimpleAction::new("settings", None);
        settings_action.connect_activate(move |_, _| {
            unsafe { c::popover_open_settings_panel(CString::new("region").unwrap().as_ptr()) };
        });
        let action_group = gio::SimpleActionGroup::new();
        action_group.add_action(&layout_action);
        action_group.add_action(&settings_action);
        menu.insert_action_group("popup", Some(&action_group));
    };
--- a/src/resources.rs
+++ b/src/resources.rs
@ -11,22 +11,34 @@ use std::iter::FromIterator;
 // and what a convenience layout. "_wide" is not a layout,
 // neither is "number"
 const KEYBOARDS: &[(*const str, *const str)] = &[
-    // layouts
+    // layouts: us must be left as first, as it is the,
    // fallback layout. The others should be alphabetical.
    ("us", include_str!("../data/keyboards/us.yaml")),
    ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
    ("br", include_str!("../data/keyboards/br.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
    ("be", include_str!("../data/keyboards/be.yaml")),
    ("be_wide", include_str!("../data/keyboards/be_wide.yaml")),
    ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
-    ("el", include_str!("../data/keyboards/el.yaml")),
+    ("dk", include_str!("../data/keyboards/dk.yaml")),
    ("es", include_str!("../data/keyboards/es.yaml")),
    ("fi", include_str!("../data/keyboards/fi.yaml")),
    ("fr", include_str!("../data/keyboards/fr.yaml")),
    ("fr_wide", include_str!("../data/keyboards/fr_wide.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")),
    ("ru", include_str!("../data/keyboards/ru.yaml")),
    ("se", include_str!("../data/keyboards/se.yaml")),
    ("ua", include_str!("../data/keyboards/ua.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
    ("terminal_wide", include_str!("../data/keyboards/terminal_wide.yaml")),
    // Overlays
    ("emoji", include_str!("../data/keyboards/emoji.yaml")),
 ];
@ -65,6 +77,7 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
    ("es-ES", include_str!("../data/langs/es-ES.txt")),
    ("ja-JP", include_str!("../data/langs/ja-JP.txt")),
    ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
    ("ru-RU", include_str!("../data/langs/ru-RU.txt")),
 ];
 pub fn get_layout_names(lang: &str)
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -23,136 +23,123 @@
 #include "eek/eek.h"
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/layersurface.h"
 #include "eekboard/eekboard-context-service.h"
 #include "submission.h"
 #include "wayland.h"
 #include "server-context-service.h"
 enum {
    PROP_0,
-    PROP_SIZE_CONSTRAINT_LANDSCAPE,
+    PROP_VISIBLE,
-    PROP_SIZE_CONSTRAINT_PORTRAIT,
+    PROP_ENABLED,
    PROP_LAST
 };
 typedef struct _ServerContextServiceClass ServerContextServiceClass;
 struct _ServerContextService {
-    EekboardContextService parent;
+    GObject parent;
-    PhoshLayerSurface *window;
+    EekboardContextService *state; // unowned
-    GtkWidget *widget;
+    /// Needed for instantiating the widget
-    guint hiding;
+    struct submission *submission; // unowned
-    guint last_requested_height;
+    struct squeek_layout_state *layout;
-    enum squeek_arrangement_kind last_type;
+    struct ui_manager *manager; // unowned
    gdouble size_constraint_landscape[2];
    gdouble size_constraint_portrait[2];
 };
 struct _ServerContextServiceClass {
    EekboardContextServiceClass parent_class;
 };
 G_DEFINE_TYPE (ServerContextService, server_context_service, EEKBOARD_TYPE_CONTEXT_SERVICE);
 static void
 on_destroy (GtkWidget *widget, gpointer user_data)
 {
    ServerContextService *context = user_data;
    g_assert (widget == GTK_WIDGET(context->window));
    context->window = NULL;
    context->widget = NULL;
    eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
 }
 static void
 make_widget (ServerContextService *context);
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    ServerContextService *context)
 {
    const LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
    if (!keyboard)
        g_error("Programmer error: keyboard layout was unset!");
    // The keymap will get set even if the window is hidden.
    // It's not perfect,
    // but simpler than adding a check in the window showing procedure
    eekboard_context_service_set_keymap(EEKBOARD_CONTEXT_SERVICE(context),
                                        keyboard);
    /* Recreate the keyboard widget to keep in sync with the keymap. */
    if (context->window)
        make_widget(context);
    gboolean visible;
-    g_object_get (context, "visible", &visible, NULL);
+    gboolean enabled;
    PhoshLayerSurface *window;
    GtkWidget *widget; // nullable
    guint hiding;
    guint last_requested_height;
 };
-    if (visible) {
+G_DEFINE_TYPE(ServerContextService, server_context_service, G_TYPE_OBJECT);
-        eekboard_context_service_hide_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
+
-        eekboard_context_service_show_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
+static void
-    }
+on_destroy (ServerContextService *self, GtkWidget *widget)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
    g_assert (widget == GTK_WIDGET(self->window));
    self->window = NULL;
    self->widget = NULL;
    //eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
 }
 static void
-on_notify_map (GObject    *object,
+on_notify_map (ServerContextService *self, GtkWidget *widget)
               ServerContextService *context)
 {
-    g_object_set (context, "visible", TRUE, NULL);
+    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
    g_object_set (self, "visible", TRUE, NULL);
 }
 static void
-on_notify_unmap (GObject    *object,
+on_notify_unmap (ServerContextService *self, GtkWidget *widget)
                 ServerContextService *context)
 {
-    (void)object;
+    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
-    g_object_set (context, "visible", FALSE, NULL);
+
    g_object_set (self, "visible", FALSE, NULL);
 }
 static uint32_t
-calculate_height(int32_t width)
+calculate_height(int32_t width, GdkRectangle *geometry)
 {
-    uint32_t height = 180;
+    uint32_t height;
-    if (width < 360 && width > 0) {
+    if (geometry->width > geometry->height) {
        // 1:5 ratio works fine on lanscape mode, and makes sure there's
        // room left for the app window
        height = width / 5;
    } else {
        if (width < 540 && width > 0) {
            height = ((unsigned)width * 7 / 12); // to match 360×210
-    } else if (width < 540) {
+        } else {
-        height = 180 + (540 - (unsigned)width) * 30 / 180; // smooth transition
+            // Here we switch to wide layout, less height needed
            height = ((unsigned)width * 7 / 22);
        }
    }
    return height;
 }
 enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 540) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
-on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
+on_surface_configure(ServerContextService *self, PhoshLayerSurface *surface)
 {
    GdkDisplay *display = NULL;
    GdkWindow *window = NULL;
    GdkMonitor *monitor = NULL;
    GdkRectangle geometry;
    gint width;
    gint height;
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
    g_return_if_fail (PHOSH_IS_LAYER_SURFACE (surface));
    g_object_get(G_OBJECT(surface),
                 "configured-width", &width,
                 "configured-height", &height,
                 NULL);
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type((uint32_t)width, (uint32_t)height);
    if (context->last_type != new_type) {
        context->last_type = new_type;
        eekboard_context_service_update_layout(EEKBOARD_CONTEXT_SERVICE(context), context->last_type);
    }
-    guint desired_height = calculate_height(width);
+    // In order to improve height calculation, we need the monitor geometry so
    // we can use different algorithms for portrait and landscape mode.
    // Note: this is a temporary fix until the size manager is complete.
    display = gdk_display_get_default ();
    if (display)
        window = gtk_widget_get_window (GTK_WIDGET (surface));
    if (window)
        monitor = gdk_display_get_monitor_at_window (display, window);
    if (monitor)
        gdk_monitor_get_geometry (monitor, &geometry);
    else
        geometry.width = geometry.height = 0;
     // When the geometry event comes after surface.configure,
     // this entire height calculation does nothing.
     // guint desired_height = squeek_uiman_get_perceptual_height(context->manager);
     // Temporarily use old method, until the size manager is complete.
    guint desired_height = calculate_height(width, &geometry);
    guint configured_height = (guint)height;
    // if height was already requested once but a different one was given
    // (for the same set of surrounding properties),
@ -160,8 +147,8 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
    // as it's likely to create pointless loops
    // of request->reject->request_again->...
    if (desired_height != configured_height
-            && context->last_requested_height != desired_height) {
+            && self->last_requested_height != desired_height) {
-        context->last_requested_height = desired_height;
+        self->last_requested_height = desired_height;
        phosh_layer_surface_set_size(surface, 0,
                                     (gint)desired_height);
        phosh_layer_surface_set_exclusive_zone(surface, (gint)desired_height);
@ -170,19 +157,19 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
 }
 static void
-make_window (ServerContextService *context)
+make_window (ServerContextService *self)
 {
-    if (context->window)
+    if (self->window)
        g_error("Window already present");
-    struct wl_output *output = squeek_outputs_get_current(squeek_wayland->outputs);
+    struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs);
-    int32_t width = squeek_outputs_get_perceptual_width(squeek_wayland->outputs, output);
+    squeek_uiman_set_output(self->manager, output);
-    uint32_t height = calculate_height(width);
+    uint32_t height = squeek_uiman_get_perceptual_height(self->manager);
-    context->window = g_object_new (
+    self->window = g_object_new (
        PHOSH_TYPE_LAYER_SURFACE,
        "layer-shell", squeek_wayland->layer_shell,
-        "wl-output", output,
+        "wl-output", output.output,
        "height", height,
        "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
@ -194,11 +181,11 @@ make_window (ServerContextService *context)
        NULL
    );
-    g_object_connect (context->window,
+    g_object_connect (self->window,
-                      "signal::destroy", G_CALLBACK(on_destroy), context,
+                      "swapped-signal::destroy", G_CALLBACK(on_destroy), self,
-                      "signal::map", G_CALLBACK(on_notify_map), context,
+                      "swapped-signal::map", G_CALLBACK(on_notify_map), self,
-                      "signal::unmap", G_CALLBACK(on_notify_unmap), context,
+                      "swapped-signal::unmap", G_CALLBACK(on_notify_unmap), self,
-                      "signal::configured", G_CALLBACK(on_surface_configure), context,
+                      "swapped-signal::configured", G_CALLBACK(on_surface_configure), self,
                      NULL);
    // The properties below are just to make hacking easier.
@ -206,82 +193,91 @@ make_window (ServerContextService *context)
    // and there's no space in the protocol for others.
    // Those may still be useful in the future,
    // or for hacks with regular windows.
-    gtk_widget_set_can_focus (GTK_WIDGET(context->window), FALSE);
+    gtk_widget_set_can_focus (GTK_WIDGET(self->window), FALSE);
-    g_object_set (G_OBJECT(context->window), "accept_focus", FALSE, NULL);
+    g_object_set (G_OBJECT(self->window), "accept_focus", FALSE, NULL);
-    gtk_window_set_title (GTK_WINDOW(context->window),
+    gtk_window_set_title (GTK_WINDOW(self->window),
                          _("Squeekboard"));
-    gtk_window_set_icon_name (GTK_WINDOW(context->window), "squeekboard");
+    gtk_window_set_icon_name (GTK_WINDOW(self->window), "squeekboard");
-    gtk_window_set_keep_above (GTK_WINDOW(context->window), TRUE);
+    gtk_window_set_keep_above (GTK_WINDOW(self->window), TRUE);
 }
 static void
-destroy_window (ServerContextService *context)
+destroy_window (ServerContextService *self)
 {
-    gtk_widget_destroy (GTK_WIDGET (context->window));
+    gtk_widget_destroy (GTK_WIDGET (self->window));
-    context->window = NULL;
+    self->window = NULL;
 }
 static void
-make_widget (ServerContextService *context)
+make_widget (ServerContextService *self)
 {
-    if (context->widget) {
+    if (self->widget) {
-        gtk_widget_destroy(context->widget);
+        gtk_widget_destroy(self->widget);
-        context->widget = NULL;
+        self->widget = NULL;
    }
    self->widget = eek_gtk_keyboard_new (self->state, self->submission, self->layout);
-    LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
+    gtk_widget_set_has_tooltip (self->widget, TRUE);
-
+    gtk_container_add (GTK_CONTAINER(self->window), self->widget);
-    context->widget = eek_gtk_keyboard_new (keyboard);
+    gtk_widget_show_all(self->widget);
    gtk_widget_set_has_tooltip (context->widget, TRUE);
    gtk_container_add (GTK_CONTAINER(context->window), context->widget);
    gtk_widget_show (context->widget);
 }
 static void
 server_context_service_real_show_keyboard (EekboardContextService *_context)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);
    if (context->hiding) {
 	    g_source_remove (context->hiding);
 	    context->hiding = 0;
    }
    if (!context->window)
        make_window (context);
    if (!context->widget)
        make_widget (context);
    EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
        show_keyboard (_context);
    gtk_widget_show (GTK_WIDGET(context->window));
 }
 static gboolean
-on_hide (ServerContextService *context)
+on_hide (ServerContextService *self)
 {
-    gtk_widget_hide (GTK_WIDGET(context->window));
+    gtk_widget_hide (GTK_WIDGET(self->window));
-    context->hiding = 0;
+    self->hiding = 0;
    return G_SOURCE_REMOVE;
 }
 static void
-server_context_service_real_hide_keyboard (EekboardContextService *_context)
+server_context_service_real_show_keyboard (ServerContextService *self)
 {
-    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);
+    if (!self->enabled)
        return;
-    if (!context->hiding)
+    if (self->hiding) {
-	context->hiding = g_timeout_add (200, (GSourceFunc) on_hide, context);
+	    g_source_remove (self->hiding);
 	    self->hiding = 0;
    }
-    EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
+    if (!self->window)
-        hide_keyboard (_context);
+        make_window (self);
    if (!self->widget)
        make_widget (self);
    self->visible = TRUE;
    gtk_widget_show (GTK_WIDGET(self->window));
 }
 static void
-server_context_service_real_destroyed (EekboardContextService *_context)
+server_context_service_real_hide_keyboard (ServerContextService *self)
 {
    if (!self->hiding)
        self->hiding = g_timeout_add (200, (GSourceFunc) on_hide, self);
    self->visible = FALSE;
 }
 void
 server_context_service_show_keyboard (ServerContextService *self)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
    if (!self->visible) {
        server_context_service_real_show_keyboard (self);
    }
 }
 void
 server_context_service_hide_keyboard (ServerContextService *self)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
    if (self->visible) {
        server_context_service_real_hide_keyboard (self);
    }
 }
 static void
@ -290,23 +286,32 @@ server_context_service_set_property (GObject      *object,
                                     const GValue *value,
                                     GParamSpec   *pspec)
 {
-    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);
+    ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
    GVariant *variant;
    switch (prop_id) {
-    case PROP_SIZE_CONSTRAINT_LANDSCAPE:
+    case PROP_VISIBLE:
-        variant = g_value_get_variant (value);
+        self->visible = g_value_get_boolean (value);
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_landscape[0],
                       &context->size_constraint_landscape[1]);
        break;
-    case PROP_SIZE_CONSTRAINT_PORTRAIT:
+    case PROP_ENABLED:
-        variant = g_value_get_variant (value);
+        server_context_service_set_enabled (self, g_value_get_boolean (value));
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_portrait[0],
                       &context->size_constraint_portrait[1]);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 server_context_service_get_property (GObject    *object,
                                       guint       prop_id,
                                       GValue     *value,
                                       GParamSpec *pspec)
 {
    ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
    switch (prop_id) {
    case PROP_VISIBLE:
        g_value_set_boolean (value, self->visible);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -316,10 +321,10 @@ server_context_service_set_property (GObject      *object,
 static void
 server_context_service_dispose (GObject *object)
 {
-    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);
+    ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
-    destroy_window (context);
+    destroy_window (self);
-    context->widget = NULL;
+    self->widget = NULL;
    G_OBJECT_CLASS (server_context_service_parent_class)->dispose (object);
 }
@ -327,54 +332,85 @@ server_context_service_dispose (GObject *object)
 static void
 server_context_service_class_init (ServerContextServiceClass *klass)
 {
    EekboardContextServiceClass *context_class = EEKBOARD_CONTEXT_SERVICE_CLASS(klass);
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;
    context_class->show_keyboard = server_context_service_real_show_keyboard;
    context_class->hide_keyboard = server_context_service_real_hide_keyboard;
    context_class->destroyed = server_context_service_real_destroyed;
    gobject_class->set_property = server_context_service_set_property;
    gobject_class->get_property = server_context_service_get_property;
    gobject_class->dispose = server_context_service_dispose;
-    pspec = g_param_spec_variant ("size-constraint-landscape",
+    /**
-                                  "Size constraint landscape",
+     * Flag to indicate if keyboard is visible or not.
-                                  "Size constraint landscape",
+     */
-                                  G_VARIANT_TYPE("(dd)"),
+    pspec = g_param_spec_boolean ("visible",
-                                  NULL,
+                                  "Visible",
-                                  G_PARAM_WRITABLE);
+                                  "Visible",
                                  FALSE,
                                  G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
-                                     PROP_SIZE_CONSTRAINT_LANDSCAPE,
+                                     PROP_VISIBLE,
                                     pspec);
-    pspec = g_param_spec_variant ("size-constraint-portrait",
+    /**
-                                  "Size constraint portrait",
+     * ServerContextServie:keyboard:
-                                  "Size constraint portrait",
+     *
-                                  G_VARIANT_TYPE("(dd)"),
+     * Does the user want the keyboard to show up automatically?
-                                  NULL,
+     */
-                                  G_PARAM_WRITABLE);
+    pspec =
        g_param_spec_boolean ("enabled",
                              "Enabled",
                              "Whether the keyboard is enabled",
                              TRUE,
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
    g_object_class_install_property (gobject_class,
-                                     PROP_SIZE_CONSTRAINT_PORTRAIT,
+                                     PROP_ENABLED,
                                     pspec);
 }
 static void
-server_context_service_init (ServerContextService *context)
+server_context_service_init (ServerContextService *self) {
-{
+    const char *schema_name = "org.gnome.desktop.a11y.applications";
-    g_signal_connect (context,
+    GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
-                      "notify::keyboard",
+    g_autoptr(GSettingsSchema) schema = NULL;
-                      G_CALLBACK(on_notify_keyboard),
+
-                      context);
+    self->enabled = TRUE;
    if (!ssrc) {
        g_warning("No gsettings schemas installed.");
        return;
    }
    schema = g_settings_schema_source_lookup(ssrc, schema_name, TRUE);
    if (schema) {
        g_autoptr(GSettings) settings = g_settings_new (schema_name);
        g_settings_bind (settings, "screen-keyboard-enabled",
                         self, "enabled", G_SETTINGS_BIND_GET);
    } else {
        g_warning("Gsettings schema %s is not installed on the system. "
                  "Enabling by default.", schema_name);
    }
 }
-EekboardContextService *
+ServerContextService *
-server_context_service_new ()
+server_context_service_new (EekboardContextService *self, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman)
 {
-    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL));
+    ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
    ui->submission = submission;
    ui->state = self;
    ui->layout = layout;
    ui->manager = uiman;
    return ui;
 }
-enum squeek_arrangement_kind server_context_service_get_layout_type(EekboardContextService *service)
+void
 server_context_service_set_enabled (ServerContextService *self, gboolean enabled)
 {
-    return SERVER_CONTEXT_SERVICE(service)->last_type;
+    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
    if (enabled == self->enabled)
        return;
    self->enabled = enabled;
    if (self->enabled)
        server_context_service_show_keyboard (self);
    else
        server_context_service_hide_keyboard (self);
 }
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@ -18,24 +18,22 @@
 #ifndef SERVER_CONTEXT_SERVICE_H
 #define SERVER_CONTEXT_SERVICE_H 1
 #include "eekboard/eekboard-service.h"
 #include "src/layout.h"
 #include "src/submission.h"
 #include "ui_manager.h"
 G_BEGIN_DECLS
 #define SERVER_TYPE_CONTEXT_SERVICE (server_context_service_get_type())
 #define SERVER_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextService))
 #define SERVER_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))
 #define SERVER_IS_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SERVER_TYPE_CONTEXT_SERVICE))
 #define SERVER_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SERVER_TYPE_CONTEXT_SERVICE))
 #define SERVER_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))
-/** Manages the liecycle of the window displaying layouts. */
+/** Manages the lifecycle of the window displaying layouts. */
-typedef struct _ServerContextService ServerContextService;
+G_DECLARE_FINAL_TYPE (ServerContextService, server_context_service, SERVER, CONTEXT_SERVICE, GObject)
 EekboardContextService *server_context_service_new ();
 enum squeek_arrangement_kind server_context_service_get_layout_type(EekboardContextService*);
 ServerContextService *server_context_service_new(EekboardContextService *self, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman);
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
 void server_context_service_show_keyboard (ServerContextService *self);
 void server_context_service_hide_keyboard (ServerContextService *self);
 void server_context_service_set_enabled (ServerContextService *self, gboolean enabled);
 G_END_DECLS
 #endif  /* SERVER_CONTEXT_SERVICE_H */
--- a/src/server-main.c
+++ b/src/server-main.c
@ -25,11 +25,14 @@
 #include "config.h"
 #include "eekboard/eekboard-service.h"
 #include "eek/eek.h"
-#include "imservice.h"
+#include "eekboard/eekboard-context-service.h"
 #include "dbus.h"
 #include "layout.h"
 #include "outputs.h"
 #include "submission.h"
 #include "server-context-service.h"
 #include "ui_manager.h"
 #include "wayland.h"
 #include <gdk/gdkwayland.h>
@ -37,9 +40,13 @@
 /// Global application state
 struct squeekboard {
-    struct squeek_wayland wayland;
+    struct squeek_wayland wayland; // Just hooks.
-    EekboardContextService *context;
+    DBusHandler *dbus_handler; // Controls visibility of the OSK.
-    struct imservice *imservice;
+    EekboardContextService *settings_context; // Gsettings hooks.
    ServerContextService *ui_context; // mess, includes the entire UI
    struct submission *submission; // Wayland text input handling.
    struct squeek_layout_state layout_choice; // Currently wanted layout.
    struct ui_manager *ui_manager; // UI shape tracker/chooser. TODO: merge with layuot choice
 };
@ -64,31 +71,14 @@ on_name_lost (GDBusConnection *connection,
              gpointer         user_data)
 {
    // TODO: could conceivable continue working
    // if intrnal changes stop sending dbus changes
    (void)connection;
    (void)name;
    (void)user_data;
    g_error("DBus unavailable, unclear how to continue.");
    exit (1);
 }
 static void
 on_destroyed (EekboardService *service,
              gpointer      user_data)
 {
    (void)service;
    GMainLoop *loop = user_data;
    g_main_loop_quit (loop);
 }
 static EekboardContextService *create_context() {
    EekboardContextService *context = server_context_service_new ();
    g_object_set_data_full (G_OBJECT(context),
                            "owner", g_strdup ("sender"),
                            (GDestroyNotify)g_free);
    eekboard_context_service_enable (context);
    return context;
 }
 // Wayland
 static void
@ -209,7 +199,13 @@ main (int argc, char **argv)
        exit(1);
    }
-    instance.context = create_context();
+    if (!instance.wayland.input_method_manager) {
        g_warning("Wayland input method interface not available");
    }
    instance.ui_manager = squeek_uiman_new();
    instance.settings_context = eekboard_context_service_new(&instance.layout_choice);
    // set up dbus
@ -232,9 +228,9 @@ main (int argc, char **argv)
        error = NULL;
        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
        if (connection == NULL) {
-            g_printerr ("Can't connect to the bus: %s\n", error->message);
+            g_printerr ("Can't connect to the bus: %s. "
                        "Visibility switching unavailable.", error->message);
            g_error_free (error);
            exit (1);
        }
        break;
    case G_BUS_TYPE_NONE:
@ -256,18 +252,19 @@ main (int argc, char **argv)
        g_assert_not_reached ();
        break;
    }
-
+    guint owner_id = 0;
-    EekboardService *service = eekboard_service_new (connection, EEKBOARD_SERVICE_PATH);
+    DBusHandler *service = NULL;
    if (connection) {
        service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
        if (service == NULL) {
            g_printerr ("Can't create dbus server\n");
            exit (1);
    } else {
        eekboard_service_set_context(service, instance.context);
        }
        instance.dbus_handler = service;
-    guint owner_id = g_bus_own_name_on_connection (connection,
+        owner_id = g_bus_own_name_on_connection (connection,
-                                             EEKBOARD_SERVICE_INTERFACE,
+                                                 DBUS_SERVICE_INTERFACE,
                                                 G_BUS_NAME_OWNER_FLAGS_NONE,
                                                 on_name_acquired,
                                                 on_name_lost,
@ -277,30 +274,48 @@ main (int argc, char **argv)
            g_printerr ("Can't own the name\n");
            exit (1);
        }
    }
-    struct imservice *imservice = NULL;
+    instance.submission = get_submission(instance.wayland.input_method_manager,
-    if (instance.wayland.input_method_manager) {
+                                         instance.wayland.virtual_keyboard_manager,
-        imservice = get_imservice(instance.context,
+                                         instance.wayland.seat,
-                                  instance.wayland.input_method_manager,
+                                         instance.settings_context);
-                                  instance.wayland.seat);
+
-        if (imservice) {
+    eekboard_context_service_set_submission(instance.settings_context, instance.submission);
-            instance.imservice = imservice;
+
-        } else {
+    ServerContextService *ui_context = server_context_service_new(
-            g_warning("Failed to register as an input method");
+                instance.settings_context,
                instance.submission,
                &instance.layout_choice,
                instance.ui_manager);
    if (!ui_context) {
        g_error("Could not initialize GUI");
        exit(1);
    }
    instance.ui_context = ui_context;
    if (instance.submission) {
        submission_set_ui(instance.submission, instance.ui_context);
    }
    if (instance.dbus_handler) {
        dbus_handler_set_ui_context(instance.dbus_handler, instance.ui_context);
    }
    eekboard_context_service_set_ui(instance.settings_context, instance.ui_context);
    session_register();
    GMainLoop *loop = g_main_loop_new (NULL, FALSE);
    g_signal_connect (service, "destroyed", G_CALLBACK(on_destroyed), loop);
    g_main_loop_run (loop);
    if (connection) {
        if (service) {
            if (owner_id != 0) {
                g_bus_unown_name (owner_id);
            }
            g_object_unref (service);
        }
        g_object_unref (connection);
    }
    g_main_loop_unref (loop);
    squeek_wayland_deinit (&instance.wayland);
--- a/src/style.h
+++ b/src/style.h
@ -2,6 +2,6 @@
 #define __STYLE_H
 #include "gtk/gtk.h"
-GtkCssProvider *squeek_load_style();
+GtkCssProvider *squeek_load_style(void);
 #endif
--- a/src/style.rs
+++ b/src/style.rs
@ -19,6 +19,7 @@
 /*! CSS data loading. */
 use std::env;
 use ::logging;
 use glib::object::ObjectExt;
 use logging::Warn;
@ -84,7 +85,10 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
            match &e {
                env::VarError::NotPresent => {},
                // maybe TODO: forward this warning?
-                e => eprintln!("GTK_THEME variable invalid: {}", e),
+                e => log_print!(
                    logging::Level::Surprise,
                    "GTK_THEME variable invalid: {}", e,
                ),
            };
            e
        }).ok();
@ -94,15 +98,13 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
        None => GtkTheme {
            name: {
                settings.get_property("gtk-theme-name")
-                    // maybe TODO: is this worth a warning?
+                    .or_print(logging::Problem::Surprise, "No theme name")
                    .or_warn("No theme name")
                    .and_then(|value| value.get::<String>())
                    .unwrap_or(DEFAULT_THEME_NAME.into())
            },
            variant: {
                settings.get_property("gtk-application-prefer-dark-theme")
-                    // maybe TODO: is this worth a warning?
+                    .or_print(logging::Problem::Surprise, "No settings key")
                    .or_warn("No settings key")
                    .and_then(|value| value.get::<bool>())
                    .and_then(|dark_preferred| match dark_preferred {
                        true => Some("dark".into()),
--- a/src/submission.h
+++ b/src/submission.h
@ -0,0 +1,19 @@
 #ifndef __SUBMISSION_H
 #define __SUBMISSION_H
 #include "input-method-unstable-v2-client-protocol.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "eek/eek-types.h"
 struct submission;
 struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
                                  struct zwp_virtual_keyboard_manager_v1 *vkmanager,
                                  struct wl_seat *seat,
                                  EekboardContextService *state);
 // Defined in Rust
 struct submission* submission_new(struct zwp_input_method_v2 *im, struct zwp_virtual_keyboard_v1 *vk, EekboardContextService *state);
 void submission_set_ui(struct submission *self, ServerContextService *ui_context);
 void submission_set_keyboard(struct submission *self, LevelKeyboard *keyboard, uint32_t time);
 #endif
--- a/src/submission.rs
+++ b/src/submission.rs
@ -1,69 +1,291 @@
-/*! Managing the events belonging to virtual-keyboard interface. */
+/*! Managing the state of text input in the application.
 * 
 * This is a library module.
 * 
 * It needs to combine text-input and virtual-keyboard protocols
 * to achieve a consistent view of the text-input state,
 * and to submit exactly what the user wanted.
 * 
 * It must also not get tripped up by sudden disappearances of interfaces.
 * 
 * The virtual-keyboard interface is always present.
 * 
 * The text-input interface may not be presented,
 * and, for simplicity, no further attempt to claim it is made.
 * 
 * The text-input interface may be enabled and disabled at arbitrary times,
 * and those events SHOULD NOT cause any lost events.
 * */
-use ::keyboard::{ KeyState, PressType };
+use std::collections::HashSet;
 use std::ffi::CString;
 use ::action::Modifier;
 use ::imservice;
 use ::imservice::IMService;
 use ::keyboard::{ KeyCode, KeyStateId, Modifiers, PressType };
 use ::layout::c::LevelKeyboard;
 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::*;
    use std::os::raw::c_void;
    use ::imservice::c::InputMethod;
    use ::vkeyboard::c::ZwpVirtualKeyboardV1;
    // The following defined in C
    /// ServerContextService*
    #[repr(transparent)]
-    #[derive(Clone, Copy)]
+    pub struct UIManager(*const c_void);
-    pub struct ZwpVirtualKeyboardV1(*const c_void);
+
    /// EekboardContextService*
    #[repr(transparent)]
    pub struct StateManager(*const c_void);
    #[no_mangle]
-    extern "C" {
+    pub extern "C"
-        /// Checks if point falls within bounds,
+    fn submission_new(
-        /// which are relative to origin and rotated by angle (I think)
+        im: *mut InputMethod,
-        pub fn eek_virtual_keyboard_v1_key(
+        vk: ZwpVirtualKeyboardV1,
-            virtual_keyboard: ZwpVirtualKeyboardV1,
+        state_manager: *const StateManager
-            timestamp: u32,
+    ) -> *mut Submission {
-            keycode: u32,
+        let imservice = if im.is_null() {
-            press: u32,
+            None
-        );
+        } else {
            Some(IMService::new(im, state_manager))
        };
        // TODO: add vkeyboard too
        Box::<Submission>::into_raw(Box::new(
            Submission {
                imservice,
                modifiers_active: Vec::new(),
                virtual_keyboard: VirtualKeyboard(vk),
                pressed: Vec::new(),
            }
        ))
    }
    /// Use to initialize the UI reference
    #[no_mangle]
    pub extern "C"
    fn submission_set_ui(submission: *mut Submission, ui_manager: *const UIManager) {
        if submission.is_null() {
            panic!("Null submission pointer");
        }
        let submission: &mut Submission = unsafe { &mut *submission };
        if let Some(ref mut imservice) = &mut submission.imservice {
            imservice.ui_manager = if ui_manager.is_null() {
                None
            } else {
                Some(ui_manager)
            }
        };
    }
    #[no_mangle]
    pub extern "C"
    fn submission_set_keyboard(
        submission: *mut Submission,
        keyboard: LevelKeyboard,
        time: u32,
    ) {
        if submission.is_null() {
            panic!("Null submission pointer");
        }
        let submission: &mut Submission = unsafe { &mut *submission };
        submission.update_keymap(keyboard, Timestamp(time));
    }
 }
 #[derive(Clone, Copy)]
 pub struct Timestamp(pub u32);
-/// Layout-independent backend. TODO: Have one instance per program or seat
+#[derive(Clone)]
-pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);
+enum SubmittedAction {
    /// A collection of keycodes that were pressed
    VirtualKeyboard(Vec<KeyCode>),
    IMService,
 }
-impl VirtualKeyboard {
+pub struct Submission {
-    // TODO: split out keyboard state management
+    imservice: Option<Box<IMService>>,
-    pub fn switch(
+    virtual_keyboard: VirtualKeyboard,
-        &self,
+    modifiers_active: Vec<(KeyStateId, Modifier)>,
-        key: &mut KeyState,
+    pressed: Vec<(KeyStateId, SubmittedAction)>,
-        action: PressType,
+}
-        timestamp: Timestamp,
+
 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,
    ) {
-        key.pressed = action.clone();
+        let mods_are_on = !self.modifiers_active.is_empty();
-        let keycodes_count = key.keycodes.len();
+        let was_committed_as_text = match (&mut self.imservice, mods_are_on) {
-        for keycode in key.keycodes.iter() {
+            (Some(imservice), false) => {
-            let keycode = keycode - 8;
+                enum Outcome {
-            match (&key.pressed, keycodes_count) {
+                    Submitted(Result<(), imservice::SubmitError>),
-                // Pressing a key made out of a single keycode is simple:
+                    NotSubmitted,
-                // press on press, release on release.
+                };
-                (_, 1) => unsafe {
+
-                    c::eek_virtual_keyboard_v1_key(
+                let submit_outcome = match data {
-                        self.0, timestamp.0, keycode, action.clone() as u32
+                    SubmitData::Text(text) => {
-                    );
+                        Outcome::Submitted(imservice.commit_string(text))
                    },
-                // A key made of multiple keycodes
+                    SubmitData::Erase => {
-                // has to submit them one after the other
+                        /* Delete_surrounding_text takes byte offsets,
-                (PressType::Pressed, _) => unsafe {
+                         * so cannot work without get_surrounding_text.
-                    c::eek_virtual_keyboard_v1_key(
+                         * This is a bug in the protocol.
-                        self.0, timestamp.0, keycode, PressType::Pressed as u32
+                         */
-                    );
+                        // imservice.delete_surrounding_text(1, 0),
-                    c::eek_virtual_keyboard_v1_key(
+                        Outcome::NotSubmitted
                        self.0, timestamp.0, keycode, PressType::Released as u32
                    );
                    },
-                // Design choice here: submit multiple all at press time
+                    SubmitData::Keycodes => Outcome::NotSubmitted,
-                // and do nothing at release time
+                };
-                (PressType::Released, _) => {},
+
                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())
        )
    }
    fn clear_all_modifiers(&mut self) {
        // Looks like an optimization,
        // but preemptive cleaning is needed before setting a new keymap,
        // so removing this check would break keymap setting.
        if self.modifiers_active.is_empty() {
            return;
        }
        self.modifiers_active = Vec::new();
        self.virtual_keyboard.set_modifiers_state(Modifiers::empty())
    }
    fn release_all_virtual_keys(&mut self, time: Timestamp) {
        let virtual_pressed = self.pressed
            .clone().into_iter()
            .filter_map(|(id, action)| {
                match action {
                    SubmittedAction::VirtualKeyboard(_) => Some(id),
                    _ => None,
                }
            });
        for id in virtual_pressed {
            self.handle_release(id, time);
        }
    }
    /// Changes keymap and clears pressed keys and modifiers.
    ///
    /// It's not obvious if clearing is the right thing to do, 
    /// but keymap update may (or may not) do that,
    /// possibly putting self.modifiers_active and self.pressed out of sync,
    /// so a consistent stance is adopted to avoid that.
    /// Alternatively, modifiers could be restored on the new keymap.
    /// That approach might be difficult
    /// due to modifiers meaning different things in different keymaps.
    pub fn update_keymap(&mut self, keyboard: LevelKeyboard, time: Timestamp) {
        self.clear_all_modifiers();
        self.release_all_virtual_keys(time);
        self.virtual_keyboard.update_keymap(keyboard);
    }
 }
--- a/src/tests.rs
+++ b/src/tests.rs
@ -1,17 +1,22 @@
 /*! Testing functionality */
 use ::data::Layout;
 use ::logging;
 use xkbcommon::xkb;
 use ::logging::WarningHandler;
 pub struct CountAndPrint(u32);
-impl WarningHandler for CountAndPrint {
+impl logging::Handler for CountAndPrint {
-    fn handle(&mut self, warning: &str) {
+    fn handle(&mut self, level: logging::Level, warning: &str) {
-        self.0 = self.0 + 1;
+        use logging::Level::*;
-        println!("{}", warning);
+        match level {
            Panic | Bug | Error | Warning | Surprise => {
                self.0 += 1;
            },
            _ => {}
        }
        logging::Print{}.handle(level, warning)
    }
 }
@ -21,20 +26,48 @@ impl CountAndPrint {
    }
 }
-pub fn check_builtin_layout(name: &str) {
+pub fn check_builtin_layout(name: &str, missing_return: bool) {
-    check_layout(Layout::from_resource(name).expect("Invalid layout data"))
+    check_layout(
        Layout::from_resource(name).expect("Invalid layout data"),
        missing_return,
    )
 }
 pub fn check_layout_file(path: &str) {
-    check_layout(Layout::from_file(path.into()).expect("Invalid layout file"))
+    check_layout(
        Layout::from_file(path.into()).expect("Invalid layout file"),
        false,
    )
 }
-fn check_layout(layout: Layout) {
+fn check_sym_presence(
    state: &xkb::State,
    sym_name: &str,
    handler: &mut dyn logging::Handler,
 ) {
    let sym = xkb::keysym_from_name(sym_name, xkb::KEYSYM_NO_FLAGS);
    if sym == xkb::KEY_NoSymbol {
        panic!(format!("Entered invalid keysym: {}", sym_name));
    }
    let map = state.get_keymap();
    let range = map.min_keycode()..=map.max_keycode();
    let found = range.flat_map(|code| state.key_get_syms(code))
        .find(|s| **s == sym)
        .is_some();
    if !found {
        handler.handle(
            logging::Level::Surprise,
            &format!("There's no way to input the keysym {} on this layout", sym_name),
        )
    }
 }
 fn check_layout(layout: Layout, allow_missing_return: bool) {
    let handler = CountAndPrint::new();
-    let (layout, handler) = layout.build(handler);
+    let (layout, mut handler) = layout.build(handler);
    if handler.0 > 0 {
-        println!("{} mistakes in layout", handler.0)
+        println!("{} problems while parsing layout", handler.0)
    }
    let layout = layout.expect("layout broken");
@ -54,10 +87,19 @@ fn check_layout(layout: Layout) {
    let state = xkb::State::new(&keymap);
    check_sym_presence(&state, "BackSpace", &mut handler);
    let mut printer = logging::Print;
    check_sym_presence(
        &state,
        "Return",
        if allow_missing_return { &mut printer }
        else { &mut handler },
    );
    // "Press" each button with keysyms
-    for view in layout.views.values() {
+    for (_pos, view) in layout.views.values() {
-        for (_y, row) in &view.get_rows() {
+        for (_y, row) in view.get_rows() {
-            for (_x, button) in &row.buttons {
+            for (_x, button) in row.get_buttons() {
                let keystate = button.state.borrow();
                for keycode in &keystate.keycodes {
                    match state.key_get_one_sym(*keycode) {
--- a/Show More
+++ b/Show More