squeekboard-test-layout: correct dependencies and version for clap argument parsing

added librust-clap-dev to debian/control
squeekboard-test-layout: add argument parsing and some more output
2019-12-13 21:37:50 +01:00 · 2019-12-08 21:14:56 +01:00 · 2019-12-08 18:29:54 +01:00
92 changed files with 3176 additions and 3960 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -14,17 +14,7 @@ before_script:
  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
  - apt-get -y update
-
+  - apt-get -y build-dep .
 build_docs:
  <<: *tags
  stage: build
  artifacts:
    paths:
      - _build
  script:
      - apt-get -y install python3-pip python3-sphinx
      - pip3 install recommonmark
      - ./doc/build.sh _build
 build_meson:
  <<: *tags
@ -34,35 +24,16 @@ build_meson:
      - _build
    expire_in: 3h
  script:
    - apt-get -y build-dep .
    - meson . _build/ -Ddepdatadir=/usr/share
    - ninja -C _build install
 build_deb:
-    tags:
+    <<: *tags
        - librem5
    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:
    tags:
        - librem5:arm64
    allow_failure: true
    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 .
@ -82,5 +53,4 @@ test:
  needs:
    - build_meson
  script:
    - apt-get -y build-dep .
    - ninja -C _build test
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,10 +2,10 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.7.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -15,8 +15,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -33,7 +33,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -44,29 +44,19 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (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.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "clap"
 version = "2.32.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)",
 "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)",
 ]
 [[package]]
 name = "dtoa"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -89,7 +79,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -104,7 +94,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -115,8 +105,8 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -129,9 +119,9 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -146,7 +136,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -156,8 +146,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -169,7 +159,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -177,8 +167,8 @@ name = "glib-sys"
 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.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -187,8 +177,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -199,7 +189,7 @@ dependencies = [
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk 0.9.0 (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-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -211,7 +201,7 @@ dependencies = [
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -227,9 +217,9 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -239,7 +229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.66"
+version = "0.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -254,7 +244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
-version = "2.3.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -262,7 +252,7 @@ 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.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -276,7 +266,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -287,18 +277,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pkg-config"
-version = "0.3.17"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "1.0.8"
+version = "1.0.4"
 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)",
@ -309,7 +299,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -317,16 +307,16 @@ name = "regex"
 version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.12 (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.14"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -334,10 +324,6 @@ name = "rs"
 version = "0.1.0"
 dependencies = [
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -345,58 +331,50 @@ dependencies = [
 "gtk-sys 0.7.0 (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)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (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.9 (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.101"
 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.101 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_yaml"
-version = "0.8.11"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "linked-hash-map 0.5.2 (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.101 (registry+https://github.com/rust-lang/crates.io-index)",
 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "syn"
-version = "1.0.14"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "textwrap"
 version = "0.10.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"
@ -405,11 +383,6 @@ dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@ -444,7 +417,7 @@ 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.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -457,14 +430,13 @@ dependencies = [
 ]
 [metadata]
-"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 "checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
 "checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
-"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 dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "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-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
@ -478,25 +450,23 @@ dependencies = [
 "checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
 "checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
 "checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
-"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
-"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
+"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
-"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
 "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 winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -4,22 +4,13 @@ version = "0.1.0"
 [dependencies]
 bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
+clap = "2.32.*"
 maplit = "1.0.*"
 regex = "1.1.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
 [dependencies.cairo-rs]
 version = "0.5.*"
 [dependencies.cairo-sys-rs]
 version = ""
 [dependencies.gdk]
 version = ""
 [dependencies.gio]
 version = ""
 features = ["v2_44"]
@ -32,6 +23,7 @@ features = ["v2_44"]
 version = ""
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.5.*"
 features = ["v3_22"]
--- a/HACKING.md
+++ b/HACKING.md
@ -3,11 +3,6 @@ Hacking
 This document describes the standards for modifying and maintaining the *squeekboard* project.
 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).
 Development environment
 -----------------------
@ -25,7 +20,7 @@ sudo apt-get -y build-dep .
 ```
 For an explicit list of dependencies check the `Build-Depends` entry in the
-[`debian/control`](./debian/control) file.
+[debian/control][] file.
 Testing
 -------
@ -40,7 +35,7 @@ Most common testing is done in CI. Occasionally, and for each release, do perfor
 Testing with an application:
 ```
-python3 tools/entry.py
+python3 tests/entry.py
 ```
 Testing visibility:
@ -62,24 +57,6 @@ $ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb',
 Coding
 ------
 ### Project structure
 Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
 Libraries should:
 - not panic due to external surprises, only due to internal inconsistencies
 - pass errors and surprises they can't handle to the callers instead
 - not silence errors and surprises
 User interface modules should:
 - try to provide safe values whenever they encounter an error
 - do the logging
 - give libraries the ability to report errors and surprises (e.g. via giving them loggers)
 ### Style
 Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors:
 - skipping brackets `{}` after every `if()`, `else`, and similar
@ -140,8 +117,6 @@ sh /source_path/cargo.sh test
 ### Cargo dependencies
 All Cargo dependencies must be selected in the version available in PureOS, and added to the file `debian/control`. Please check with https://software.pureos.net/search_pkg?term=librust .
 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:
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,11 +1,18 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 bounds: { x: 0, y: 1, width: 360, height: 208 }
 outlines:
-    default: { width: 35.33, height: 52 }
+    default:
-    altline: { width: 52.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    spaceline: { width: 99.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    special: { width: 35.33, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
    special:
        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
 views:
    base:
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -1,11 +1,18 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 bounds: { x: 0, y: 1, width: 540, height: 168 }
 outlines:
-    default: { width: 48, height: 42 }
+    default:
-    altline: { width: 81, height: 42 }
+        bounds: { x: 0, y: 0, width: 48, height: 42 }
-    wide: { width: 108, height: 42 }
+    altline:
-    spaceline: { width: 216, height: 42 }
+        bounds: { x: 0, y: 0, width: 81, height: 42 }
-    special: { width: 48, height: 42 }
+    wide:
        bounds: { x: 0, y: 0, width: 108, height: 42 }
    spaceline:
        bounds: { x: 0, y: 0, width: 216, height: 42 }
    special:
        bounds: { x: 0, y: 0, width: 48, height: 42 }
 views:
    base:
--- a/data/keyboards/el.yaml
+++ b/data/keyboards/el.yaml
@ -2,12 +2,19 @@
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
 ---
 bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 outlines:
-    default: { width: 32, height: 52 }
+    default:
-    altline: { width: 48.39024, height: 52 }
+        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    outline7: { width: 88.97561, height: 52 }
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    outline7:
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
 views:
    base:
--- a/data/keyboards/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@ -1,16 +0,0 @@
 ---
 outlines:
    default: { width: 52, height: 52 }
    altline: { width: 52, height: 52 }
 views:
    base:
        - "😀 😁 😅 😂 😊 😇 🙃"
        - "😍 😘 😋 😜 😎 🥳 😔"
        - "😢 😭 😡 😱 🤔 😬 🙄"
        - "preferences 🤨 🤓 😴 🤢 🤮 😈"
 buttons:
    preferences:
        action: "show_prefs"
        outline: "altline"
        icon: "keyboard-mode-symbolic"
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 1, width: 360, height: 210 }
 outlines:
-    default: { width: 35.33, height: 52 }
+    default:
-    altline: { width: 52.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    spaceline: { width: 99.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    special: { width: 44, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
    special:
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 views:
    base:
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 outlines:
-    default: { width: 32, height: 52 }
+    default:
-    altline: { width: 48.39024, height: 52 }
+        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    outline7: { width: 88.97561, height: 52 }
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    outline7:
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
 views:
    base:
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -1,12 +1,19 @@
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
 bounds: { x: 0, y: 1, width: 360, height: 210 }
 outlines:
-    default: { width: 35.33, height: 52 }
+    default:
-    altline: { width: 52.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    spaceline: { width: 99.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    special: { width: 44, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
    special:
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 views:
    base:
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -1,11 +1,18 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 bounds: { x: 0, y: 1, width: 360, height: 208 }
 outlines:
-    default: { width: 62, height: 52 }
+    default:
-    default-wide: { width: 62, height: 52 }
+        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    altline: { width: 62, height: 52 }
+    default-wide:
-    wide: { width: 62, height: 52 }
+        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    special: { width: 62, height: 52 }
+    altline:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    special:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 views:
    base: # hiragana
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -1,525 +0,0 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
    default: { width: 62, height: 42 }
    default-wide: { width: 62, height: 42 }
    altline: { width: 62, height: 42 }
    wide: { width: 62, height: 42 }
    special: { width: 62, height: 42 }
 views:
    base: # hiragana
        - "preferences _a ka sa BackSpace"
        - "Left ta na ha Right"
        - "カタカナ ma ya ra space"
        - "switch2roman symbols wa punct Return"
    _a:
        - "preferences dummykey _a dummykey BackSpace"
        - "あ い う え お"
        - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
        - "dummykey dummykey ゔ dummykey dummykey"
    ka:
        - "preferences dummykey ka dummykey BackSpace"
        - "か き く け こ"
        - "が ぎ ぐ げ ご"
        - "ゕ dummykey dummykey ゖ dummykey"
    sa:
        - "preferences dummykey sa dummykey BackSpace"
        - "さ し す せ そ"
        - "ざ じ ず ぜ ぞ"
    ta:
        - "preferences dummykey ta dummykey BackSpace"
        - "た ち つ て と"
        - "だ ぢ づ で ど"
        - "dummykey dummykey っ dummykey dummykey"
    na:
        - "preferences dummykey na dummykey BackSpace"
        - "な に ぬ ね の"
    ha:
        - "preferences dummykey ha dummykey BackSpace"
        - "は ひ ふ へ ほ"
        - "ば び ぶ べ ぼ"
        - "ぱ ぴ ぷ ぺ ぽ"
    ma:
        - "preferences dummykey ma dummykey BackSpace"
        - "ま み む め も"
    ya:
        - "preferences dummykey ya dummykey BackSpace"
        - "や dummykey ゆ dummykey よ"
        - "ゃ dummykey ゅ dummykey ょ"
    ra:
        - "preferences dummykey ra dummykey BackSpace"
        - "ら り る れ ろ"
    wa:
        - "preferences dummykey wa dummykey BackSpace"
        - "わ ゐ dummykey ゑ を"
        - "ゎ dummykey ん dummykey dummykey"
    symbols:
        - "preferences dummykey symbols dummykey BackSpace"
        - "「 」 （ ） §"
        - "【 】 ＜ ＞ ＝"
        - "＋ ＊ ＆ ％ ＄ "
    punct:
        - "preferences dummykey punct dummykey BackSpace"
        - "。 、 ？ ！ ー"
        - "： ； ・ 〜 …"
        - "♪ ” ’ ゙ ゚"
 #a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
 #i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
 #u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
 #e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
 #o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
 #      g       z       d       b       p      n
 #a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
 #o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ 
    カタカナ: # katakana
        - "preferences _A KA SA BackSpace"
        - "Left TA NA HA Right"
        - "ひらがな MA YA RA space"
        - "switch2roman SYMBOLS WA PUNCT Return"
    _A:
        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
        - "ア イ ウ エ オ"
        - "ァ ィ ゥ ェ ォ"
        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
    KA:
        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
        - "カ キ ク ケ コ"
        - "ガ ギ グ ゲ ゴ"
        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
    SA:
        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
        - "サ シ ス セ ソ"
        - "ザ ジ ズ ゼ ゾ"
        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
    TA:
        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
        - "タ チ ツ テ ト"
        - "ダ ヂ ヅ デ ド"
        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
    NA: 
        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
        - "ナ ニ ヌ ネ ノ"
        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
    HA:
        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
        - "ハ ヒ フ ヘ ホ"
        - "バ ビ ブ ベ ボ"
        - "パ ピ プ ペ ポ"
    MA:
        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
        - "マ ミ ム メ モ"
        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
    YA:
        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
    RA:
        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
        - "ラ リ ル レ ロ"
        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
    WA:
        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
        - "ワ ヰ DUMMYKEY ヱ ヲ"
        - "ヮ ヸ ン ヹ ヺ"
    # numbers view
    numbers:
        - "preferences 1 2 3 BackSpace"
        - "Left 4 5 6 Right"
        - "roman 7 8 9 space"
        - "switch2kana * 0 # Return"
    # Roman alphabet view
    roman:
        - "preferences RSYM1 ABC DEF BackSpace"
        - "Left GHI JKL MNO Right"
        - "ひらがな PQRS TUV WXYZ space"
        - "switch2num RSYM2 RSYM3 RSYM4 Return"
    RSYM1:
        - "preferences dummykey RSYM1 dummykey BackSpace"
        - "@ # $ § :"
        - "| € ¥ £ 1"
    ABC:
        - "preferences dummykey ABC dummykey BackSpace"
        - "A B C Ä ç"
        - "a b c ä 2"
    DEF:
        - "preferences dummykey DEF dummykey BackSpace"
        - "D E F dummykey"
        - "d e f 3"
    GHI:
        - "preferences dummykey GHI dummykey BackSpace"
        - "G H I dummykey"
        - "g h i 4"
    JKL:
        - "preferences dummykey JKL dummykey BackSpace"
        - "J K L dummykey"
        - "j k l 5"
    MNO:
        - "preferences dummykey MNO dummykey BackSpace"
        - "M N O Ö dummykey"
        - "m n o ö 6"
    PQRS:
        - "preferences dummykey PQRS dummykey BackSpace"
        - "P Q R S ß"
        - "p q r s 7"
    TUV:
        - "preferences dummykey TUV dummykey BackSpace"
        - "T U V Ü dummykey"
        - "t u v ü 8"
    WXYZ:
        - "preferences dummykey WXYZ dummykey BackSpace"
        - "W X Y Z dummykey"
        - "w x y z 9"
    RSYM2:
        - "preferences dummykey RSYM2 dummykey BackSpace"
        - "( ) ' \" ~"
        - "[ ] { } _"
    RSYM3:
        - "preferences dummykey RSYM3 dummykey BackSpace"
        - "+ - * / ="
        - "< > ^ ° 0"
    RSYM4:
        - "preferences dummykey RSYM4 dummykey BackSpace"
        - ", . ? ! ;"
        - "\\ ´ ` · ¶" 
 buttons:
    # following 4 buttons use the corresponding xkb name as keysym
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    Left:
        outline: "wide"
        label: "←"
        keysym: "Left"
    Right:
        outline: "wide"
        label: "→"
        keysym: "Right"
    # special button "preferences" is handled in the code
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    # space button using text tag for ideographic space
    space:
        outline: "default-wide"
        label: "␣"
        text: "　"
    # switch to number view
    numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    # switch to latin characters
    roman:
        action:
            set_view: "roman"
        outline: "wide"
        label: "ᴀʙᴄ"
    # toggle button with 3 different states
    switch2roman: # switch from kana to latin characters view
        action:
            set_view: "roman"
        outline: "wide"
        label: "あᴀ₁"
    switch2num: # switch from latin characters to numbers view
        action:
            set_view: "numbers"
        outline: "wide"
        label: "ぁA₁"
    switch2kana: # switch from numbers to hiragana view
        action:
            set_view: "base"
        outline: "wide"
        label: "ぁᴀ1"
    # Buttons for katakana and symbols
    ひらがな:
        action:
            set_view: "base"
        outline: "wide"
        label: "あさ"
    _a:
        action:
            locking:
                lock_view: "_a"
                unlock_view: "base"
        outline: "altline"
        label: "あ"
    ka:
        action:
            locking:
                lock_view: "ka"
                unlock_view: "base"
        outline: "altline"
        label: "か"
    sa:
        action:
            locking:
                lock_view: "sa"
                unlock_view: "base"
        outline: "altline"
        label: "さ"
    ta:
        action:
            locking:
                lock_view: "ta"
                unlock_view: "base"
        outline: "altline"
        label: "た"
    na:
        action:
            locking:
                lock_view: "na"
                unlock_view: "base"
        outline: "altline"
        label: "な"
    ha:
        action:
            locking:
                lock_view: "ha"
                unlock_view: "base"
        outline: "altline"
        label: "は"
    ma:
        action:
            locking:
                lock_view: "ma"
                unlock_view: "base"
        outline: "altline"
        label: "ま"
    ya:
        action:
            locking:
                lock_view: "ya"
                unlock_view: "base"
        outline: "altline"
        label: "や"
    ra:
        action:
            locking:
                lock_view: "ra"
                unlock_view: "base"
        outline: "altline"
        label: "ら"
    wa:
        action:
            locking:
                lock_view: "wa"
                unlock_view: "base"
        outline: "altline"
        label: "わ"
    dummykey:
        action:
            set_view: "base"
        outline: "altline"
        label: ""
    # buttons available on different views like symbols and punct should go
    # back to their corresponding view
    symbols:
        action:
            locking:
                lock_view: "symbols"
                unlock_view: "base"
        outline: "altline"
        label: "（）"
    punct:
        action:
            locking:
                lock_view: "punct"
                unlock_view: "base"
        outline: "altline"
        label: "。"
    # Buttons for katakana and symbols
    カタカナ:
        action:
            set_view: "カタカナ"
        outline: "wide"
        label: "アサ"
    _A:
        action:
            locking:
                lock_view: "_A"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ア"
    KA:
        action:
            locking:
                lock_view: "KA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "カ"
    SA:
        action:
            locking:
                lock_view: "SA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "サ"
    TA:
        action:
            locking:
                lock_view: "TA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "タ"
    NA:
        action:
            locking:
                lock_view: "NA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ナ"
    HA:
        action:
            locking:
                lock_view: "HA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ハ"
    MA:
        action:
            locking:
                lock_view: "MA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "マ"
    YA:
        action:
            locking:
                lock_view: "YA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ヤ"
    RA:
        action:
            locking:
                lock_view: "RA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ラ"
    WA:
        action:
            locking:
                lock_view: "WA"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "ワ"
    DUMMYKEY:
        action:
            set_view: "カタカナ"
        outline: "altline"
        label: ""
    SYMBOLS:
        action:
            locking:
                lock_view: "symbols"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "（）"
    PUNCT:
        action:
            locking:
                lock_view: "punct"
                unlock_view: "カタカナ"
        outline: "altline"
        label: "。"
    # Buttons for Latin charachters
    RSYM1:
        action:
            locking:
                lock_view: "RSYM1"
                unlock_view: "roman"
        outline: "altline"
        label: "@#"
    ABC:
        action:
            locking:
                lock_view: "ABC"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴀʙᴄ"
    DEF:
        action:
            locking:
                lock_view: "DEF"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴅᴇꜰ"
    GHI:
        action:
            locking:
                lock_view: "GHI"
                unlock_view: "roman"
        outline: "altline"
        label: "ɢʜɪ"
    JKL:
        action:
            locking:
                lock_view: "JKL"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴊᴋʟ"
    MNO:
        action:
            locking:
                lock_view: "MNO"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴍɴᴏ"
    PQRS:
        action:
            locking:
                lock_view: "PQRS"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴘǫʀs"
    TUV:
        action:
            locking:
                lock_view: "TUV"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴛᴜᴠ"
    WXYZ:
        action:
            locking:
                lock_view: "WXYZ"
                unlock_view: "roman"
        outline: "altline"
        label: "ᴡxʏᴢ"
    RSYM2:
        action:
            locking:
                lock_view: "RSYM2"
                unlock_view: "roman"
        outline: "altline"
        label: "()"
    RSYM3:
        action:
            locking:
                lock_view: "RSYM3"
                unlock_view: "roman"
        outline: "altline"
        label: "+-"
    RSYM4:
        action:
            locking:
                lock_view: "RSYM4"
                unlock_view: "roman"
        outline: "altline"
        label: ",.?"
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 outlines:
-    default: { width: 32, height: 52 }
+    default:
-    altline: { width: 48.39024, height: 52 }
+        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    outline7: { width: 88.97561, height: 52 }
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    outline7:
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
 views:
    base:
--- a/data/keyboards/number.yaml
+++ b/data/keyboards/number.yaml
@ -1,9 +1,15 @@
 ---
 bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 outlines:
-    default: { width: 37.46341, height: 52 }
+    default:
-    altline: { width: 48.39024, height: 52 }
+        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    altline:
-    spaceline: { width: 120.5853, height: 52 }
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
    outline7:
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
 views:
    base:
@ -23,7 +29,7 @@ buttons:
    Return:
        outline: outline7
        icon: "key-enter"
-        keysym: "Return"
+        keysym: "BackSpace"
    asterisk:
        text: "*"
    numbersign:
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 outlines:
-    default: { width: 32, height: 52 }
+    default:
-    altline: { width: 48.39024, height: 52 }
+        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    outline7: { width: 88.97561, height: 52 }
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    outline7:
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
 views:
    base:
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -1,159 +0,0 @@
 ---
 outlines:
    default: { width: 35.33, height: 52 }
    action:  { width: 59,    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_actions 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_actions Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Del PgUp ↑ PgDn"
        - "show_letters Home End ← ↓ →"
 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_actions:
        action:
            set_view: "actions"
        outline: "altline"
        label: ">_"
    period:
        outline: "special"
        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"
    Tab:
        outline: "action"
        keysym: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
    Home:
        outline: "action"
        keysym: "Home"
    End:
        outline: "action"
        keysym: "End"
    PgUp:
        outline: "action"
        keysym: "Page_Up"
    PgDn:
        outline: "action"
        keysym: "Page_Down"
    "↑":
        outline: "action"
        keysym: "Up"
    "↓":
        outline: "action"
        keysym: "Down"
    "←":
        outline: "action"
        keysym: "Left"
    "→":
        outline: "action"
        keysym: "Right"
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 1, width: 360, height: 208 }
 outlines:
-    default: { width: 35.33, height: 52 }
+    default:
-    altline: { width: 52.67, height: 52 }
+        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    wide: { width: 62, height: 52 }
+    altline:
-    spaceline: { width: 142, height: 52 }
+        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    special: { width: 44, height: 52 }
+    wide:
        bounds: { x: 0, y: 0, width: 62, height: 52 }
    spaceline:
        bounds: { x: 0, y: 0, width: 142, height: 52 }
    special:
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 views:
    base:
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -1,10 +1,17 @@
 ---
 bounds: { x: 0, y: 1, width: 540, height: 168 }
 outlines:
-    default: { width: 54, height: 42 }
+    default:
-    altline: { width: 81, height: 42 }
+        bounds: { x: 0, y: 0, width: 54, height: 42 }
-    wide: { width: 108, height: 42 }
+    altline:
-    spaceline: { width: 216, height: 42 }
+        bounds: { x: 0, y: 0, width: 81, height: 42 }
-    special: { width: 54, height: 42 }
+    wide:
        bounds: { x: 0, y: 0, width: 108, height: 42 }
    spaceline:
        bounds: { x: 0, y: 0, width: 216, height: 42 }
    special:
        bounds: { x: 0, y: 0, width: 54, height: 42 }
 views:
    base:
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -2,7 +2,6 @@ sq_view {
    background-color: rgba(0, 0, 0, 255);
    color: #ffffff;
    font-family: cantarell, sans-serif;
    font-size: 25px;
 }
 sq_view sq_button {
@ -36,10 +35,6 @@ sq_button.locked {
    color: #2b292f;
 }
 sq_button.action {
    font-size: 0.75em;
 }
 #Return {
    background: #1c71d8;
    border-color: #1a5fb4;
--- a/data/style.css
+++ b/data/style.css
@ -2,7 +2,6 @@ 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 {
@ -39,10 +38,6 @@ sq_button.locked {
    color: @theme_bg_color; /*#2b292f;*/
 }
 sq_button.action {
    font-size: 0.75em;
 }
 #Return {
    background: @theme_selected_bg_color; /* #1c71d8; */
    border-color: @borders; /*#1a5fb4;*/
--- a/dco.txt
+++ b/dco.txt
@ -1,39 +0,0 @@
 Developer Certificate of Origin
 Version 1.1
 Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
 1 Letterman Drive
 Suite D4700
 San Francisco, CA, 94129
 Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
 Developer's Certificate of Origin 1.1
 By making a contribution to this project, I certify that:
 (a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or
 (b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or
 (c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.
 (d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.
--- a/debian/changelog
+++ b/debian/changelog
@ -1,148 +1,3 @@
 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 ]
  * translations: Use gnome-desktop's xkb info database for layout names
  * translations: Make the code cleaner
  * overlay: Add terminal
  * eek-layout: Remove unused
  * pre-release: Update deps
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 14 Jan 2020 13:55:00 +0000
 squeekboard (1.7.0) amber-phone; urgency=medium
  * New terminal layout appearing on terminal input hint
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
 squeekboard (1.7.0) amber-phone; urgency=medium
  * New terminal layout appearing on terminal input hint
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
 squeekboard (1.6.0) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * tools: Move entry.py
  * build: Move building of squeekboard-test-layout to tools
  * packaging: Install entty.py as squeekboard-entry
  * Remove unused build dependencies
  * Remove unused header generator
  * logging: Move all facilities to one file
  * logging: Described the design
  * logging: Add described log levels
  * popover: Install emoji layout
  * popover: Show overlays as selected
  * Fix old Rust woes
  * emoji: Add a passable layout
  * Fix g_ and stdlib allocation/free mismatches
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 02 Jan 2020 12:02:50 +0000
 squeekboard (1.5.0) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * keycodes: Sort to eliminate runtime indeterminism
  * switcher: Switch layout on menu item click
  * Drop squeek_key
  * renderer: Remove some unneeded vars
  * renderer: Simplified outline rendering
  * renderer: Drop row from button rendering
  * renderer: Drop unused params
  * renderer: Simplify surface rendering
  * rendering: Simplify Cairo context usage, remove unneeded calls.
  * rendering: Remove unneeded redraw after button release
  * renderer: Remove unused locked key render function
  * renderer: Simply cut off when painting outside bounds
  * renderer: Render whole keyboard the same way as pressed buttons
  [ Mark Müller ]
  * layout: add German wide layout
  [ Dorota Czaplejewicz ]
  * renderer: Remove unused functions
  * cleanup: Remove references to squeek_view
  * cleanup: Unbox View and Row
  * cleanup: Remove unused single frame draw
  * positioning: Calculate sizes instead of storing, move position out of widgets
  * positioning: Clean up unused code
  * Fix old Rust woes
  [ Mark Müller ]
  * layout: add Japanese Kana wide layout
  [ Dorota Czaplejewicz ]
  * Entry test: Add Terminal input purpose
  * readme: Add note about Cargo dependencies
  * Create a library/UI module separation
  * hacking: Add DCO and licensing requirement
  * Fix internal .md link
  [ Mark Müller ]
  * squeekboard-test-layout: add argument parsing and some more output
  [ Dorota Czaplejewicz ]
  * Use clap in the lockfile
  * parsing: Remove bounds which weren't used anyway
  * layout: Respect margins
  * CI: Build arm64 .deb
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 23 Dec 2019 11:58:57 +0000
 squeekboard (1.4.0) amber-phone; urgency=medium
  * "text" property in layouts
--- a/debian/control
+++ b/debian/control
@ -9,7 +9,6 @@ Build-Depends:
 ninja-build,
 pkg-config,
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
 libcroco3-dev,
 librust-bitflags-1-dev (>= 1.0),
@ -27,6 +26,9 @@ Build-Depends:
 libwayland-dev (>= 1.16),
 rustc,
 wayland-protocols (>= 1.14),
 # for running the tests
 xvfb,
 xauth,
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
@ -35,20 +37,17 @@ Architecture: linux-any
 Depends:
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
- ${shlibs:Depends},
+ ${shlibs:Depends}
- ${misc:Depends},
+ ${misc:Depends}
 Description: On-screen keyboard for Wayland
 Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
 Package: squeekboard-devel
 Architecture: linux-any
 Depends:
- python3,
+ ${shlibs:Depends}
- python3-gi,
+ ${misc:Depends}
 ${shlibs:Depends},
 ${misc:Depends},
 Description: Resources for making Squeekboard layouts
- Tools for creating and testing Squeekboard layouts:
+ Tools for creating Squeekboard layouts:
 .
  * squeekboard-entry
  * squeekboard-test-layout
--- a/debian/squeekboard-devel.install
+++ b/debian/squeekboard-devel.install
@ -1,2 +1 @@
 usr/bin/squeekboard-test-layout /usr/bin
 usr/bin/squeekboard-entry /usr/bin
--- a/doc/build.sh
+++ b/doc/build.sh
@ -1,22 +0,0 @@
 #!/bin/sh
 # Builds the documentation and places in the selected directory,
 # or the working directory.
 set -e
 SCRIPT_PATH="$(realpath "$0")"
 DOCS_DIR="$(dirname "$SCRIPT_PATH")"
 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
 $SPHINX -b html "${DOCS_DIR}" "${TARGET_DIR}"
--- a/doc/conf.py
+++ b/doc/conf.py
@ -1,165 +0,0 @@
 # -*- coding: utf-8 -*-
 #
 # Configuration file for the Sphinx documentation builder.
 #
 # This file does only contain a selection of the most common options. For a
 # full list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 # -- Path setup --------------------------------------------------------------
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 # -- Project information -----------------------------------------------------
 project = 'squeekboard'
 copyright = 'Squeekboard contributors'
 author = 'Dorota Czaplejewicz'
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
 release = ''
 # -- General configuration ---------------------------------------------------
 # If your documentation needs a minimal Sphinx version, state it here.
 #
 # needs_sphinx = '1.0'
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
    'recommonmark'
 ]
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
 source_suffix = '.md'
 # The master toctree document.
 master_doc = 'index'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
 language = None
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
 exclude_patterns = []
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 # -- Options for HTML output -------------------------------------------------
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
 html_theme = 'alabaster'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
 #
 # The default sidebars (for documents that don't match any pattern) are
 # defined by theme itself.  Builtin themes are using these templates by
 # default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
 # 'searchbox.html']``.
 #
 # html_sidebars = {}
 # -- Options for HTMLHelp output ---------------------------------------------
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'squeekboarddoc'
 # -- Options for LaTeX output ------------------------------------------------
 latex_elements = {
    # The paper size ('letterpaper' or 'a4paper').
    #
    # 'papersize': 'letterpaper',
    # The font size ('10pt', '11pt' or '12pt').
    #
    # 'pointsize': '10pt',
    # Additional stuff for the LaTeX preamble.
    #
    # 'preamble': '',
    # Latex figure (float) alignment
    #
    # 'figure_align': 'htbp',
 }
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
    (master_doc, 'squeekboard.tex', 'squeekboard Documentation',
     'Dorota Czaplejewicz', 'manual'),
 ]
 # -- Options for manual page output ------------------------------------------
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
    (master_doc, 'squeekboard', 'squeekboard Documentation',
     [author], 1)
 ]
 # -- Options for Texinfo output ----------------------------------------------
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
    (master_doc, 'squeekboard', 'squeekboard Documentation',
     author, 'squeekboard', 'One line description of project.',
     'Miscellaneous'),
 ]
 from recommonmark.transform import AutoStructify
 def setup(app):
    app.add_config_value('recommonmark_config', {
        'enable_auto_toc_tree': True,
        'auto_toc_tree_section': 'Contents',
    }, True)
    app.add_transform(AutoStructify)
--- a/doc/index.md
+++ b/doc/index.md
@ -1,21 +0,0 @@
 Welcome to squeekboard's documentation!
 =======================================
 Contents
 --------
 * [Tutorial](tutorial.md)
 Introduction
 ------------
 Squeekboard is the on-screen keyboard for the Librem 5 phone. For more information, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
 Layouts
 -------
 Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](/tutorial.md) explains the process in detail.
 Layouts are created using a text-based format, based on YAML.
 TODO: Provide a description of the format.
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -1,55 +0,0 @@
 Kareema's guide to creating layouts
 ===================================
 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.
 **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
 * Take a look and try to understand them :slight_smile:
 **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**
 * A generic guide how the workflow to contribute works, can be found at 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
 * 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**
 * 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**
 * 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
 * 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-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -39,7 +39,6 @@
 #include "eekboard/eekboard-context-service.h"
 #include "src/layout.h"
 #include "src/submission.h"
 enum {
    PROP_0,
@ -55,8 +54,6 @@ enum {
 typedef struct _EekGtkKeyboardPrivate
 {
    EekRenderer *renderer;
    EekboardContextService *eekboard_context; // unowned reference
    struct submission *submission; // unowned reference
    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
    GdkEventSequence *sequence; // unowned reference
@ -64,6 +61,10 @@ typedef struct _EekGtkKeyboardPrivate
 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
 static void       render_pressed_button      (GtkWidget *widget, struct button_place *place);
 static void       render_released_button     (GtkWidget *widget,
                                              const struct squeek_button *button);
 static void
 eek_gtk_keyboard_real_realize (GtkWidget      *self)
 {
@ -84,7 +85,7 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
                            cairo_t   *cr)
 {
    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);
@ -100,7 +101,10 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
                                       gtk_widget_get_scale_factor (self));
    }
    // render the keyboard without any key activity (TODO: from a cached buffer)
    eek_renderer_render_keyboard (priv->renderer, cr);
    // render only a few remaining changes
    squeek_layout_draw_all_changed(priv->keyboard->layout, EEK_GTK_KEYBOARD(self));
    return FALSE;
 }
@ -109,7 +113,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
@ -125,8 +129,7 @@ static void depress(EekGtkKeyboard *self,
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_depress(priv->keyboard->layout,
+    squeek_layout_depress(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
                          priv->submission,
                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }
@ -134,20 +137,15 @@ 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,
+    squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
-                       priv->submission,
+                       x, y, eek_renderer_get_transformation(priv->renderer), time, self);
                       x, y, eek_renderer_get_transformation(priv->renderer), time,
                       priv->eekboard_context, self);
 }
 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_release(priv->keyboard->layout,
+    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, eek_renderer_get_transformation(priv->renderer), time, self);
                          priv->submission,
                          eek_renderer_get_transformation(priv->renderer), time,
                          priv->eekboard_context, self);
 }
 static gboolean
@ -160,6 +158,8 @@ eek_gtk_keyboard_real_button_press_event (GtkWidget      *self,
    return TRUE;
 }
 // TODO: this belongs more in gtk_keyboard, with a way to find out which key to re-render
 static gboolean
 eek_gtk_keyboard_real_button_release_event (GtkWidget      *self,
@ -231,12 +231,11 @@ static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    if (priv->keyboard) {
        squeek_layout_release_all_only(
-            priv->keyboard->layout,
+            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
            priv->submission,
            gdk_event_get_time(NULL));
    }
@ -249,7 +248,6 @@ eek_gtk_keyboard_set_property (GObject      *object,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -271,8 +269,7 @@ eek_gtk_keyboard_dispose (GObject *object)
    if (priv->keyboard) {
        squeek_layout_release_all_only(
-            priv->keyboard->layout,
+            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
            priv->submission,
            gdk_event_get_time(NULL));
        priv->keyboard = NULL;
    }
@ -307,9 +304,7 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
-{
+{}
    (void)self;
 }
 /**
 * eek_gtk_keyboard_new:
@ -319,18 +314,118 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice,
+eek_gtk_keyboard_new (LevelKeyboard *keyboard)
                      struct submission *submission)
 {
    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;
    return GTK_WIDGET(ret);
 }
-EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
+static void
 render_pressed_button (GtkWidget *widget,
                       struct button_place *place)
 {
    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    return priv->renderer;
+
    GdkWindow         *window  = gtk_widget_get_window (widget);
    cairo_region_t    *region  = gdk_window_get_clip_region (window);
    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
 /*
    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
 */
    gdk_window_end_draw_frame (window, context);
    cairo_region_destroy (region);
 }
 void
 eek_gtk_render_locked_button (EekGtkKeyboard *self, struct button_place place)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    GdkWindow         *window  = gtk_widget_get_window (GTK_WIDGET(self));
    cairo_region_t    *region  = gdk_window_get_clip_region (window);
    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
    eek_renderer_render_button (priv->renderer, cr, &place, 1.0, TRUE);
    gdk_window_end_draw_frame (window, context);
    cairo_region_destroy (region);
 }
 // TODO: does it really redraw the entire keyboard?
 static void
 render_released_button (GtkWidget *widget,
                        const struct squeek_button *button)
 {
    (void)button;
    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    GdkWindow         *window  = gtk_widget_get_window (widget);
    cairo_region_t    *region  = gdk_window_get_clip_region (window);
    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
    eek_renderer_render_keyboard (priv->renderer, cr);
    gdk_window_end_draw_frame (window, context);
    cairo_region_destroy (region);
 }
 void
 eek_gtk_on_button_pressed (struct button_place place,
                   EekGtkKeyboard *self)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
        return;
    if (!place.row) {
        return;
    }
    render_pressed_button (GTK_WIDGET(self), &place);
    gtk_widget_queue_draw (GTK_WIDGET(self));
 #if HAVE_LIBCANBERRA
    ca_gtk_play_for_widget (widget, 0,
                            CA_PROP_EVENT_ID, "button-pressed",
                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
                            NULL);
 #endif
 }
 void
 eek_gtk_on_button_released (const struct squeek_button *button,
                    struct squeek_view *view,
                    EekGtkKeyboard *self)
 {
    (void)view;
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
        return;
    render_released_button (GTK_WIDGET(self), button);
    gtk_widget_queue_draw (GTK_WIDGET(self));
 #if HAVE_LIBCANBERRA
    ca_gtk_play_for_widget (widget, 0,
                            CA_PROP_EVENT_ID, "button-released",
                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
                            NULL);
 #endif
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -28,9 +28,6 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include "eek/eek-types.h"
 struct submission;
 typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
 G_BEGIN_DECLS
@ -48,7 +45,7 @@ struct _EekGtkKeyboardClass
 };
 GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
-GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard, EekboardContextService *eekservice, struct submission *submission);
+GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard);
 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -18,78 +18,49 @@
 * 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>
-#define _XOPEN_SOURCE 500
+#include "eek-enumtypes.h"
-#include <fcntl.h>
+#include "eekboard/eekboard-context-service.h"
-#include <string.h>
+#include "eekboard/key-emitter.h"
-#include <sys/mman.h>
+#include "keymap.h"
-#include <sys/random.h> // TODO: this is Linux-specific
+#include "src/keyboard.h"
 #include <xkbcommon/xkbcommon.h>
 #include "eek-keyboard.h"
-void level_keyboard_free(LevelKeyboard *self) {
+void level_keyboard_deinit(LevelKeyboard *self) {
    xkb_keymap_unref(self->keymap);
    close(self->keymap_fd);
    squeek_layout_free(self->layout);
 }
 void level_keyboard_free(LevelKeyboard *self) {
    level_keyboard_deinit(self);
    g_free(self);
 }
-LevelKeyboard*
+void level_keyboard_init(LevelKeyboard *self, struct squeek_layout *layout) {
-level_keyboard_new (const gchar            *keyboard_type,
+    self->layout = layout;
-                    enum squeek_arrangement_kind t)
+}
-{
+
-    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
+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;
    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;
 }
 struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard)
 {
    return squeek_layout_get_current_view(keyboard->layout);
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -28,6 +28,7 @@
 #include <glib-object.h>
 #include <xkbcommon/xkbcommon.h>
 #include "eek-types.h"
 #include "eek-layout.h"
 #include "src/layout.h"
 G_BEGIN_DECLS
@ -40,15 +41,17 @@ struct _LevelKeyboard {
    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
                                     (LevelKeyboard *keyboard);
-LevelKeyboard*
+struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard);
-level_keyboard_new (const gchar            *keyboard_type,
+LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
-                    enum squeek_arrangement_kind t);
+void level_keyboard_deinit(LevelKeyboard *self);
 void level_keyboard_free(LevelKeyboard *self);
 G_END_DECLS
--- a/eek/eek-layout.c
+++ b/eek/eek-layout.c
@ -0,0 +1,47 @@
 /* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation; either version 2 of
 * the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02110-1301 USA
 */
 /**
 * SECTION:eek-layout
 * @short_description: Base class of a layout engine
 *
 * The #EekLayout class is a base class of layout engine which
 * arranges keyboard elements.
 */
 #include "config.h"
 #include "eek-layout.h"
 #include "eek-keyboard.h"
 #include "eekboard/eekboard-context-service.h"
 #include "eek-xml-layout.h"
 G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
 static void
 eek_layout_class_init (EekLayoutClass *klass)
 {
    klass->create_keyboard = NULL;
 }
 void
 eek_layout_init (EekLayout *self)
 {
 }
--- a/eek/eek-layout.h
+++ b/eek/eek-layout.h
@ -0,0 +1,60 @@
 /* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation; either version 2 of
 * the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02110-1301 USA
 */
 #if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
 #error "Only <eek/eek.h> can be included directly."
 #endif
 #ifndef EEK_LAYOUT_H
 #define EEK_LAYOUT_H 1
 #include <glib-object.h>
 #include "eek-types.h"
 #include "src/layout.h"
 G_BEGIN_DECLS
 #define EEK_TYPE_LAYOUT (eek_layout_get_type())
 G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
 /**
 * EekLayoutClass:
 * @create_keyboard: virtual function for creating a keyboard
 */
 struct _EekLayoutClass
 {
    /*< private >*/
    GObjectClass parent_class;
    /*< public >*/
    LevelKeyboard* (* create_keyboard) (EekboardContextService *manager,
                                      EekLayout *self,
                                      gdouble    initial_width,
                                      gdouble    initial_height);
    /*< private >*/
    /* padding */
    gpointer pdummy[24];
 };
 GType        eek_layout_get_type  (void) G_GNUC_CONST;
 G_END_DECLS
 #endif  /* EEK_LAYOUT_H */
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -42,22 +42,130 @@ typedef struct _EekRendererPrivate
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    gdouble border_width;
    gdouble allocation_width;
    gdouble allocation_height;
    gdouble scale;
    gint scale_factor; /* the outputs scale factor */
-    struct transformation widget_to_layout;
+    gint origin_x;
    gint origin_y;
    PangoFontDescription *font; // owned reference
    cairo_surface_t *keyboard_surface;
 } EekRendererPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
 /* eek-keyboard-drawing.c */
-static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
+static void eek_renderer_render_button_label (EekRenderer *self, cairo_t *cr, GtkStyleContext *ctx,
-                                                const gchar *label, EekBounds bounds);
+                                                const struct squeek_button *button);
-void eek_render_button                         (EekRenderer *self,
+static void invalidate                         (EekRenderer *renderer);
-                                                cairo_t     *cr, const struct squeek_button *button,
+static void render_button                         (EekRenderer *self,
                                                cairo_t     *cr, EekBounds view_bounds, struct button_place *place,
                                                gboolean     pressed, gboolean locked);
 struct _CreateKeyboardSurfaceCallbackData {
    cairo_t *cr;
    EekRenderer *renderer;
    struct squeek_view *view;
    struct squeek_row *row;
 };
 typedef struct _CreateKeyboardSurfaceCallbackData CreateKeyboardSurfaceCallbackData;
 static void
 create_keyboard_surface_button_callback (struct squeek_button *button,
                                      gpointer    user_data)
 {
    CreateKeyboardSurfaceCallbackData *data = user_data;
    EekBounds bounds = squeek_button_get_bounds(button);
    cairo_save (data->cr);
    cairo_translate (data->cr, bounds.x, bounds.y);
    cairo_rectangle (data->cr,
                     0.0,
                     0.0,
                     bounds.width + 100,
                     bounds.height + 100);
    cairo_clip (data->cr);
    struct button_place place = {
        .row = data->row,
        .button = button,
    };
    render_button (data->renderer, data->cr, squeek_view_get_bounds(data->view), &place, FALSE, FALSE);
    cairo_restore (data->cr);
 }
 static void
 create_keyboard_surface_row_callback (struct squeek_row *row,
                                          gpointer    user_data)
 {
    CreateKeyboardSurfaceCallbackData *data = user_data;
    EekBounds bounds = squeek_row_get_bounds(row);
    cairo_save (data->cr);
    cairo_translate (data->cr, bounds.x, bounds.y);
    gint angle = squeek_row_get_angle (row);
    cairo_rotate (data->cr, angle * G_PI / 180);
    data->row = row;
    squeek_row_foreach(row, create_keyboard_surface_button_callback, data);
    cairo_restore (data->cr);
 }
 static void
 render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    GdkRGBA color = {0};
    gtk_style_context_get_color (priv->view_context, GTK_STATE_FLAG_NORMAL, &color);
    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
    CreateKeyboardSurfaceCallbackData data = {
        .cr = cairo_create (priv->keyboard_surface),
        .renderer = renderer,
        .view = view,
    };
    /* Paint the background covering the entire widget area */
    gtk_render_background (priv->view_context,
                           data.cr,
                           0, 0,
                           priv->allocation_width, priv->allocation_height);
    gtk_render_frame (priv->view_context,
                      data.cr,
                      0, 0,
                      priv->allocation_width, priv->allocation_height);
    cairo_save (data.cr);
    cairo_scale (data.cr, priv->scale, priv->scale);
    cairo_translate (data.cr, bounds.x, bounds.y);
    cairo_set_source_rgba (data.cr,
                           color.red,
                           color.green,
                           color.blue,
                           color.alpha);
    /* draw rows */
    squeek_view_foreach(level_keyboard_current(priv->keyboard),
                        create_keyboard_surface_row_callback,
                        &data);
    cairo_restore (data.cr);
    cairo_destroy (data.cr);
 }
 static void
 render_outline (cairo_t     *cr,
                GtkStyleContext *ctx,
@ -81,20 +189,47 @@ render_outline (cairo_t     *cr,
        position.x, position.y, position.width, position.height);
 }
-static void render_button_in_context(gint scale_factor,
+static void render_button_in_context(EekRenderer *self,
                                     gdouble scale,
                                     gint scale_factor,
                                     cairo_t     *cr,
                                     GtkStyleContext *ctx,
-                                     const struct squeek_button *button) {
+                                     EekBounds view_bounds,
-    /* blank background */
+                                     struct button_place *place,
-    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
+                                     gboolean active) {
-    cairo_paint (cr);
+    cairo_surface_t *outline_surface = NULL;
-    EekBounds bounds = squeek_button_get_bounds(button);
+    /* render outline */
-    render_outline (cr, ctx, bounds);
+    EekBounds bounds = squeek_button_get_bounds(place->button);
    {
        cairo_t *cr;
        // Outline will be drawn on the outside of the button, so the
        // surface needs to be bigger than the button
        outline_surface =
            cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
                                        (int)ceil(bounds.width) + 10,
                                        (int)ceil(bounds.height) + 10);
        cr = cairo_create (outline_surface);
        /* blank background */
        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
        cairo_paint (cr);
        cairo_save (cr);
        eek_renderer_apply_transformation_for_button (cr, view_bounds, place, 1.0, FALSE);
        render_outline (cr, ctx, bounds);
        cairo_restore (cr);
        cairo_destroy (cr);
    }
    cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
    cairo_surface_destroy(outline_surface);
    cairo_paint (cr);
    /* render icon (if any) */
-    const char *icon_name = squeek_button_get_icon_name(button);
+    const char *icon_name = squeek_button_get_icon_name(place->button);
    if (icon_name) {
        cairo_surface_t *icon_surface =
@ -124,17 +259,14 @@ static void render_button_in_context(gint scale_factor,
            return;
        }
    }
-
+    eek_renderer_render_button_label (self, cr, ctx, place->button);
    const gchar *label = squeek_button_get_label(button);
    if (label) {
        render_button_label (cr, ctx, label, squeek_button_get_bounds(button));
    }
 }
-void
+static void
-eek_render_button (EekRenderer *self,
+render_button (EekRenderer *self,
            cairo_t     *cr,
-            const struct squeek_button *button,
+               EekBounds view_bounds,
            struct button_place *place,
               gboolean     pressed,
               gboolean     locked)
 {
@ -145,7 +277,7 @@ eek_render_button (EekRenderer *self,
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
    path = gtk_widget_path_copy (gtk_style_context_get_path (ctx));
-    const char *name = squeek_button_get_name(button);
+    const char *name = squeek_button_get_name(place->button);
    gtk_widget_path_iter_set_name (path, -1, name);
    /* Update the style context with the updated widget path. */
@ -154,13 +286,13 @@ eek_render_button (EekRenderer *self,
       (pressed) or normal. */
    gtk_style_context_set_state(ctx,
        pressed ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL);
-    const char *outline_name = squeek_button_get_outline_name(button);
+    const char *outline_name = squeek_button_get_outline_name(place->button);
    if (locked) {
        gtk_style_context_add_class(ctx, "locked");
    }
    gtk_style_context_add_class(ctx, outline_name);
-    render_button_in_context(priv->scale_factor, cr, ctx, button);
+    render_button_in_context(self, priv->scale, priv->scale_factor, cr, ctx, view_bounds, place, pressed);
    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
@ -170,17 +302,85 @@ eek_render_button (EekRenderer *self,
    }
 }
-static void
+/**
-render_button_label (cairo_t     *cr,
+ * eek_renderer_apply_transformation_for_key:
-                     GtkStyleContext *ctx,
+ * @self: The renderer used to render the key
-                     const gchar *label,
+ * @cr: The Cairo rendering context used for rendering
-                     EekBounds bounds)
+ * @key: The key to be transformed
 * @scale: The factor used to scale the key bounds before rendering
 * @rotate: Whether to rotate the key by the angle defined for the key's
 *   in its section definition
 *
 *  Applies a transformation, consisting of scaling and rotation, to the
 *  current rendering context using the bounds for the given key. The scale
 *  factor is separate to the normal scale factor for the keyboard as a whole
 *  and is applied cumulatively. It is typically used to render larger than
 *  normal keys for popups.
 */
 void
 eek_renderer_apply_transformation_for_button (cairo_t     *cr,
                                              EekBounds view_bounds,
                                           struct button_place *place,
                                           gdouble      scale,
                                           gboolean     rotate)
 {
    EekBounds bounds, rotated_bounds;
    gdouble s;
    eek_renderer_get_button_bounds (view_bounds, place, &bounds, FALSE);
    eek_renderer_get_button_bounds (view_bounds, place, &rotated_bounds, TRUE);
    gint angle = squeek_row_get_angle (place->row);
    cairo_scale (cr, scale, scale);
    if (rotate) {
        s = sin (angle * G_PI / 180);
        if (s < 0)
            cairo_translate (cr, 0, - bounds.width * s);
        else
            cairo_translate (cr, bounds.height * s, 0);
        cairo_rotate (cr, angle * G_PI / 180);
    }
 }
 static void
 eek_renderer_render_button_label (EekRenderer *self,
                                  cairo_t     *cr,
                                  GtkStyleContext *ctx,
                                  const struct squeek_button *button)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    const gchar *label = squeek_button_get_label(button);
    if (!label) {
        return;
    }
    PangoFontDescription *font;
-    gtk_style_context_get(ctx,
+    gdouble scale;
-                          gtk_style_context_get_state(ctx),
+
-                          "font", &font,
+
-                          NULL);
+    if (!priv->font) {
        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);
@ -190,7 +390,8 @@ render_button_label (cairo_t     *cr,
    if (line->resolved_dir == PANGO_DIRECTION_RTL) {
        pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
    }
-    pango_layout_set_width (layout, PANGO_SCALE * bounds.width);
+    pango_layout_set_width (layout,
                            PANGO_SCALE * bounds.width * scale);
    PangoRectangle extents = { 0, };
    pango_layout_get_extents (layout, NULL, &extents);
@ -214,28 +415,76 @@ render_button_label (cairo_t     *cr,
    g_object_unref (layout);
 }
-void
+/*
-eek_renderer_render_keyboard (EekRenderer *self,
+ * eek_renderer_real_render_key:
 * @self: The renderer used to render the key
 * @cr: The Cairo rendering context used for rendering
 * @key: The key to be transformed
 * @scale: The factor used to scale the key bounds before rendering
 * @rotate: Whether to rotate the key by the angle defined for the key's
 *   in its section definition
 *
 *   Renders a key separately from the normal keyboard rendering.
 */
 static void
 eek_renderer_real_render_button (EekRenderer *self,
                              cairo_t     *cr,
                              struct button_place *place,
                              gdouble      scale,
                              gboolean     rotate)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    EekBounds bounds;
    EekBounds view_bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
    eek_renderer_get_button_bounds (view_bounds, place, &bounds, rotate);
    cairo_save (cr);
    /* Because this function is called separately from the keyboard rendering
       function, the transformation for the context needs to be set up */
    cairo_translate (cr, priv->origin_x, priv->origin_y);
    cairo_scale (cr, priv->scale, priv->scale);
    cairo_translate (cr, bounds.x, bounds.y);
    eek_renderer_apply_transformation_for_button (cr, view_bounds, place, scale, rotate);
    struct squeek_key *key = squeek_button_get_key(place->button);
    render_button (
                self, cr, view_bounds, place,
                squeek_key_is_pressed(key) != 0,
                squeek_key_is_locked (key) != 0
    );
    cairo_restore (cr);
 }
 static void
 eek_renderer_real_render_keyboard (EekRenderer *self,
                                   cairo_t     *cr)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    cairo_pattern_t *source;
    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 */
+    cairo_save (cr);
    gtk_render_background (priv->view_context,
                           cr,
                           0, 0,
                           priv->allocation_width, priv->allocation_height);
-    cairo_save(cr);
+    cairo_translate (cr, priv->origin_x, priv->origin_y);
-    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+
-    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);
+    if (priv->keyboard_surface)
        cairo_surface_destroy (priv->keyboard_surface);
    priv->keyboard_surface = cairo_surface_create_for_rectangle (
        cairo_get_target (cr), 0, 0,
        priv->allocation_width, priv->allocation_height);
    render_keyboard_surface (self, squeek_layout_get_current_view(priv->keyboard->layout));
    cairo_set_source_surface (cr, priv->keyboard_surface, 0.0, 0.0);
    source = cairo_get_source (cr);
    cairo_pattern_set_extend (source, CAIRO_EXTEND_PAD);
    cairo_paint (cr);
    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr);
    cairo_restore (cr);
 }
@ -265,7 +514,6 @@ eek_renderer_get_property (GObject    *object,
                           GValue     *value,
                           GParamSpec *pspec)
 {
    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -287,7 +535,8 @@ eek_renderer_dispose (GObject *object)
        priv->pcontext = NULL;
    }
-    // this is where renderer-specific surfaces would be released
+    /* this will release all allocated surfaces and font if any */
    invalidate (EEK_RENDERER(object));
    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
 }
@ -301,6 +550,7 @@ eek_renderer_finalize (GObject *object)
    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);
 }
@ -310,6 +560,9 @@ eek_renderer_class_init (EekRendererClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;
    klass->render_button = eek_renderer_real_render_button;
    klass->render_keyboard = eek_renderer_real_render_keyboard;
    gobject_class->set_property = eek_renderer_set_property;
    gobject_class->get_property = eek_renderer_get_property;
    gobject_class->dispose = eek_renderer_dispose;
@ -359,9 +612,13 @@ eek_renderer_init (EekRenderer *self)
    priv->keyboard = NULL;
    priv->pcontext = NULL;
    priv->border_width = 1.0;
    priv->allocation_width = 0.0;
    priv->allocation_height = 0.0;
    priv->scale = 1.0;
    priv->scale_factor = 1;
    priv->font = NULL;
    priv->keyboard_surface = NULL;
    GtkIconTheme *theme = gtk_icon_theme_get_default ();
@ -370,6 +627,17 @@ eek_renderer_init (EekRenderer *self)
    priv->css_provider = squeek_load_style();
 }
 static void
 invalidate (EekRenderer *renderer)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    if (priv->keyboard_surface) {
        cairo_surface_destroy (priv->keyboard_surface);
        priv->keyboard_surface = NULL;
    }
 }
 EekRenderer *
 eek_renderer_new (LevelKeyboard  *keyboard,
                  PangoContext *pcontext)
@ -417,6 +685,8 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  gdouble      width,
                                  gdouble      height)
 {
    gdouble scale;
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);
@ -425,11 +695,99 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
    priv->allocation_width = width;
    priv->allocation_height = height;
-    priv->widget_to_layout = squeek_layout_calculate_transformation(
+    /* Calculate a scale factor to use when rendering the keyboard into the
-                priv->keyboard->layout,
+       available space. */
-                priv->allocation_width, priv->allocation_height);
+    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
-    // This is where size-dependent surfaces would be released
+    gdouble w = (bounds.x * 2) + bounds.width;
    gdouble h = (bounds.y * 2) + bounds.height;
    scale = MIN(width / w, height / h);
    priv->scale = scale;
    /* Set the rendering offset in widget coordinates to center the keyboard */
    priv->origin_x = (gint)floor((width - (scale * w)) / 2);
    priv->origin_y = (gint)floor((height - (scale * h)) / 2);
    invalidate (renderer);
 }
 void
 eek_renderer_get_size (EekRenderer *renderer,
                       gdouble     *width,
                       gdouble     *height)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
    if (width)
        *width = bounds.width;
    if (height)
        *height = bounds.height;
 }
 void
 eek_renderer_get_button_bounds (EekBounds view_bounds,
                                struct button_place *place,
                             EekBounds   *bounds,
                             gboolean     rotate)
 {
    gint angle = 0;
    EekPoint points[4], min, max;
    g_return_if_fail (place);
    g_return_if_fail (bounds != NULL);
    EekBounds button_bounds = squeek_button_get_bounds(place->button);
    EekBounds row_bounds = squeek_row_get_bounds (place->row);
    if (!rotate) {
        button_bounds.x += view_bounds.x + row_bounds.x;
        button_bounds.y += view_bounds.y + row_bounds.y;
        *bounds = button_bounds;
        return;
    }
    points[0].x = button_bounds.x;
    points[0].y = button_bounds.y;
    points[1].x = points[0].x + button_bounds.width;
    points[1].y = points[0].y;
    points[2].x = points[1].x;
    points[2].y = points[1].y + button_bounds.height;
    points[3].x = points[0].x;
    points[3].y = points[2].y;
    if (rotate) {
        angle = squeek_row_get_angle (place->row);
    }
    min = points[2];
    max = points[0];
    for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
        eek_point_rotate (&points[i], angle);
        if (points[i].x < min.x)
            min.x = points[i].x;
        if (points[i].x > max.x)
            max.x = points[i].x;
        if (points[i].y < min.y)
            min.y = points[i].y;
        if (points[i].y > max.y)
            max.y = points[i].y;
    }
    bounds->x = view_bounds.x + row_bounds.x + min.x;
    bounds->y = view_bounds.y + row_bounds.y + min.y;
    bounds->width = (max.x - min.x);
    bounds->height = (max.y - min.y);
 }
 gdouble
 eek_renderer_get_scale (EekRenderer *renderer)
 {
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), 0);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    return priv->scale;
 }
 void
@ -465,11 +823,86 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
    return surface;
 }
 void
 eek_renderer_render_button (EekRenderer *renderer,
                         cairo_t     *cr,
                         struct button_place *place,
                         gdouble      scale,
                         gboolean     rotate)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (place);
    g_return_if_fail (scale >= 0.0);
    EEK_RENDERER_GET_CLASS(renderer)->
        render_button (renderer, cr, place, scale, rotate);
 }
 void
 eek_renderer_render_keyboard (EekRenderer *renderer,
                              cairo_t     *cr)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    EEK_RENDERER_GET_CLASS(renderer)->render_keyboard (renderer, cr);
 }
 static gboolean
 sign (EekPoint *p1, EekPoint *p2, EekPoint *p3)
 {
    // FIXME: what is this actually checking?
    return (p1->x - p3->x) * (p2->y - p3->y) -
        (p2->x - p3->x) * (p1->y - p3->y);
 }
 uint32_t
 eek_are_bounds_inside (EekBounds bounds, EekPoint point, EekPoint origin, int32_t angle)
 {
    EekPoint points[4];
    gboolean b1, b2, b3;
    points[0].x = bounds.x;
    points[0].y = bounds.y;
    points[1].x = points[0].x + bounds.width;
    points[1].y = points[0].y;
    points[2].x = points[1].x;
    points[2].y = points[1].y + bounds.height;
    points[3].x = points[0].x;
    points[3].y = points[2].y;
    for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
        eek_point_rotate (&points[i], angle);
        points[i].x += origin.x;
        points[i].y += origin.y;
    }
    b1 = sign (&point, &points[0], &points[1]) < 0.0;
    b2 = sign (&point, &points[1], &points[2]) < 0.0;
    b3 = sign (&point, &points[2], &points[0]) < 0.0;
    if (b1 == b2 && b2 == b3) {
        return 1;
    }
    b1 = sign (&point, &points[2], &points[3]) < 0.0;
    b2 = sign (&point, &points[3], &points[0]) < 0.0;
    b3 = sign (&point, &points[0], &points[2]) < 0.0;
    if (b1 == b2 && b2 == b3) {
        return 1;
    }
    return 0;
 }
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer) {
    struct transformation failed = {0};
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-    return priv->widget_to_layout;
+    struct transformation ret = {
        .origin_x = priv->origin_x,
        .origin_y = priv->origin_y,
        .scale = priv->scale,
    };
    return ret;
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,6 +25,7 @@
 #include <pango/pangocairo.h>
 #include "eek-types.h"
 #include "src/layout.h"
 G_BEGIN_DECLS
@ -35,6 +36,15 @@ struct _EekRendererClass
 {
    GObjectClass parent_class;
    void             (* render_button)         (EekRenderer *self,
                                             cairo_t     *cr,
                                             struct button_place *place,
                                             gdouble      scale,
                                             gboolean     rotate);
    void             (* render_keyboard)    (EekRenderer *self,
                                             cairo_t     *cr);
    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
                                             const gchar *icon_name,
                                             gint         size,
@ -52,15 +62,38 @@ void             eek_renderer_set_allocation_size
                                               (EekRenderer     *renderer,
                                                gdouble          width,
                                                gdouble          height);
 void             eek_renderer_get_size         (EekRenderer     *renderer,
                                                gdouble         *width,
                                                gdouble         *height);
 void             eek_renderer_get_button_bounds   (EekBounds view_bounds,
                                                struct button_place *button,
                                                EekBounds       *bounds,
                                                gboolean         rotate);
 gdouble          eek_renderer_get_scale        (EekRenderer     *renderer);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                gint             scale);
 void             eek_renderer_render_button       (EekRenderer     *renderer,
                                                cairo_t         *cr,
                                                struct button_place *place,
                                                gdouble          scale,
                                                gboolean         rotate);
 cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);
 void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
                                                cairo_t         *cr);
 void             eek_renderer_set_border_width (EekRenderer     *renderer,
                                                gdouble          border_width);
 void             eek_renderer_apply_transformation_for_button
                                               (cairo_t         *cr,
                                                EekBounds view_bounds,
                                                struct button_place *place,
                                                gdouble          scale,
                                                gboolean         rotate);
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer);
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -38,7 +38,6 @@ G_BEGIN_DECLS
 typedef struct _EekBounds EekBounds;
 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _ServerContextService ServerContextService;
 typedef struct _LevelKeyboard LevelKeyboard;
 /**
@ -89,14 +88,5 @@ struct transformation {
    gdouble origin_y;
    gdouble scale;
 };
 struct squeek_button;
 struct squeek_row;
 /// Represents the path to the button within a view
 struct button_place {
    const struct squeek_row *row;
    const struct squeek_button *button;
 };
 G_END_DECLS
 #endif  /* EEK_TYPES_H */
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -0,0 +1,40 @@
 /*
 * 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/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);
    squeek_layout_place_contents(layout);
    return level_keyboard_new(manager, layout);
 }
--- a/eek/eek-xml-layout.h
+++ b/eek/eek-xml-layout.h
@ -0,0 +1,36 @@
 /* 
 * 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/eek.h
+++ b/eek/eek.h
@ -23,6 +23,7 @@
 #define __EEK_H_INSIDE__ 1
 #include "eek-keyboard.h"
 #include "eek-layout.h"
 void eek_init (void);
--- a/eek/keymap.h
+++ b/eek/keymap.h
@ -0,0 +1,8 @@
 #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/eek/meson.build
+++ b/eek/meson.build
@ -0,0 +1,8 @@
 gnome = import('gnome')
 enum_headers = [
  'eek-types.h',
 ]
 enums = gnome.mkenums_simple('eek-enumtypes', sources: enum_headers)
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -16,15 +16,31 @@
 * 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-keyboard.h"
+#include "eek/eek-xml-layout.h"
 #include "src/server-context-service.h"
 #include "eekboard/eekboard-context-service.h"
@ -32,10 +48,13 @@
 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
 };
@ -46,32 +65,103 @@ static guint signals[LAST_SIGNAL] = { 0, };
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServicePrivate))
 struct _EekboardContextServicePrivate {
    gboolean enabled;
    gboolean visible;
    LevelKeyboard *keyboard; // currently used keyboard
    GHashTable *keyboard_hash; // a table of available keyboards, per layout
-    char *overlay;
+    GSettings *settings;
    GSettings *settings; // Owned reference
    uint32_t hint;
    uint32_t purpose;
    // Maybe TODO: it's used only for fetching layout type.
    // Maybe let UI push the type to this structure?
    ServerContextService *ui; // unowned reference
    /// Needed for keymap changes after keyboard updates
    struct submission *submission; // unowned
 };
 G_DEFINE_TYPE_WITH_PRIVATE (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,
                                       guint         prop_id,
                                       const GValue *value,
                                       GParamSpec   *pspec)
 {
-    (void)value;
+    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
    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;
@ -90,6 +180,9 @@ eekboard_context_service_get_property (GObject    *object,
    case PROP_KEYBOARD:
        g_value_set_object (value, context->priv->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);
        break;
@ -121,17 +214,15 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
 void
 eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
 {
    g_autofree gchar *keyboard_type = NULL;
    g_autofree gchar *keyboard_layout = NULL;
-    if (context->priv->overlay) {
+    settings_get_layout(context->priv->settings, &keyboard_type, &keyboard_layout);
        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_type) {
        keyboard_type = g_strdup("us");
    }
    if (!keyboard_layout) {
-        keyboard_layout = g_strdup("us");
+        keyboard_layout = g_strdup("undefined");
    }
    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
@ -141,23 +232,15 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
        keyboard_layout = g_strdup("number");
        break;
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
        keyboard_layout = g_strdup("terminal");
        break;
    default:
        ;
    }
    // generic part follows
-    LevelKeyboard *keyboard = level_keyboard_new(keyboard_layout, t);
+    LevelKeyboard *keyboard = eekboard_context_service_real_create_keyboard(context, keyboard_layout, t);
    // set as current
    LevelKeyboard *previous_keyboard = context->priv->keyboard;
    context->priv->keyboard = keyboard;
    // Update the keymap if necessary.
    // TODO: Update submission on change event
    if (context->priv->submission) {
        submission_set_keyboard(context->priv->submission, keyboard);
    }
    g_object_notify (G_OBJECT(context), "keyboard");
@ -168,12 +251,7 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
 }
 static void update_layout_and_type(EekboardContextService *context) {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    eekboard_context_service_update_layout(context, server_context_service_get_layout_type(context));
    enum squeek_arrangement_kind layout_kind = ARRANGEMENT_KIND_BASE;
    if (priv->ui) {
        layout_kind = server_context_service_get_layout_type(priv->ui);
    }
    eekboard_context_service_update_layout(context, layout_kind);
 }
 static gboolean
@ -184,8 +262,6 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
    g_free(context->priv->overlay);
    context->priv->overlay = NULL;
    update_layout_and_type(context);
    return TRUE;
 }
@ -194,6 +270,12 @@ static void
 eekboard_context_service_constructed (GObject *object)
 {
    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (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);
 }
@ -203,10 +285,48 @@ 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
@ -232,10 +352,24 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
    pspec = g_param_spec_pointer("keyboard",
                                 "Keyboard",
                                 "Keyboard",
-                                 G_PARAM_READABLE);
+                                 G_PARAM_READWRITE);
    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
@ -257,8 +391,62 @@ eekboard_context_service_init (EekboardContextService *self)
        g_warning ("Could not connect to gsettings updates, layout"
                   " changing unavailable");
    }
 }
-    self->priv->overlay = NULL;
+/**
 * 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);
    }
 }
 /**
@ -272,7 +460,9 @@ eekboard_context_service_destroy (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
-    g_free(context->priv->overlay);
+    if (context->priv->enabled) {
        eekboard_context_service_disable (context);
    }
    g_signal_emit (context, signals[DESTROYED], 0);
 }
@ -289,6 +479,14 @@ eekboard_context_service_get_keyboard (EekboardContextService *context)
    return context->priv->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)
 {
@ -300,30 +498,3 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
        update_layout_and_type(context);
    }
 }
 void
 eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
    context->priv->overlay = g_strdup(name);
    update_layout_and_type(context);
 }
 const char*
 eekboard_context_service_get_overlay(EekboardContextService *context) {
    return context->priv->overlay;
 }
 EekboardContextService *eekboard_context_service_new(void)
 {
    return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
 }
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
    context->priv->submission = submission;
    if (context->priv->submission) {
        submission_set_keyboard(context->priv->submission, context->priv->keyboard);
    }
 }
 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
    context->priv->ui = ui;
 }
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -22,8 +22,7 @@
 #ifndef EEKBOARD_CONTEXT_SERVICE_H
 #define EEKBOARD_CONTEXT_SERVICE_H 1
-#include "src/submission.h"
+#include <eek/eek.h>
 #include "src/layout.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
@ -47,8 +46,6 @@ typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
 /**
 * EekboardContextService:
 *
 * Handles layout state, gsettings, and virtual-keyboard.
 *
 * TODO: Restrict to managing keyboard layouts, and maybe button repeats,
 * and the virtual keyboard protocol.
 *
@ -59,11 +56,15 @@ 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
 */
@ -74,8 +75,12 @@ struct _EekboardContextServiceClass {
    /*< 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 >*/
@ -85,9 +90,12 @@ struct _EekboardContextServiceClass {
 GType         eekboard_context_service_get_type
                                              (void) G_GNUC_CONST;
-EekboardContextService *eekboard_context_service_new(void);
+void          eekboard_context_service_enable (EekboardContextService *context);
-void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
+void          eekboard_context_service_disable (EekboardContextService *context);
-void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
+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);
--- a/eekboard/eekboard-service.c
+++ b/eekboard/eekboard-service.c
@ -0,0 +1,310 @@
 /*
 * 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
@ -0,0 +1,55 @@
 /* 
 * 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
@ -0,0 +1,136 @@
 /*
 * 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
@ -0,0 +1,45 @@
 #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/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.8.0',
+    version: '1.4.0',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -40,7 +40,6 @@ else
 endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
@ -66,6 +65,6 @@ cargo_build = find_program('cargo_build.sh')
 subdir('data')
 subdir('protocols')
 subdir('eek')
 subdir('src')
 subdir('tools')
 subdir('tests')
--- a/src/action.rs
+++ b/src/action.rs
@ -6,8 +6,8 @@ use std::ffi::CString;
 #[derive(Debug, Clone, PartialEq)]
 pub struct KeySym(pub String);
-/// Use to switch views
+/// Use to switch layouts
-type View = String;
+type Level = String;
 /// Use to send modified keypresses
 #[derive(Debug, Clone, PartialEq)]
@ -20,12 +20,12 @@ pub enum Modifier {
 #[derive(Debug, Clone, PartialEq)]
 pub enum Action {
    /// Switch to this view
-    SetView(View),
+    SetLevel(Level),
    /// Switch to a view and latch
-    LockView {
+    LockLevel {
-        lock: View,
+        lock: Level,
        /// When unlocked by pressing it or emitting a key
-        unlock: View,
+        unlock: Level,
    },
    /// Set this modifier TODO: release?
    SetModifier(Modifier),
--- a/src/data.rs
+++ b/src/data.rs
@ -1,7 +1,5 @@
 /**! The parsing of the data files for layouts */
 // TODO: find a nice way to make sure non-positive sizes don't break layouts
 use std::cell::RefCell;
 use std::collections::{ HashMap, HashSet };
 use std::env;
@ -19,19 +17,18 @@ use ::keyboard::{
    KeyState, PressType,
    generate_keymap, generate_keycodes, FormattingError
 };
 use ::layout;
 use ::layout::ArrangementKind;
 use ::logging;
 use ::resources;
 use ::util::c::as_str;
 use ::util::hash_map_map;
 use ::xdg;
 // traits, derives
 use serde::Deserialize;
 use std::io::BufReader;
 use std::iter::FromIterator;
-use ::logging::Warn;
+use serde::Deserialize;
 use util::WarningHandler;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -154,10 +151,18 @@ fn list_layout_sources(
    ret
 }
 struct PrintWarnings;
 impl WarningHandler for PrintWarnings {
    fn handle(&mut self, warning: &str) {
        println!("{}", warning);
    }
 }
 fn load_layout_data(source: DataSource)
    -> Result<::layout::LayoutData, LoadError>
 {
-    let handler = logging::Print {};
+    let handler = PrintWarnings{};
    match source {
        DataSource::File(path) => {
            Layout::from_file(path.clone())
@ -190,21 +195,16 @@ fn load_layout_data_with_fallback(
                (
                    LoadError::BadData(Error::Missing(e)),
                    DataSource::File(file)
-                ) => log_print!(
+                ) => eprintln!( // TODO: print in debug logging level
                    logging::Level::Debug,
                    "Tried file {:?}, but it's missing: {}",
                    file, e
                ),
-                (e, source) => log_print!(
+                (e, source) => eprintln!(
                    logging::Level::Warning,
                    "Failed to load layout from {}: {}, skipping",
                    source, e
                ),
            },
-            Ok(layout) => {
+            Ok(layout) => return (kind, layout),
                log_print!(logging::Level::Info, "Loaded layout {}", source);
                return (kind, layout);
            }
        }
    }
@ -215,20 +215,20 @@ fn load_layout_data_with_fallback(
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct Layout {
-    #[serde(default)]
+    bounds: Bounds,
    margins: Margins,
    views: HashMap<String, Vec<ButtonIds>>,
    #[serde(default)] 
    buttons: HashMap<String, ButtonMeta>,
    outlines: HashMap<String, Outline>
 }
-#[derive(Debug, Clone, Deserialize, PartialEq, Default)]
+#[derive(Debug, Clone, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
-struct Margins {
+struct Bounds {
-    top: f64,
+    x: f64,
-    bottom: f64,
+    y: f64,
-    side: f64,
+    width: f64,
    height: f64,
 }
 /// Buttons are embedded in a single string
@ -269,8 +269,7 @@ enum Action {
 #[derive(Debug, Clone, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct Outline {
-    width: f64,
+    bounds: Bounds,
    height: f64,
 }
 /// Errors encountered loading the layout into yaml
@ -304,20 +303,6 @@ impl From<io::Error> for Error {
    }
 }
 pub fn add_offsets<'a, I: 'a, T, F: 'a>(iterator: I, get_size: F)
    -> impl Iterator<Item=(f64, T)> + 'a
    where I: Iterator<Item=T>,
        F: Fn(&T) -> f64,
 {
    let mut offset = 0.0;
    iterator.map(move |item| {
        let size = get_size(&item);
        let value = (offset, item);
        offset += size;
        value
    })
 }
 impl Layout {
    pub fn from_resource(name: &str) -> Result<Layout, LoadError> {
        let data = resources::get_keyboard(name)
@ -335,7 +320,7 @@ impl Layout {
        serde_yaml::from_reader(infile).map_err(Error::Yaml)
    }
-    pub fn build<H: logging::Handler>(self, mut warning_handler: H)
+    pub fn build<H: WarningHandler>(self, mut warning_handler: H)
        -> (Result<::layout::LayoutData, FormattingError>, H)
    {
        let button_names = self.views.values()
@ -418,35 +403,34 @@ impl Layout {
        );
        let views = HashMap::from_iter(
-            self.views.iter().map(|(name, view)| {
+            self.views.iter().map(|(name, view)| {(
-                let rows = view.iter().map(|row| {
+                name.clone(),
-                    let buttons = row.split_ascii_whitespace()
+                Box::new(::layout::View {
-                        .map(|name| {
+                    bounds: ::layout::c::Bounds {
-                            Box::new(create_button(
+                        x: self.bounds.x,
-                                &self.buttons,
+                        y: self.bounds.y,
-                                &self.outlines,
+                        width: self.bounds.width,
-                                name,
+                        height: self.bounds.height,
-                                button_states_cache.get(name.into())
+                    },
-                                    .expect("Button state not created")
+                    rows: view.iter().map(|row| {
-                                    .clone(),
+                        Box::new(::layout::Row {
-                                &mut warning_handler,
+                            angle: 0,
-                            ))
+                            bounds: None,
-                        });
+                            buttons: row.split_ascii_whitespace().map(|name| {
-                    ::layout::Row {
+                                Box::new(create_button(
-                        angle: 0,
+                                    &self.buttons,
-                        buttons: add_offsets(
+                                    &self.outlines,
-                            buttons,
+                                    name,
-                            |button| button.size.width,
+                                    button_states_cache.get(name.into())
-                        ).collect()
+                                        .expect("Button state not created")
-                    }
+                                        .clone(),
-                });
+                                    &mut warning_handler,
-                let rows = add_offsets(rows, |row| row.get_height())
+                                ))
-                    .collect();
+                            }).collect(),
-                (
+                        })
-                    name.clone(),
+                    }).collect(),
-                    layout::View::new(rows)
+                })
-                )
+            )})
            })
        );
        (
@ -456,20 +440,13 @@ impl Layout {
                    CString::new(keymap_str)
                        .expect("Invalid keymap string generated")
                },
                // FIXME: use a dedicated field
                margins: layout::Margins {
                    top: self.margins.top,
                    left: self.margins.side,
                    bottom: self.margins.bottom,
                    right: self.margins.side,
                },
            }),
            warning_handler,
        )
    }
 }
-fn create_action<H: logging::Handler>(
+fn create_action<H: WarningHandler>(
    button_info: &HashMap<String, ButtonMeta>,
    name: &str,
    view_names: Vec<&String>,
@ -499,18 +476,15 @@ fn create_action<H: logging::Handler>(
        (None, None, Some(text)) => SubmitData::Text(text.clone()),
        (None, None, None) => SubmitData::Text(name.into()),
        _ => {
-            warning_handler.handle(
+            warning_handler.handle(&format!(
-                logging::Level::Warning,
+                "Button {} has more than one of (action, keysym, text)",
-                &format!(
+                name
-                    "Button {} has more than one of (action, keysym, text)",
+            ));
                    name,
                ),
            );
            SubmitData::Text("".into())
        },
    };
-    fn filter_view_name<H: logging::Handler>(
+    fn filter_view_name<H: WarningHandler>(
        button_name: &str,
        view_name: String,
        view_names: &Vec<&String>,
@ -519,13 +493,10 @@ fn create_action<H: logging::Handler>(
        if view_names.contains(&&view_name) {
            view_name
        } else {
-            warning_handler.handle(
+            warning_handler.handle(&format!("Button {} switches to missing view {}",
-                logging::Level::Warning,
+                button_name,
-                &format!("Button {} switches to missing view {}",
+                view_name,
-                    button_name,
+            ));
                    view_name,
                ),
            );
            "base".into()
        }
    }
@ -533,7 +504,7 @@ fn create_action<H: logging::Handler>(
    match submission {
        SubmitData::Action(
            Action::SetView(view_name)
-        ) => ::action::Action::SetView(
+        ) => ::action::Action::SetLevel(
            filter_view_name(
                name, view_name.clone(), &view_names,
                warning_handler,
@ -541,7 +512,7 @@ fn create_action<H: logging::Handler>(
        ),
        SubmitData::Action(Action::Locking {
            lock_view, unlock_view
-        }) => ::action::Action::LockView {
+        }) => ::action::Action::LockLevel {
            lock: filter_view_name(
                name,
                lock_view.clone(),
@ -564,24 +535,27 @@ fn create_action<H: logging::Handler>(
                match keysym_valid(keysym.as_str()) {
                    true => keysym.clone(),
                    false => {
-                        warning_handler.handle(
+                        warning_handler.handle(&format!(
-                            logging::Level::Warning,
+                            "Keysym name invalid: {}",
-                            &format!(
+                            keysym,
-                                "Keysym name invalid: {}",
+                        ));
                                keysym,
                            ),
                        );
                        "space".into() // placeholder
                    },
                }
            )),
        },
        SubmitData::Text(text) => ::action::Action::Submit {
-            text: CString::new(text.clone()).or_warn(
+            text: {
-                warning_handler,
+                CString::new(text.clone())
-                logging::Problem::Warning,
+                    .map_err(|e| {
-                &format!("Text {} contains problems", text),
+                        warning_handler.handle(&format!(
-            ),
+                            "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()) {
@ -595,7 +569,7 @@ fn create_action<H: logging::Handler>(
 /// TODO: Since this will receive user-provided data,
 /// all .expect() on them should be turned into soft fails
-fn create_button<H: logging::Handler>(
+fn create_button<H: WarningHandler>(
    button_info: &HashMap<String, ButtonMeta>,
    outlines: &HashMap<String, Outline>,
    name: &str,
@ -619,11 +593,14 @@ fn create_button<H: logging::Handler>(
    } else if let Some(text) = &button_meta.text {
        ::layout::Label::Text(
            CString::new(text.as_str())
-                .or_warn(
+                .unwrap_or_else(|e| {
-                    warning_handler,
+                    warning_handler.handle(&format!(
-                    logging::Problem::Warning,
+                        "Text {} is invalid: {}",
-                    &format!("Text {} is invalid", text),
+                        text,
-                ).unwrap_or_else(|| CString::new("").unwrap())
+                        e,
                    ));
                    CString::new("").unwrap()
                })
        )
    } else {
        ::layout::Label::Text(cname.clone())
@ -634,10 +611,7 @@ fn create_button<H: logging::Handler>(
            if outlines.contains_key(outline) {
                outline.clone()
            } else {
-                warning_handler.handle(
+                warning_handler.handle(&format!("Outline named {} does not exist! Using default for button {}", outline, name));
                    logging::Level::Warning,
                    &format!("Outline named {} does not exist! Using default for button {}", outline, name)
                );
                "default".into()
            }
        }
@ -646,19 +620,24 @@ fn create_button<H: logging::Handler>(
    let outline = outlines.get(&outline_name)
        .map(|outline| (*outline).clone())
-        .or_warn(
+        .unwrap_or_else(|| {
-            warning_handler,
+            warning_handler.handle(
-            logging::Problem::Warning,
+                &format!("No default outline defined! Using 1x1!")
-            "No default outline defined! Using 1x1!",
+            );
-        ).unwrap_or(Outline { width: 1f64, height: 1f64 });
+            Outline {
                bounds: Bounds { x: 0f64, y: 0f64, width: 1f64, height: 1f64 },
            }
        });
-    layout::Button {
+    ::layout::Button {
        name: cname,
        outline_name: CString::new(outline_name).expect("Bad outline"),
        // TODO: do layout before creating buttons
-        size: layout::Size {
+        bounds: ::layout::c::Bounds {
-            width: outline.width,
+            x: outline.bounds.x,
-            height: outline.height,
+            y: outline.bounds.y,
            width: outline.bounds.width,
            height: outline.bounds.height,
        },
        label: label,
        state: state,
@ -670,14 +649,21 @@ mod tests {
    use super::*;
    use std::error::Error as ErrorTrait;
-    use ::logging::ProblemPanic;
+
    struct PanicWarn;
    impl WarningHandler for PanicWarn {
        fn handle(&mut self, warning: &str) {
            panic!("{}", warning);
        }
    }
    #[test]
    fn test_parse_path() {
        assert_eq!(
            Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
            Layout {
-                margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
+                bounds: Bounds { x: 0f64, y: 0f64, width: 0f64, height: 0f64 },
                views: hashmap!(
                    "base".into() => vec!("test".into()),
                ),
@ -692,7 +678,11 @@ mod tests {
                    }
                },
                outlines: hashmap!{
-                    "default".into() => Outline { width: 0f64, height: 0f64 }, 
+                    "default".into() => Outline {
                        bounds: Bounds {
                            x: 0f64, y: 0f64, width: 0f64, height: 0f64
                        }, 
                    }
                },
            }
        );
@ -740,12 +730,12 @@ mod tests {
    fn test_layout_punctuation() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
            .unwrap()
-            .build(ProblemPanic).0
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .get_rows()[0].1
+                .rows[0]
-                .buttons[0].1
+                .buttons[0]
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -755,12 +745,12 @@ mod tests {
    fn test_layout_unicode() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
            .unwrap()
-            .build(ProblemPanic).0
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .get_rows()[0].1
+                .rows[0]
-                .buttons[0].1
+                .buttons[0]
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -771,12 +761,12 @@ mod tests {
    fn test_layout_unicode_multi() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
            .unwrap()
-            .build(ProblemPanic).0
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .get_rows()[0].1
+                .rows[0]
-                .buttons[0].1
+                .buttons[0]
                .state.borrow()
                .keycodes.len(),
            2
@ -786,7 +776,7 @@ mod tests {
    #[test]
    fn parsing_fallback() {
        assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
-            .map(|layout| layout.build(ProblemPanic).0.unwrap())
+            .map(|layout| layout.build(PanicWarn).0.unwrap())
            .is_ok()
        );
    }
@ -834,7 +824,7 @@ mod tests {
                },
                ".",
                Vec::new(),
-                &mut ProblemPanic,
+                &mut PanicWarn,
            ),
            ::action::Action::Submit {
                text: Some(CString::new(".").unwrap()),
@ -842,21 +832,4 @@ mod tests {
            },
        );
    }
    #[test]
    fn test_layout_margins() {
        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
            out.margins,
            layout::Margins {
                top: 1.0,
                bottom: 3.0,
                left: 2.0,
                right: 2.0,
            }
        );
    }
 }
--- a/src/dbus.c
+++ b/src/dbus.c
@ -1,124 +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/>.
 */
 #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
@ -1,48 +0,0 @@
 /* 
 * 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
@ -1,120 +0,0 @@
 /*! Drawing the UI */
 use cairo;
 use std::cell::RefCell;
 use ::keyboard;
 use ::layout::{ Button, Layout };
 use ::layout::c::{ EekGtkKeyboard, Point };
 use glib::translate::FromGlibPtrNone;
 use gtk::WidgetExt;
 mod c {
    use super::*;
    use cairo_sys;
    use std::os::raw::c_void;
    // This is constructed only in C, no need for warnings
    #[allow(dead_code)]
    #[repr(transparent)]
    #[derive(Clone, Copy)]
    pub struct EekRenderer(*const c_void);
    #[no_mangle]
    extern "C" {
        // Button and View inside CButtonPlace are safe to pass to C
        // as long as they don't outlive the call
        // and nothing dereferences them
        #[allow(improper_ctypes)]
        pub fn eek_render_button(
            renderer: EekRenderer,
            cr: *mut cairo_sys::cairo_t,
            button: *const Button,
            pressed: u64,
            locked: u64,
        );
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_layout_draw_all_changed(
        layout: *mut Layout,
        renderer: EekRenderer,
        cr: *mut cairo_sys::cairo_t,
    ) {
        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() {
            for (x_offset, button) in &row.buttons {
                let state = RefCell::borrow(&button.state).clone();
                if state.pressed == keyboard::PressType::Pressed || state.locked {
                    render_button_at_position(
                        renderer, &cr,
                        row_offset + Point { x: *x_offset, y: 0.0 },
                        button.as_ref(),
                        state.pressed, state.locked,
                    );
                }
            }
        }
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_draw_layout_base_view(
        layout: *mut Layout,
        renderer: EekRenderer,
        cr: *mut cairo_sys::cairo_t,
    ) {
        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() {
            for (x_offset, button) in &row.buttons {
                render_button_at_position(
                    renderer, &cr,
                    row_offset + Point { x: *x_offset, y: 0.0 },
                    button.as_ref(),
                    keyboard::PressType::Released, false,
                );
            }
        }
    }
 }
 /// Renders a button at a position (button's own bounds ignored)
 pub fn render_button_at_position(
    renderer: c::EekRenderer,
    cr: &cairo::Context,
    position: Point,
    button: &Button,
    pressed: keyboard::PressType,
    locked: bool,
 ) {
    cr.save();
    cr.translate(position.x, position.y);
    cr.rectangle(
        0.0, 0.0,
        button.size.width, button.size.height
    );
    cr.clip();
    unsafe {
        c::eek_render_button(
            renderer,
            cairo::Context::to_raw_none(&cr),
            button as *const Button,
            pressed as u64,
            locked as u64,
        )
    };
    cr.restore();
 }
 pub fn queue_redraw(keyboard: EekGtkKeyboard) {
    let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
    widget.queue_draw();
 }
--- a/src/imservice.c
+++ b/src/imservice.c
@ -1,17 +1,9 @@
-#include "submission.h"
+#include "imservice.h"
 #include <glib.h>
-struct imservice;
+#include "eekboard/eekboard-context-service.h"
 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,
@ -19,34 +11,29 @@ 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_done,
+    .done = imservice_handle_commit_state,
    .unavailable = imservice_handle_unavailable,
 };
-struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
+struct imservice* get_imservice(EekboardContextService *context,
-                                  struct zwp_virtual_keyboard_manager_v1 *vkmanager,
+                                struct zwp_input_method_manager_v2 *manager,
-                                  struct wl_seat *seat,
+                                struct wl_seat *seat) {
-                                  EekboardContextService *state) {
+    struct zwp_input_method_v2 *im = zwp_input_method_manager_v2_get_input_method(manager, seat);
-    struct zwp_input_method_v2 *im = NULL;
+    struct imservice *imservice = imservice_new(im, context);
    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
+    /* Add a listener, passing the imservice instance to make it available to
-struct zwp_input_method_v2 *imservice_manager_get_input_method(struct zwp_input_method_manager_v2 *manager,
+       callbacks. */
                                   struct wl_seat *seat) {
    return zwp_input_method_manager_v2_get_input_method(manager, seat);
 }
 /// Un-inlined to let Rust link to it
 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) {
    eekboard_context_service_show_keyboard (context);
 }
 void imservice_try_hide(EekboardContextService *context) {
    eekboard_context_service_hide_keyboard (context);
 }
 /// Declared explicitly because _destroy is inline,
--- a/src/imservice.h
+++ b/src/imservice.h
@ -0,0 +1,25 @@
 #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,47 +1,58 @@
 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
 pub mod c {
    use super::*;
-
+    
    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);
-        #[allow(improper_ctypes)] // IMService will never be dereferenced in C
+        fn eekboard_context_service_set_hint_purpose(imservice: *const UIManager, hint: u32, purpose: u32);
-        pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
+        fn eekboard_context_service_show_keyboard(imservice: *const UIManager);
-        fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32);
+        fn eekboard_context_service_hide_keyboard(imservice: *const UIManager);
        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 extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_input_method_activate(imservice: *mut IMService,
        im: *const InputMethod)
    {
@ -54,7 +65,7 @@ pub mod c {
    }
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_input_method_deactivate(imservice: *mut IMService,
        im: *const InputMethod)
    {
@ -66,7 +77,7 @@ pub mod c {
    }
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_surrounding_text(imservice: *mut IMService,
        im: *const InputMethod,
        text: *const c_char, cursor: u32, _anchor: u32)
@ -82,7 +93,7 @@ pub mod c {
    }
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_content_type(imservice: *mut IMService,
        im: *const InputMethod,
        hint: u32, purpose: u32)
@ -90,27 +101,23 @@ pub mod c {
        let imservice = check_imservice(imservice, im).unwrap();
        imservice.pending = IMProtocolState {
            content_hint: {
-                ContentHint::from_bits(hint)
+                ContentHint::from_bits(hint).unwrap_or_else(|| {
-                    .or_print(
+                    eprintln!("Warning: received invalid hint flags");
-                        logging::Problem::Warning,
+                    ContentHint::NONE
-                        "Received invalid hint flags",
+                })
                    )
                    .unwrap_or(ContentHint::NONE)
            },
            content_purpose: {
-                ContentPurpose::try_from(purpose)
+                ContentPurpose::try_from(purpose).unwrap_or_else(|_e| {
-                    .or_print(
+                    eprintln!("Warning: Received invalid purpose value");
-                        logging::Problem::Warning,
+                    ContentPurpose::Normal
-                        "Received invalid purpose value",
+                })
                    )
                    .unwrap_or(ContentPurpose::Normal)
            },
            ..imservice.pending.clone()
        };
    }
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_text_change_cause(imservice: *mut IMService,
        im: *const InputMethod,
        cause: u32)
@ -118,68 +125,56 @@ pub mod c {
        let imservice = check_imservice(imservice, im).unwrap();
        imservice.pending = IMProtocolState {
            text_change_cause: {
-                ChangeCause::try_from(cause)
+                ChangeCause::try_from(cause).unwrap_or_else(|_e| {
-                    .or_print(
+                    eprintln!("Warning: received invalid cause value");
-                        logging::Problem::Warning,
+                    ChangeCause::InputMethod
-                        "Received invalid cause value",
+                })
                    )
                    .unwrap_or(ChangeCause::InputMethod)
            },
            ..imservice.pending.clone()
        };
    }
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
-    fn imservice_handle_done(imservice: *mut IMService,
+    fn imservice_handle_commit_state(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 {
-                if let Some(ui) = imservice.ui_manager {
+                eekboard_context_service_show_keyboard(imservice.ui_manager);
-                    unsafe { server_context_service_show_keyboard(ui); }
+                eekboard_context_service_set_hint_purpose(
-                }
+                    imservice.ui_manager,
-                unsafe {
+                    imservice.current.content_hint.bits(),
-                    eekboard_context_service_set_hint_purpose(
+                    imservice.current.content_purpose.clone() as u32);
                        imservice.state_manager,
                        imservice.current.content_hint.bits(),
                        imservice.current.content_purpose.clone() as u32,
                    );
                }
            } else {
-                if let Some(ui) = imservice.ui_manager {
+                eekboard_context_service_hide_keyboard(imservice.ui_manager);
                    unsafe { server_context_service_hide_keyboard(ui); }
                }
            }
        }
    }
    // TODO: this is really untested
    #[no_mangle]
-    pub extern "C"
+    pub unsafe extern "C"
    fn imservice_handle_unavailable(imservice: *mut IMService,
        im: *mut InputMethod)
    {
        let imservice = check_imservice(imservice, im).unwrap();
-        unsafe { imservice_destroy_im(im); }
+        imservice_destroy_im(im);
        // no need to care about proper double-buffering,
        // the keyboard is already decommissioned
        imservice.current.active = false;
-        if let Some(ui) = imservice.ui_manager {
+        eekboard_context_service_hide_keyboard(imservice.ui_manager);
-            unsafe { server_context_service_hide_keyboard(ui); }
+    }
        }
    }    
    // FIXME: destroy and deallocate
@ -251,17 +246,10 @@ 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 {
-    type Error = UnrecognizedValue;
+    // There's only one way to fail: number not in protocol,
    // so no special error type is needed
    type Error = ();
    fn try_from(num: u32) -> Result<Self, Self::Error> {
        use self::ContentPurpose::*;
        match num {
@ -279,7 +267,7 @@ impl TryFrom<u32> for ContentPurpose {
            11 => Ok(Time),
            12 => Ok(Datetime),
            13 => Ok(Terminal),
-            _ => Err(UnrecognizedValue),
+            _ => Err(()),
        }
    }
 }
@ -292,12 +280,14 @@ pub enum ChangeCause {
 }
 impl TryFrom<u32> for ChangeCause {
-    type Error = UnrecognizedValue;
+    // There's only one way to fail: number not in protocol,
    // 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(UnrecognizedValue)
+            _ => Err(())
        }
    }
 }
@ -330,38 +320,10 @@ pub struct IMService {
    /// Owned reference (still created and destroyed in C)
    pub im: *const c::InputMethod,
    /// Unowned reference. Be careful, it's shared with C at large
-    state_manager: *const c::StateManager,
+    ui_manager: *const c::UIManager,
    /// 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,
    serial: Wrapping<u32>,
 }
 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(),
            serial: Wrapping(0u32),
        });
        unsafe {
            c::imservice_connect_listeners(
                im,
                imservice.as_ref() as *const IMService,
            );
        }
        imservice
    }
 }
--- a/src/keyboard.h
+++ b/src/keyboard.h
@ -0,0 +1,12 @@
 #ifndef __KEYBOARD_H
 #define __KEYBOARD_H
 #include "inttypes.h"
 #include "stdbool.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 struct squeek_key;
 uint32_t squeek_key_is_pressed(struct squeek_key *key);
 uint32_t squeek_key_is_locked(struct squeek_key *key);
 #endif
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -7,50 +7,50 @@ use std::io;
 use std::string::FromUtf8Error;
 use ::action::Action;
 use ::logging;
 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };
 use ::util::CloneOwned;
-#[derive(Debug, Clone, Copy, PartialEq)]
+/// Gathers stuff defined in C or called by C
 pub mod c {
    use super::*;
    use ::util::c;
    pub type CKeyState = c::Wrapped<KeyState>;
    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
    #[no_mangle]
    pub extern "C"
    fn squeek_key_is_pressed(key: CKeyState) -> u32 {
        //let key = unsafe { Rc::from_raw(key.0) };
        return key.clone_owned().pressed as u32;
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_key_is_locked(key: CKeyState) -> u32 {
        return key.clone_owned().locked as u32;
    }
 }
 #[derive(Debug, Clone, Copy)]
 pub enum PressType {
    Released = 0,
    Pressed = 1,
 }
 pub type KeyCode = u32;
 #[derive(Debug, Clone)]
 pub struct KeyState {
    pub pressed: PressType,
    pub locked: bool,
    /// 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_activated(self) -> KeyState {
        match self.action {
            Action::LockView { lock: _, unlock: _ } => KeyState {
                locked: self.locked ^ true,
                ..self
            },
            _ => self,
        }
    }
    #[must_use]
    pub fn into_released(self) -> KeyState {
        KeyState {
            pressed: PressType::Released,
            ..self
        }
    }
 }
 /// Sorts an iterator by converting it to a Vector and back
 fn sorted<'a, I: Iterator<Item=&'a str>>(
    iter: I
@ -111,12 +111,7 @@ pub fn generate_keymap(
    for (name, state) in keystates.iter() {
        if let Action::Submit { text: _, keys } = &state.action {
-            if let 0 = keys.len() {
+            if let 0 = keys.len() { eprintln!("Key {} has no keysyms", name); };
                log_print!(
                    logging::Level::Warning,
                    "Key {} has no keysyms", name,
                );
            };
            for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
                write!(
                    buf,
--- a/src/layout.h
+++ b/src/layout.h
@ -5,8 +5,8 @@
 #include <glib.h>
 #include "eek/eek-element.h"
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
 #include "src/keyboard.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 enum squeek_arrangement_kind {
@ -14,45 +14,66 @@ enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_WIDE = 1,
 };
 struct squeek_button;
 struct squeek_row;
 struct squeek_view;
 struct squeek_layout;
 /// Represents the path to the button within a view
 struct button_place {
    const struct squeek_row *row;
    const struct squeek_button *button;
 };
 int32_t squeek_row_get_angle(const struct squeek_row*);
 EekBounds squeek_row_get_bounds(const struct squeek_row*);
 typedef void (*ButtonCallback) (struct squeek_button *button, gpointer user_data);
 void squeek_row_foreach(struct squeek_row*,
                            ButtonCallback   callback,
                            gpointer      user_data);
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
 const char *squeek_button_get_label(const struct squeek_button*);
 const char *squeek_button_get_icon_name(const struct squeek_button*);
 const char *squeek_button_get_name(const struct squeek_button*);
 const char *squeek_button_get_outline_name(const struct squeek_button*);
 struct squeek_key *squeek_button_get_key(const struct squeek_button*);
 uint32_t *squeek_button_has_key(const struct squeek_button* button,
                                const struct squeek_key *key);
 void squeek_button_print(const struct squeek_button* button);
-struct transformation squeek_layout_calculate_transformation(
+
-        const struct squeek_layout *layout,
+EekBounds squeek_view_get_bounds(const struct squeek_view*);
-        double allocation_width, double allocation_size);
+
 typedef void (*RowCallback) (struct squeek_row *row, gpointer user_data);
 void squeek_view_foreach(struct squeek_view*,
                            RowCallback   callback,
                            gpointer      user_data);
 void
 squeek_layout_place_contents(struct squeek_layout*);
 struct squeek_view *squeek_layout_get_current_view(struct squeek_layout*);
 struct squeek_layout *squeek_load_layout(const char *name, uint32_t type);
 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,
+void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                           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,
+void squeek_layout_release_all_only(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp);
-                                    struct submission *submission,
+void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                                    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,
+void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                        struct submission *submission,
                        double x_widget, double y_widget,
                        struct transformation widget_to_layout,
-                        uint32_t timestamp, EekboardContextService *manager,
+                        uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
-                        EekGtkKeyboard *ui_keyboard);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekGtkKeyboard *ui_keyboard);
 void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,8 +1,5 @@
 #[macro_use]
 extern crate bitflags;
 extern crate cairo;
 extern crate cairo_sys;
 extern crate gdk;
 extern crate gio;
 extern crate glib;
 extern crate glib_sys;
@ -15,25 +12,19 @@ extern crate regex;
 extern crate serde;
 extern crate xkbcommon;
 #[macro_use]
 mod logging;
 mod action;
 pub mod data;
 mod drawing;
 pub mod float_ord;
 pub mod imservice;
 mod keyboard;
 mod layout;
 mod locale;
 mod locale_config;
 mod manager;
 mod outputs;
 mod popover;
 mod resources;
 mod style;
 mod submission;
 mod style;
 pub mod tests;
 pub mod util;
 mod vkeyboard;
 mod xdg;
--- a/src/locale.rs
+++ b/src/locale.rs
@ -1,106 +1,21 @@
-/*! Locale-specific functions. 
+/*! Locale-specific functions */
 * 
 * This file is intended as a library:
 * it must pass errors upwards
 * and panicking is allowed only when
 * this code encounters an internal inconsistency.
 */
 use std::cmp;
-use std::ffi::{ CStr, CString };
+use std::ffi::CString;
 use std::fmt;
 use std::os::raw::c_char;
 use std::ptr;
 use std::str::Utf8Error;
 mod c {
-    use super::*;
+    use std::os::raw::c_char;
    use std::os::raw::c_void;
    #[allow(non_camel_case_types)]
    pub type c_int = i32;
    #[derive(Clone, Copy)]
    #[repr(C)]
    pub struct GnomeXkbInfo(*const c_void);
    #[no_mangle]
    extern "C" {
        // from libc
        pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
        // from gnome-desktop3
        pub fn gnome_xkb_info_new() -> GnomeXkbInfo;
        pub fn gnome_xkb_info_get_layout_info (
            info: GnomeXkbInfo,
            id: *const c_char,
            display_name: *mut *const c_char,
            short_name: *const *const c_char,
            xkb_layout: *const *const c_char,
            xkb_variant: *const *const c_char
        ) -> c_int;
        pub fn g_object_unref(o: GnomeXkbInfo);
    }
 }
 #[derive(Debug)]
 pub enum Error {
    StringConversion(Utf8Error),
    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 {
    pub fn new() -> XkbInfo {
        XkbInfo(unsafe { c::gnome_xkb_info_new() })
    }
    pub fn get_display_name(&self, id: &str) -> Result<String, Error> {
        let id = cstring_safe(id);
        let id_ref = id.as_ptr();
        let mut display_name: *const c_char = ptr::null();
        let found = unsafe {
            c::gnome_xkb_info_get_layout_info(
                self.0,
                id_ref,
                &mut display_name as *mut *const c_char,
                ptr::null(), ptr::null(), ptr::null(),
            )
        };
        if found != 0 && !display_name.is_null() {
            let display_name = unsafe { CStr::from_ptr(display_name) };
            display_name.to_str()
                .map(str::to_string)
                .map_err(Error::StringConversion)
        } else {
            Err(Error::NoInfo)
        }
    }
 }
 impl Drop for XkbInfo {
    fn drop(&mut self) {
        unsafe { c::g_object_unref(self.0) }
    }
 }
 #[derive(Clone, Debug, PartialEq)]
 pub struct Translation<'a>(pub &'a str);
 impl<'a> Translation<'a> {
    pub fn to_owned(&'a self) -> OwnedTranslation {
        OwnedTranslation(self.0.to_owned())
    }
 }
 #[derive(Clone, Debug, PartialEq)]
 pub struct OwnedTranslation(pub String);
 fn cstring_safe(s: &str) -> CString {
    CString::new(s)
        .unwrap_or(CString::new("").unwrap())
--- a/src/logging.rs
+++ b/src/logging.rs
@ -1,201 +0,0 @@
 /*! Logging library.
 * 
 * This is probably the only part of squeekboard
 * that should be doing any direct printing.
 * 
 * There are several approaches to logging,
 * in the order of increasing flexibility and/or purity:
 * 
 * 1. `println!` directly
 * 
 *   It can't be easily replaced by a different solution
 * 
 * 2. simple `log!` macro
 * 
 *   Replacing the destination at runtime other than globally would be awkward,
 *   so no easy way to suppress errors for things that don't matter,
 *   but formatting is still easy.
 * 
 * 3. logging to a mutable destination type
 * 
 *   Can be easily replaced, but logging `Result` types,
 *   which should be done by calling a method on the result,
 *   can't be formatted directly.
 *   Cannot be parallelized.
 * 
 * 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::fmt::Display;
 /// Levels are not in order.
 pub enum Level {
    // Levels for reporting violated constraints
    /// The program violated a self-imposed constraint,
    /// ended up in an inconsistent state, and cannot recover.
    /// Handlers must not actually panic. (should they?)
    Panic,
    /// The program violated a self-imposed constraint,
    /// ended up in an inconsistent state, but some state can be recovered.
    Bug,
    /// Invalid data given by an external source,
    /// some state of the program must be dropped.
    Error,
    // Still violated constraints, but harmless
    /// Invalid data given by an external source, parts of data are ignored.
    /// No previous program state needs to be dropped.
    Warning,
    /// External source not in an expected state,
    /// but not violating any protocols (including no relevant protocol).
    Surprise,
    // Informational
    /// A change in internal state that results in a change of behaviour
    /// that a user can observe, and a tinkerer might find useful.
    /// E.g. selection of external sources, like loading user's UI files,
    /// language switch, overrides.
    Info,
    /// Information useful for application developer only.
    /// Should be limited to information gotten from external sources,
    /// and more tricky parts of internal state.
    Debug,
 }
 impl Level {
    fn as_str(&self) -> &'static str {
        match self {
            Level::Panic => "Panic",
            Level::Bug => "Bug",
            Level::Error => "Error",
            Level::Warning => "Warning",
            Level::Surprise => "Surprise",
            Level::Info => "Info",
            Level::Debug => "Debug",
        }
    }
 }
 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<H: Handler>(
        self,
        handler: &mut H,
        level: Problem,
        message: &str,
    ) -> Option<T> {
        self.map_err(|e| {
            handler.handle(level.into(), &format!("{}: {}", message, e));
            e
        }).ok()
    }
 }
 impl<T> Warn for Option<T> {
    type Value = T;
    fn or_warn<H: Handler>(
        self,
        handler: &mut H,
        level: Problem,
        message: &str,
    ) -> Option<T> {
        self.or_else(|| {
            handler.handle(level.into(), message);
            None
        })
    }
 }
 /// A mutable handler for text warnings.
 /// Approach 3.
 pub trait Handler {
    /// Handle a log message
    fn handle(&mut self, level: Level, message: &str);
 }
 /// Prints info to stdout, everything else to stderr
 pub struct Print;
 impl Handler for Print {
    fn handle(&mut self, level: Level, message: &str) {
        match level {
            Level::Info => println!("Info: {}", message),
            l => eprintln!("{}: {}", l.as_str(), message),
        }
    }
 }
 /// Warning handler that will panic
 /// at any warning, error, surprise, bug, or panic.
 /// Don't use except in tests
 pub struct ProblemPanic;
 impl Handler for ProblemPanic {
    fn handle(&mut self, level: Level, message: &str) {
        use self::Level::*;
        match level {
            Panic | Bug | Error | Warning | Surprise => panic!("{}", message),
            l => Print{}.handle(l, message),
        }
    }
 }
--- a/src/manager.rs
+++ b/src/manager.rs
@ -1,34 +0,0 @@
 /*! Procedures relating to the management of the switching of layouts */
 use ::util;
 pub mod c {
    use std::os::raw::{c_char, c_void};
    /// EekboardContextService*
    #[repr(transparent)]
    #[derive(Clone, Copy)]
    pub struct Manager(*const c_void);
    #[no_mangle]
    extern "C" {
        pub fn eekboard_context_service_set_overlay(
            manager: Manager,
            name: *const c_char,
        );
        pub fn eekboard_context_service_get_overlay(
            manager: Manager,
        ) -> *const c_char;
    }
 }
 /// Returns the overlay name.
 /// The result lifetime is "as long as the C copy lives"
 pub fn get_overlay(manager: c::Manager) -> Option<String> {
    let raw_str = unsafe {
        c::eekboard_context_service_get_overlay(manager)
    };
    // this string is generated from Rust, should never be invalid
    util::c::as_str(&raw_str).unwrap()
        .map(String::from)
 }
--- a/src/meson.build
+++ b/src/meson.build
@ -12,7 +12,6 @@ config_h = configure_file(
 sources = [
  config_h,
  'dbus.c',
  'imservice.c',
  'server-context-service.c',
  'wayland.c',
@ -20,11 +19,16 @@ sources = [
  '../eek/eek-element.c',
  '../eek/eek-gtk-keyboard.c',
  '../eek/eek-keyboard.c',
  '../eek/eek-layout.c',
  '../eek/eek-renderer.c',
  '../eek/eek-types.c',
  '../eek/eek-xml-layout.c',
  '../eek/layersurface.c',
  dbus_src,
  enums,
  '../eekboard/key-emitter.c',
  '../eekboard/eekboard-context-service.c',
  '../eekboard/eekboard-service.c',
  #  '../eekboard/eekboard-xklutil.c',
  squeekboard_resources,
  wl_proto_sources,
@ -36,7 +40,6 @@ cc = meson.get_compiler('c')
 deps = [
 #  dependency('glib-2.0', version: '>=2.26.0'),
  dependency('gio-2.0', version: '>=2.26.0'),
  dependency('gnome-desktop-3.0', version: '>=3.0'),
  dependency('gtk+-3.0', version: '>=3.0'),
  dependency('libcroco-0.6'),
  dependency('wayland-client', version: '>=1.14'),
@ -109,3 +112,16 @@ squeekboard = executable('squeekboard',
    '-DEEK_COMPILATION=1'],
 )
 bindir = join_paths(prefix, get_option('bindir'))
 test_layout = custom_target('squeekboard-test-layout',
    build_by_default: true,
    # meson doesn't track all inputs, cargo does
    build_always_stale: true,
    output: ['squeekboard-test-layout'],
    console: true,
    command: [cargo_build] + cargo_build_flags
        + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
    install: true,
    install_dir: bindir,
 )
--- a/src/outputs.rs
+++ b/src/outputs.rs
@ -1,10 +1,7 @@
 /*! 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 {
@ -116,11 +113,14 @@ pub mod c {
        _make: *const c_char, _model: *const c_char,
        transform: i32,
    ) {
-        let transform = Transform::from_u32(transform as u32)
+        let transform = Transform::from_u32(transform as u32).unwrap_or_else(
-            .or_print(
+            || {
-                logging::Problem::Warning,
+                eprintln!(
-                "Received invalid wl_output.transform value",
+                    "Warning: received invalid wl_output.transform value"
-            ).unwrap_or(Transform::Normal);
+                );
                Transform::Normal
            }
        );
        let outputs = outputs.clone_ref();
        let mut collection = outputs.borrow_mut();
@ -129,10 +129,7 @@ pub mod c {
                .map(|o| &mut o.pending);
        match output_state {
            Some(state) => { state.transform = Some(transform) },
-            None => log_print!(
+            None => eprintln!("Wayland error: Got mode on unknown output"),
                logging::Level::Warning,
                "Got geometry on unknown output",
            ),
        };
    }
@ -144,12 +141,10 @@ pub mod c {
        height: i32,
        _refresh: i32,
    ) {
-        let flags = Mode::from_bits(flags)
+        let flags = Mode::from_bits(flags).unwrap_or_else(|| {
-            .or_print(
+            eprintln!("Warning: received invalid wl_output.mode flags");
-                logging::Problem::Warning,
+            Mode::NONE
-                "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>
@ -161,10 +156,7 @@ pub mod c {
                    state.current_mode = Some(super::Mode { width, height});
                }
            },
-            None => log_print!(
+            None => eprintln!("Wayland error: Got mode on unknown output"),
                logging::Level::Warning,
                "Got mode on unknown output",
            ),
        };
    }
@ -177,10 +169,7 @@ pub mod c {
        let output = find_output_mut(&mut collection, wl_output);
        match output {
            Some(output) => { output.current = output.pending.clone(); }
-            None => log_print!(
+            None => eprintln!("Wayland error: Got done on unknown output"),
                logging::Level::Warning,
                "Got done on unknown output",
            ),
        };
    }
@ -196,10 +185,7 @@ pub mod c {
                .map(|o| &mut o.pending);
        match output_state {
            Some(state) => { state.scale = factor; }
-            None => log_print!(
+            None => eprintln!("Wayland error: Got done on unknown output"),
                logging::Level::Warning,
                "Got scale on unknown output",
            ),
        };
    }
@ -272,10 +258,7 @@ pub mod c {
                }
            },
            _ => {
-                log_print!(
+                eprintln!("Not enough info registered on output");
                    logging::Level::Surprise,
                    "Not enough info received on output",
                );
                0
            },
        }
--- a/src/popover.rs
+++ b/src/popover.rs
@ -2,13 +2,9 @@
 use gio;
 use gtk;
-use std::ffi::CString;
+use ::layout::c::EekGtkKeyboard;
-use ::layout::c::{ Bounds, EekGtkKeyboard };
+use ::locale::compare_current_locale;
 use ::locale;
 use ::locale::{ OwnedTranslation, Translation, compare_current_locale };
 use ::locale_config::system_locale;
 use ::logging;
 use ::manager;
 use ::resources;
 use gio::ActionMapExt;
@ -19,7 +15,6 @@ use glib::variant::ToVariant;
 use gtk::PopoverExt;
 use gtk::WidgetExt;
 use std::io::Write;
 use ::logging::Warn;
 mod variants {
    use glib;
@ -97,7 +92,7 @@ mod variants {
    }
 }
-fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
+fn make_menu_builder(inputs: Vec<(&str, &str)>) -> gtk::Builder {
    let mut xml: Vec<u8> = Vec::new();
    writeln!(
        xml,
@ -106,7 +101,7 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
  <menu id=\"app-menu\">
    <section>"
    ).unwrap();
-    for (input_name, translation) in inputs {
+    for (input_name, human_name) in inputs {
        writeln!(
            xml,
            "
@ -115,7 +110,7 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
            <attribute name=\"action\">layout</attribute>
            <attribute name=\"target\">{}</attribute>
        </item>",
-            translation.0,
+            human_name,
            input_name,
        ).unwrap();
    }
@ -146,190 +141,47 @@ fn set_layout(kind: String, name: String) {
    settings.apply();
 }
-/// A reference to what the user wants to see
+pub fn show(window: EekGtkKeyboard, position: ::layout::c::Bounds) {
-#[derive(PartialEq, Clone, Debug)]
+    unsafe { gtk::set_initialized() };
-enum LayoutId {
+    let window = unsafe { gtk::Widget::from_glib_none(window.0) };
    /// Affects the layout in system settings
    System {
        kind: String,
        name: String,
    },
    /// Only affects what this input method presents
    Local(String),
 }
-impl LayoutId {
+    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
-    fn get_name(&self) -> &str {
+    let inputs = settings.get_value("sources").unwrap();
-        match &self {
+    let inputs = variants::get_tuples(inputs);
-            LayoutId::System { kind: _, name } => name.as_str(),
+    
-            LayoutId::Local(name) => name.as_str(),
+    let input_names: Vec<&str> = inputs.iter()
-        }
+        .map(|(_kind, name)| name.as_str())
-    }
+        .collect();
 }
-fn set_visible_layout(
+    let translations = system_locale()
    manager: manager::c::Manager,
    layout_id: LayoutId,
 ) {
    match layout_id {
        LayoutId::System { kind, name } => set_layout(kind, name),
        LayoutId::Local(name) => {
            let name = CString::new(name.as_str()).unwrap();
            let name_ptr = name.as_ptr();
            unsafe {
                manager::c::eekboard_context_service_set_overlay(
                    manager,
                    name_ptr,
                )
            }
        },
    }
 }
 /// Takes into account first any overlays, then system layouts from the list
 fn get_current_layout(
    manager: manager::c::Manager,
    system_layouts: &Vec<LayoutId>,
 ) -> Option<LayoutId> {
    match manager::get_overlay(manager) {
        Some(name) => Some(LayoutId::Local(name)),
        None => system_layouts.get(0).map(LayoutId::clone),
    }
 }
 /// Translates all provided layout names according to current locale,
 /// for the purpose of display (i.e. errors will be caught and reported)
 fn translate_layout_names(layouts: &Vec<LayoutId>) -> Vec<OwnedTranslation> {
    // This procedure is rather ugly...
    // Xkb lookup *must not* be applied to non-system layouts,
    // so both translators can't be merged into one lookup table,
    // therefore must be done in two steps.
    // `XkbInfo` being temporary also means
    // that its return values must be copied,
    // forcing the use of `OwnedTranslation`.
    enum Status {
        /// xkb names should get all translated here
        Translated(OwnedTranslation),
        /// Builtin names need builtin translations
        Remaining(String),
    }
    // Attempt to take all xkb names from gnome-desktop's xkb info.
    let xkb_translator = locale::XkbInfo::new();
    let translated_names = layouts.iter()
        .map(|id| match id {
            LayoutId::System { name, kind: _ } => {
                xkb_translator.get_display_name(name)
                    .map(|s| Status::Translated(OwnedTranslation(s)))
                    .or_print(
                        logging::Problem::Surprise,
                        &format!("No display name for xkb layout {}", name),
                    ).unwrap_or_else(|| Status::Remaining(name.clone()))
            },
            LayoutId::Local(name) => Status::Remaining(name.clone()),
        });
    // Non-xkb layouts and weird xkb layouts
    // still need to be looked up in the internal database.
    let builtin_translations = system_locale()
        .map(|locale|
            locale.tags_for("messages")
                .next().unwrap() // guaranteed to exist
                .as_ref()
                .to_owned()
        )
-        .or_print(logging::Problem::Surprise, "No locale detected")
+        .and_then(|lang| resources::get_layout_names(lang.as_str()));
        .and_then(|lang| {
            resources::get_layout_names(lang.as_str())
                .or_print(
                    logging::Problem::Surprise,
                    &format!("No translations for locale {}", lang),
                )
        });
    match builtin_translations {
        Some(translations) => {
            translated_names
                .map(|status| match status {
                    Status::Remaining(name) => {
                        translations.get(name.as_str())
                            .unwrap_or(&Translation(name.as_str()))
                            .to_owned()
                    },
                    Status::Translated(t) => t,
                })
                .collect()
        },
        None => {
            translated_names
                .map(|status| match status {
                    Status::Remaining(name) => OwnedTranslation(name),
                    Status::Translated(t) => t,
                })
                .collect()
        },
    }
 }
 pub fn show(
    window: EekGtkKeyboard,
    position: Bounds,
    manager: manager::c::Manager,
 ) {
    unsafe { gtk::set_initialized() };
    let window = unsafe { gtk::Widget::from_glib_none(window.0) };
    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 inputs = settings.get_value("sources").unwrap();
    let inputs = variants::get_tuples(inputs);
    let system_layouts: Vec<LayoutId> = inputs.into_iter()
        .map(|(kind, name)| LayoutId::System { kind, name })
        .collect();
    let all_layouts: Vec<LayoutId> = system_layouts.clone()
        .into_iter()
        .chain(overlay_layouts)
        .collect();
    let translated_names = translate_layout_names(&all_layouts);
    // sorted collection of human and machine names
-    let mut human_names: Vec<(OwnedTranslation, LayoutId)> = translated_names
+    let mut human_names: Vec<(&str, &str)> = match translations {
-        .into_iter()
+        Some(translations) => {
-        .zip(all_layouts.clone().into_iter())
+            input_names.iter()
-        .collect();
+                .map(|name| (*name, *translations.get(name).unwrap_or(name)))
                .collect()
        },
        // display bare codes
        None => {
            input_names.iter()
                .map(|n| (*n, *n)) // turns &&str into &str
                .collect()
        }
    };
-    human_names.sort_unstable_by(|(tr_a, _), (tr_b, _)| {
+    human_names.sort_unstable_by(|(_, human_label_a), (_, human_label_b)| {
-        compare_current_locale(&tr_a.0, &tr_b.0)
+        compare_current_locale(human_label_a, human_label_b)
    });
-    // GVariant doesn't natively support `enum`s,
+    let builder = make_menu_builder(human_names);
    // so the `choices` vector will serve as a lookup table.
    let choices_with_translations: Vec<(String, (OwnedTranslation, LayoutId))>
        = human_names.into_iter()
            .enumerate()
                .map(|(i, human_entry)| {(
                    format!("{}_{}", i, human_entry.1.get_name()),
                    human_entry,
                )}).collect();
    let builder = make_menu_builder(
        choices_with_translations.iter()
            .map(|(id, (translation, _))| (id.as_str(), (*translation).clone()))
            .collect()
    );
    let choices: Vec<(String, LayoutId)>
        = choices_with_translations.into_iter()
            .map(|(id, (_tr, layout))| (id, layout))
            .collect();
    // Much more debuggable to populate the model & menu
    // from a string representation
    // than add items imperatively
@ -343,45 +195,27 @@ pub fn show(
        height: position.width.floor() as i32,
    });
-    if let Some(current_layout) = get_current_layout(manager, &system_layouts) {
+    if let Some(current_name) = input_names.get(0) {
-        let current_name_variant = choices.iter()
+        let current_name = current_name.to_variant();
            .find(
                |(_id, layout)| layout == &current_layout
            ).unwrap()
            .0.to_variant();
        let layout_action = gio::SimpleAction::new_stateful(
            "layout",
-            Some(current_name_variant.type_()),
+            Some(current_name.type_()),
-            &current_name_variant,
+            &current_name,
        );
-        let menu_inner = menu.clone();
+        layout_action.connect_change_state(|_action, state| {
        layout_action.connect_change_state(move |_action, state| {
            match state {
                Some(v) => {
                    v.get::<String>()
-                        .or_print(
+                        .or_else(|| {
-                            logging::Problem::Bug,
+                            eprintln!("Variant is not string: {:?}", v);
-                            &format!("Variant is not string: {:?}", v)
+                            None
-                        )
+                        })
-                        .map(|state| {
+                        .map(|state| set_layout("xkb".into(), state));
                            let (_id, layout) = choices.iter()
                                .find(
                                    |choices| state == choices.0
                                ).unwrap();
                            set_visible_layout(
                                manager,
                                layout.clone(),
                            )
                        });
                },
-                None => log_print!(
+                None => eprintln!("No variant selected"),
                    logging::Level::Debug,
                    "No variant selected",
                ),
            };
            menu_inner.popdown();
        });
        let action_group = gio::SimpleActionGroup::new();
--- a/src/resources.rs
+++ b/src/resources.rs
@ -3,7 +3,6 @@
 */
 use std::collections::HashMap;
 use ::locale::Translation;
 use std::iter::FromIterator;
@ -11,7 +10,6 @@ use std::iter::FromIterator;
 // and what a convenience layout. "_wide" is not a layout,
 // neither is "number"
 const KEYBOARDS: &[(*const str, *const str)] = &[
    // layouts
    ("us", include_str!("../data/keyboards/us.yaml")),
    ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
@ -21,14 +19,9 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("fi", include_str!("../data/keyboards/fi.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")),
    ("se", include_str!("../data/keyboards/se.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
    // Overlays
    ("emoji", include_str!("../data/keyboards/emoji.yaml")),
 ];
 pub fn get_keyboard(needle: &str) -> Option<&'static str> {
@ -45,19 +38,6 @@ pub fn get_keyboard(needle: &str) -> Option<&'static str> {
        })
 }
 const OVERLAY_NAMES: &[*const str] = &[
    "emoji",
    "terminal",
 ];
 pub fn get_overlays() -> Vec<&'static str> {
    OVERLAY_NAMES.iter()
        .map(|name| {
            let name: *const str = *name;
            unsafe { &*name }
        }).collect()
 }
 /// Translations of the layout identifier strings
 const LAYOUT_NAMES: &[(*const str, *const str)] = &[
    ("de-DE", include_str!("../data/langs/de-DE.txt")),
@ -68,7 +48,7 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
 ];
 pub fn get_layout_names(lang: &str)
-    -> Option<HashMap<&'static str, Translation<'static>>>
+    -> Option<HashMap<&'static str, &'static str>>
 {
    let translations = LAYOUT_NAMES.iter()
        .find(|(name, _data)| {
@ -82,7 +62,7 @@ pub fn get_layout_names(lang: &str)
    translations.map(make_mapping)
 }
-fn parse_line(line: &str) -> Option<(&str, Translation)> {
+fn parse_line(line: &str) -> Option<(&str, &str)> {
    let comment = line.trim().starts_with("#");
    if comment {
        None
@ -90,11 +70,11 @@ fn parse_line(line: &str) -> Option<(&str, Translation)> {
        let mut iter = line.splitn(2, " ");
        let name = iter.next().unwrap();
        // will skip empty and unfinished lines
-        iter.next().map(|tr| (name, Translation(tr.trim())))
+        iter.next().map(|tr| (name, tr.trim()))
    }
 }
-fn make_mapping(data: &str) -> HashMap<&str, Translation> {
+fn make_mapping(data: &str) -> HashMap<&str, &str> {
    HashMap::from_iter(
        data.split("\n")
            .filter_map(parse_line)
@ -105,17 +85,10 @@ fn make_mapping(data: &str) -> HashMap<&str, Translation> {
 mod test {
    use super::*;
    #[test]
    fn check_overlays_present() {
        for name in get_overlays() {
            assert!(get_keyboard(name).is_some());
        }
    }
    #[test]
    fn mapping_line() {
        assert_eq!(
-            Some(("name", Translation("translation"))),
+            Some(("name", "translation")),
            parse_line("name translation")
        );
    }
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -23,31 +23,24 @@
 #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_SIZE_CONSTRAINT_PORTRAIT,
    PROP_VISIBLE,
    PROP_LAST
 };
 typedef struct _ServerContextServiceClass ServerContextServiceClass;
 struct _ServerContextService {
-    GObject parent;
+    EekboardContextService parent;
    EekboardContextService *state; // unowned
    /// Needed for instantiating the widget
    struct submission *submission; // unowned
    gboolean visible;
    PhoshLayerSurface *window;
-    GtkWidget *widget; // nullable
+    GtkWidget *widget;
    guint hiding;
    guint last_requested_height;
    enum squeek_arrangement_kind last_type;
@ -57,10 +50,10 @@ struct _ServerContextService {
 };
 struct _ServerContextServiceClass {
-    GObjectClass parent_class;
+    EekboardContextServiceClass parent_class;
 };
-G_DEFINE_TYPE(ServerContextService, server_context_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ServerContextService, server_context_service, EEKBOARD_TYPE_CONTEXT_SERVICE);
 static void
 on_destroy (GtkWidget *widget, gpointer user_data)
@ -72,7 +65,7 @@ on_destroy (GtkWidget *widget, gpointer user_data)
    context->window = NULL;
    context->widget = NULL;
-    //eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
+    eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
 }
 static void
@ -83,6 +76,17 @@ 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);
@ -91,8 +95,8 @@ on_notify_keyboard (GObject              *object,
    g_object_get (context, "visible", &visible, NULL);
    if (visible) {
-        server_context_service_hide_keyboard(context);
+        eekboard_context_service_hide_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
-        server_context_service_show_keyboard(context);
+        eekboard_context_service_show_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
    }
 }
@ -145,7 +149,7 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
    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(context->state, context->last_type);
+        eekboard_context_service_update_layout(EEKBOARD_CONTEXT_SERVICE(context), context->last_type);
    }
    guint desired_height = calculate_height(width);
@ -225,15 +229,35 @@ make_widget (ServerContextService *context)
        context->widget = NULL;
    }
-    LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state);
+    LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
-    context->widget = eek_gtk_keyboard_new (keyboard, context->state, context->submission);
+    context->widget = eek_gtk_keyboard_new (keyboard);
    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)
 {
@ -244,49 +268,20 @@ on_hide (ServerContextService *context)
 }
 static void
-server_context_service_real_show_keyboard (ServerContextService *context)
+server_context_service_real_hide_keyboard (EekboardContextService *_context)
 {
-    if (context->hiding) {
+    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);
 	    g_source_remove (context->hiding);
 	    context->hiding = 0;
    }
-    if (!context->window)
+    if (!context->hiding)
-        make_window (context);
+	context->hiding = g_timeout_add (200, (GSourceFunc) on_hide, context);
    if (!context->widget)
        make_widget (context);
-    context->visible = TRUE;
+    EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
-    gtk_widget_show (GTK_WIDGET(context->window));
+        hide_keyboard (_context);
 }
 static void
-server_context_service_real_hide_keyboard (ServerContextService *context)
+server_context_service_real_destroyed (EekboardContextService *_context)
 {
    if (!context->hiding)
        context->hiding = g_timeout_add (200, (GSourceFunc) on_hide, context);
    context->visible = FALSE;
 }
 void
 server_context_service_show_keyboard (ServerContextService *context)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(context));
    if (!context->visible) {
        server_context_service_real_show_keyboard (context);
    }
 }
 void
 server_context_service_hide_keyboard (ServerContextService *context)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(context));
    if (context->visible) {
        server_context_service_real_hide_keyboard (context);
    }
 }
 static void
@ -311,9 +306,6 @@ server_context_service_set_property (GObject      *object,
                       &context->size_constraint_portrait[0],
                       &context->size_constraint_portrait[1]);
        break;
    case PROP_VISIBLE:
        context->visible = g_value_get_boolean (value);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -321,23 +313,6 @@ server_context_service_set_property (GObject      *object,
    }
 }
 static void
 server_context_service_get_property (GObject    *object,
                                       guint       prop_id,
                                       GValue     *value,
                                       GParamSpec *pspec)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);
    switch (prop_id) {
    case PROP_VISIBLE:
        g_value_set_boolean (value, context->visible);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 server_context_service_dispose (GObject *object)
 {
@ -352,11 +327,15 @@ 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",
@ -378,39 +357,24 @@ server_context_service_class_init (ServerContextServiceClass *klass)
    g_object_class_install_property (gobject_class,
                                     PROP_SIZE_CONSTRAINT_PORTRAIT,
                                     pspec);
    /**
     * 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
-server_context_service_init (ServerContextService *state) {
+server_context_service_init (ServerContextService *context)
    (void)state;
 }
 ServerContextService *
 server_context_service_new (EekboardContextService *state, struct submission *submission)
 {
-    ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
+    g_signal_connect (context,
    ui->submission = submission;
    ui->state = state;
    g_signal_connect (state,
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
-                      ui);
+                      context);
    return ui;
 }
-enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *service)
+EekboardContextService *
 server_context_service_new ()
 {
-    return service->last_type;
+    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL));
 }
 enum squeek_arrangement_kind server_context_service_get_layout_type(EekboardContextService *service)
 {
    return SERVER_CONTEXT_SERVICE(service)->last_type;
 }
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@ -18,8 +18,8 @@
 #ifndef SERVER_CONTEXT_SERVICE_H
 #define SERVER_CONTEXT_SERVICE_H 1
 #include "eekboard/eekboard-service.h"
 #include "src/layout.h"
 #include "src/submission.h"
 G_BEGIN_DECLS
@ -30,16 +30,12 @@ G_BEGIN_DECLS
 #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 lifecycle of the window displaying layouts. */
+/** Manages the liecycle of the window displaying layouts. */
 typedef struct _ServerContextService ServerContextService;
-GType         server_context_service_get_type
+EekboardContextService *server_context_service_new ();
-                                              (void) G_GNUC_CONST;
+enum squeek_arrangement_kind server_context_service_get_layout_type(EekboardContextService*);
 ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission);
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
 void server_context_service_show_keyboard (ServerContextService *context);
 void server_context_service_hide_keyboard (ServerContextService *context);
 G_END_DECLS
 #endif  /* SERVER_CONTEXT_SERVICE_H */
--- a/src/server-main.c
+++ b/src/server-main.c
@ -25,11 +25,10 @@
 #include "config.h"
 #include "eekboard/eekboard-service.h"
 #include "eek/eek.h"
-#include "eekboard/eekboard-context-service.h"
+#include "imservice.h"
 #include "dbus.h"
 #include "outputs.h"
 #include "submission.h"
 #include "server-context-service.h"
 #include "wayland.h"
@ -39,10 +38,8 @@
 /// Global application state
 struct squeekboard {
    struct squeek_wayland wayland;
-    DBusHandler *dbus_handler;
+    EekboardContextService *context;
-    EekboardContextService *settings_context;
+    struct imservice *imservice;
    ServerContextService *ui_context;
    struct submission *submission;
 };
@ -67,14 +64,31 @@ 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
@ -195,11 +209,7 @@ main (int argc, char **argv)
        exit(1);
    }
-    if (!instance.wayland.input_method_manager) {
+    instance.context = create_context();
        g_warning("Wayland input method interface not available");
    }
    instance.settings_context = eekboard_context_service_new();
    // set up dbus
@ -247,16 +257,17 @@ main (int argc, char **argv)
        break;
    }
-    DBusHandler *service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
+    EekboardService *service = eekboard_service_new (connection, EEKBOARD_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,
-                                             DBUS_SERVICE_INTERFACE,
+                                             EEKBOARD_SERVICE_INTERFACE,
                                             G_BUS_NAME_OWNER_FLAGS_NONE,
                                             on_name_acquired,
                                             on_name_lost,
@ -267,33 +278,24 @@ main (int argc, char **argv)
        exit (1);
    }
-    instance.submission = get_submission(instance.wayland.input_method_manager,
+    struct imservice *imservice = NULL;
-                                         instance.wayland.virtual_keyboard_manager,
+    if (instance.wayland.input_method_manager) {
-                                         instance.wayland.seat,
+        imservice = get_imservice(instance.context,
-                                         instance.settings_context);
+                                  instance.wayland.input_method_manager,
-
+                                  instance.wayland.seat);
-    eekboard_context_service_set_submission(instance.settings_context, instance.submission);
+        if (imservice) {
-
+            instance.imservice = imservice;
-    ServerContextService *ui_context = server_context_service_new(
+        } else {
-                instance.settings_context,
+            g_warning("Failed to register as an input method");
-                instance.submission);
+        }
    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);
    g_bus_unown_name (owner_id);
--- a/src/style.rs
+++ b/src/style.rs
@ -16,13 +16,12 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.Free
 */
-/*! CSS data loading. */
+/*! CSS data loading */
 use std::env;
 use ::logging;
 use glib::object::ObjectExt;
-use logging::Warn;
+use util::Warn;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -84,11 +83,7 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
        .map_err(|e| {
            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();
@ -98,13 +93,13 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
        None => GtkTheme {
            name: {
                settings.get_property("gtk-theme-name")
-                    .or_print(logging::Problem::Surprise, "No theme name")
+                    .ok_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")
-                    .or_print(logging::Problem::Surprise, "No settings key")
+                    .ok_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
@ -1,19 +0,0 @@
 #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);
 #endif
--- a/src/submission.rs
+++ b/src/submission.rs
@ -1,100 +1,69 @@
-/*! Managing the state of text input in the application.
+/*! Managing the events belonging to virtual-keyboard interface. */
 * 
 * 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 ::imservice::IMService;
+use ::keyboard::{ KeyState, PressType };
 use ::vkeyboard::VirtualKeyboard;
 /// 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 ::layout::c::LevelKeyboard;
    use ::vkeyboard::c::ZwpVirtualKeyboardV1;
    // The following defined in C
    /// ServerContextService*
    #[repr(transparent)]
-    pub struct UIManager(*const c_void);
+    #[derive(Clone, Copy)]
-
+    pub struct ZwpVirtualKeyboardV1(*const c_void);
    /// EekboardContextService*
    #[repr(transparent)]
    pub struct StateManager(*const c_void);
    #[no_mangle]
-    pub extern "C"
+    extern "C" {
-    fn submission_new(
+        /// Checks if point falls within bounds,
-        im: *mut InputMethod,
+        /// which are relative to origin and rotated by angle (I think)
-        vk: ZwpVirtualKeyboardV1,
+        pub fn eek_virtual_keyboard_v1_key(
-        state_manager: *const StateManager
+            virtual_keyboard: ZwpVirtualKeyboardV1,
-    ) -> *mut Submission {
+            timestamp: u32,
-        let imservice = if im.is_null() {
+            keycode: u32,
-            None
+            press: u32,
-        } else {
+        );
            Some(IMService::new(im, state_manager))
        };
        // TODO: add vkeyboard too
        Box::<Submission>::into_raw(Box::new(
            Submission {
                imservice,
                virtual_keyboard: VirtualKeyboard(vk),
            }
        ))
    }
    /// 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) {
        if submission.is_null() {
            panic!("Null submission pointer");
        }
        let submission: &mut Submission = unsafe { &mut *submission };
        submission.virtual_keyboard.update_keymap(keyboard);
    }
 }
 #[derive(Clone, Copy)]
 pub struct Timestamp(pub u32);
-pub struct Submission {
+/// Layout-independent backend. TODO: Have one instance per program or seat
-    // used by C callbacks internally, TODO: make use with virtual keyboard
+pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);
-    #[allow(dead_code)]
+
-    imservice: Option<Box<IMService>>,
+impl VirtualKeyboard {
-    pub virtual_keyboard: VirtualKeyboard,
+    // TODO: split out keyboard state management
    pub fn switch(
        &self,
        key: &mut KeyState,
        action: PressType,
        timestamp: Timestamp,
    ) {
        key.pressed = action.clone();
        let keycodes_count = key.keycodes.len();
        for keycode in key.keycodes.iter() {
            let keycode = keycode - 8;
            match (&key.pressed, keycodes_count) {
                // Pressing a key made out of a single keycode is simple:
                // press on press, release on release.
                (_, 1) => unsafe {
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, action.clone() as u32
                    );
                },
                // A key made of multiple keycodes
                // has to submit them one after the other
                (PressType::Pressed, _) => unsafe {
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, PressType::Pressed as u32
                    );
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, PressType::Released as u32
                    );
                },
                // Design choice here: submit multiple all at press time
                // and do nothing at release time
                (PressType::Released, _) => {},
            }
        }
    }
 }
--- a/src/tests.rs
+++ b/src/tests.rs
@ -1,22 +1,17 @@
 /*! Testing functionality */
 use ::data::Layout;
 use ::logging;
 use xkbcommon::xkb;
 use ::util::WarningHandler;
 pub struct CountAndPrint(u32);
-impl logging::Handler for CountAndPrint {
+impl WarningHandler for CountAndPrint {
-    fn handle(&mut self, level: logging::Level, warning: &str) {
+    fn handle(&mut self, warning: &str) {
-        use logging::Level::*;
+        self.0 = self.0 + 1;
-        match level {
+        println!("{}", warning);
            Panic | Bug | Error | Warning | Surprise => {
                self.0 += 1;
            },
            _ => {}
        }
        logging::Print{}.handle(level, warning)
    }
 }
@ -39,7 +34,7 @@ fn check_layout(layout: Layout) {
    let (layout, handler) = layout.build(handler);
    if handler.0 > 0 {
-        println!("{} problems while parsing layout", handler.0)
+        println!("{} mistakes in layout", handler.0)
    }
    let layout = layout.expect("layout broken");
@ -61,8 +56,8 @@ fn check_layout(layout: Layout) {
    // "Press" each button with keysyms
    for view in layout.views.values() {
-        for (_y, row) in &view.get_rows() {
+        for row in &view.rows {
-            for (_x, button) in &row.buttons {
+            for button in &row.buttons {
                let keystate = button.state.borrow();
                for keycode in &keystate.keycodes {
                    match state.key_get_one_sym(*keycode) {
--- a/src/util.rs
+++ b/src/util.rs
@ -2,8 +2,6 @@
 use std::collections::HashMap;
 use std::rc::Rc;
 use ::float_ord::FloatOrd;
 use std::borrow::Borrow;
 use std::hash::{ Hash, Hasher };
 use std::iter::FromIterator;
@ -21,7 +19,6 @@ pub mod c {
    use std::borrow::ToOwned;
    // The lifetime on input limits the existence of the result
    pub fn as_str(s: &*const c_char) -> Result<Option<&str>, Utf8Error> {
        if s.is_null() {
            Ok(None)
@ -145,16 +142,6 @@ pub fn hash_map_map<K, V, F, K1, V1>(map: HashMap<K, V>, mut f: F)
    )
 }
 pub fn find_max_double<T, I, F>(iterator: I, get: F)
    -> f64
    where I: Iterator<Item=T>,
        F: Fn(&T) -> f64
 {
    iterator.map(|value| FloatOrd(get(&value)))
        .max().unwrap_or(FloatOrd(0f64))
        .0
 }
 /// Compares pointers but not internal values of Rc
 pub struct Pointer<T>(pub Rc<T>);
@ -190,6 +177,22 @@ impl<T> Borrow<Rc<T>> for Pointer<T> {
    }
 }
 /// Sugar for logging errors in results
 pub trait Warn {
    type Value;
    fn ok_warn(self, msg: &str) -> Option<Self::Value>;
 }
 impl<T, E: std::error::Error> Warn for Result<T, E> {
    type Value = T;
    fn ok_warn(self, msg: &str) -> Option<T> {
        self.map_err(|e| {
            eprintln!("{}: {}", msg, e);
            e
        }).ok()
    }
 }
 pub trait WarningHandler {
    /// Handle a warning
    fn handle(&mut self, warning: &str);
--- a/src/vkeyboard.rs
+++ b/src/vkeyboard.rs
@ -1,79 +0,0 @@
 /*! Managing the events belonging to virtual-keyboard interface. */
 use ::keyboard::{ KeyCode, PressType };
 use ::layout::c::LevelKeyboard;
 use ::submission::Timestamp;
 /// Gathers stuff defined in C or called by C
 pub mod c {
    use super::*;
    use std::os::raw::c_void;
    #[repr(transparent)]
    #[derive(Clone, Copy)]
    pub struct ZwpVirtualKeyboardV1(*const c_void);
    #[no_mangle]
    extern "C" {
        pub fn eek_virtual_keyboard_v1_key(
            virtual_keyboard: ZwpVirtualKeyboardV1,
            timestamp: u32,
            keycode: u32,
            press: u32,
        );
        pub fn eek_virtual_keyboard_update_keymap(
            virtual_keyboard: ZwpVirtualKeyboardV1,
            keyboard: LevelKeyboard,
        );
    }
 }
 /// Layout-independent backend. TODO: Have one instance per program or seat
 pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);
 impl VirtualKeyboard {
    // TODO: split out keyboard state management
    pub fn switch(
        &self,
        keycodes: &Vec<KeyCode>,
        action: PressType,
        timestamp: Timestamp,
    ) {
        let keycodes_count = keycodes.len();
        for keycode in keycodes.iter() {
            let keycode = keycode - 8;
            match (action, keycodes_count) {
                // Pressing a key made out of a single keycode is simple:
                // press on press, release on release.
                (_, 1) => unsafe {
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, action.clone() as u32
                    );
                },
                // A key made of multiple keycodes
                // has to submit them one after the other
                (PressType::Pressed, _) => unsafe {
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, PressType::Pressed as u32
                    );
                    c::eek_virtual_keyboard_v1_key(
                        self.0, timestamp.0, keycode, PressType::Released as u32
                    );
                },
                // Design choice here: submit multiple all at press time
                // and do nothing at release time
                (PressType::Released, _) => {},
            }
        }
    }
    pub fn update_keymap(&self, keyboard: LevelKeyboard) {
        unsafe {
            c::eek_virtual_keyboard_update_keymap(
                self.0,
                keyboard,
            );
        }
    }
 }
--- a/src/wayland.c
+++ b/src/wayland.c
@ -1,5 +1,3 @@
 #include "eek/eek-keyboard.h"
 #include "wayland.h"
 struct squeek_wayland *squeek_wayland = NULL;
@ -13,13 +11,6 @@ eek_virtual_keyboard_v1_key(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard
    zwp_virtual_keyboard_v1_key(zwp_virtual_keyboard_v1, time, key, state);
 }
 void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, const LevelKeyboard *keyboard) {
    zwp_virtual_keyboard_v1_keymap(zwp_virtual_keyboard_v1,
        WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
        keyboard->keymap_fd, keyboard->keymap_len);
 }
 int squeek_output_add_listener(struct wl_output *wl_output,
                                const struct wl_output_listener *listener, void *data) {
    return wl_output_add_listener(wl_output, listener, data);
--- a/tests/entry.py
+++ b/tests/entry.py
@ -0,0 +1,41 @@
 #!/usr/bin/env python3
 import gi
 import sys
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 class App(Gtk.Application):
    purposes = [
        ("Free form", Gtk.InputPurpose.FREE_FORM),
        ("Alphabetical", Gtk.InputPurpose.ALPHA),
        ("Digits", Gtk.InputPurpose.DIGITS),
        ("Number", Gtk.InputPurpose.NUMBER),
        ("Phone", Gtk.InputPurpose.PHONE),
        ("URL", Gtk.InputPurpose.URL),
        ("E-mail", Gtk.InputPurpose.EMAIL),
        ("Name", Gtk.InputPurpose.NAME),
        ("Password", Gtk.InputPurpose.PASSWORD),
        ("PIN", Gtk.InputPurpose.PIN)
    ]
    def do_activate(self):
        w = Gtk.ApplicationWindow(application=self)
        grid = Gtk.Grid(orientation='vertical', column_spacing=8, row_spacing=8)
        i = 0
        for text, purpose in self.purposes:
            l = Gtk.Label(label=text)
            e = Gtk.Entry(hexpand=True)
            e.set_input_purpose(purpose)
            grid.attach(l, 0, i, 1, 1)
            grid.attach(e, 1, i, 1, 1)
            i += 1
        w.add(grid)
        w.show_all()
 app = App()
 app.run(sys.argv)
--- a/tests/layout.yaml
+++ b/tests/layout.yaml
@ -1,9 +1,15 @@
 ---
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 views:
    base:
        - "test"
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
 buttons:
    test:
--- a/tests/layout2.yaml
+++ b/tests/layout2.yaml
@ -1,5 +1,11 @@
 ---
 # missing views
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
--- a/tests/layout3.yaml
+++ b/tests/layout3.yaml
@ -1,9 +1,15 @@
 ---
 # extra field
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 views:
    base:
        - "test"
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
 bad_field: false
--- a/tests/layout_key1.yaml
+++ b/tests/layout_key1.yaml
@ -1,10 +1,16 @@
 ---
 # punctuation
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 views:
    base:
        - "."
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
 buttons:
    ".":
--- a/tests/layout_key2.yaml
+++ b/tests/layout_key2.yaml
@ -1,10 +1,16 @@
 ---
 # punctuation
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 views:
    base:
        - "å"
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
 buttons:
    å:
--- a/tests/layout_key3.yaml
+++ b/tests/layout_key3.yaml
@ -1,8 +1,14 @@
 ---
 # punctuation
 bounds:
    x: 0
    y: 0
    width: 0
    height: 0
 views:
    base:
        - "か゚" # 2 codepoints
 outlines:
-    default: { width: 0, height: 0 }
+    default:
        bounds: { x: 0, y: 0, width: 0, height: 0 }
--- a/tests/layout_margins.yaml
+++ b/tests/layout_margins.yaml
@ -1,9 +0,0 @@
 ---
 # Margins present
 margins: { top: 1, side: 2, bottom: 3 }
 views:
    base:
        - "test"
 outlines:
    default: { width: 1, height: 1 }
--- a/tests/layout_position.yaml
+++ b/tests/layout_position.yaml
@ -1,9 +0,0 @@
 ---
 # Margins present
 margins: { top: 1, side: 2, bottom: 3 }
 views:
    base:
        - "test"
 outlines:
    default: { width: 1, height: 1 }
--- a/tests/meson.build
+++ b/tests/meson.build
@ -54,13 +54,10 @@ foreach layout : [
    'es',
    'fi',
    'it',
-    'jp+kana','jp+kana_wide',
+    'jp+kana',
    'no',
    'number',
    'se',
    'terminal',
    'emoji',
 ]
    test(
        'test_layout_' + layout,
--- a/tools/entry.py
+++ b/tools/entry.py
@ -1,63 +0,0 @@
 #!/usr/bin/env python3
 import gi
 import sys
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 try:
    terminal = [("Terminal", Gtk.InputPurpose.TERMINAL)]
 except AttributeError:
    print("Terminal purpose not available on this GTK version", file=sys.stderr)
    terminal = []
 def new_grid(items, set_type):
    grid = Gtk.Grid(orientation='vertical', column_spacing=8, row_spacing=8)
    i = 0
    for text, value in items:
        l = Gtk.Label(label=text)
        e = Gtk.Entry(hexpand=True)
        set_type(e, value)
        grid.attach(l, 0, i, 1, 1)
        grid.attach(e, 1, i, 1, 1)
        i += 1
    return grid
 class App(Gtk.Application):
    purposes = [
        ("Free form", Gtk.InputPurpose.FREE_FORM),
        ("Alphabetical", Gtk.InputPurpose.ALPHA),
        ("Digits", Gtk.InputPurpose.DIGITS),
        ("Number", Gtk.InputPurpose.NUMBER),
        ("Phone", Gtk.InputPurpose.PHONE),
        ("URL", Gtk.InputPurpose.URL),
        ("E-mail", Gtk.InputPurpose.EMAIL),
        ("Name", Gtk.InputPurpose.NAME),
        ("Password", Gtk.InputPurpose.PASSWORD),
        ("PIN", Gtk.InputPurpose.PIN),
    ] + terminal
    hints = [
        ("OSK provided", Gtk.InputHints.INHIBIT_OSK)
    ]
    def do_activate(self):
        w = Gtk.ApplicationWindow(application=self)
        notebook = Gtk.Notebook()
        def add_purpose(entry, purpose):
            entry.set_input_purpose(purpose)
        def add_hint(entry, hint):
            entry.set_input_hints(hint)
        purpose_grid = new_grid(self.purposes, add_purpose)
        hint_grid = new_grid(self.hints, add_hint)
        notebook.append_page(purpose_grid, Gtk.Label(label="Purposes"))
        notebook.append_page(hint_grid, Gtk.Label(label="Hints"))
        w.add(notebook)
        w.show_all()
 app = App()
 app.run(sys.argv)
--- a/tools/meson.build
+++ b/tools/meson.build
@ -1,19 +0,0 @@
 entry = configure_file(
    copy: true,
    input: 'entry.py',
    output: 'squeekboard-entry',
    install: true,
    install_dir: bindir,
 )
 test_layout = custom_target('squeekboard-test-layout',
    build_by_default: true,
    # meson doesn't track all inputs, cargo does
    build_always_stale: true,
    output: ['squeekboard-test-layout'],
    console: true,
    command: [cargo_build] + cargo_build_flags
        + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
    install: true,
    install_dir: bindir,
 )
Author	SHA1	Message	Date
Mark Müller	3af10285b7	squeekboard-test-layout: correct dependencies and version for clap argument parsing	2019-12-13 21:37:50 +01:00
Mark Müller	53997abc46	added librust-clap-dev to debian/control	2019-12-08 21:14:56 +01:00
Mark Müller	34765be22e	squeekboard-test-layout: add argument parsing and some more output	2019-12-08 18:29:54 +01:00
`@ -1,2 +1 @@`
	`usr/bin/squeekboard-test-layout /usr/bin`	`usr/bin/squeekboard-test-layout /usr/bin`
	`usr/bin/squeekboard-entry /usr/bin`