input_method: Hide when input provided by application

input_method: Add on_screen_input_provided hint
input_method: Print misunderstood flags
2019-12-19 12:46:09 +00:00 · 2019-12-19 12:25:32 +00:00 · 2019-12-19 12:24:07 +00:00
59 changed files with 565 additions and 1448 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -14,16 +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-recommonmark python3-sphinx
      - ./doc/build.sh _build
 build_meson:
  <<: *tags
@ -33,33 +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:
        - 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:
        - apt-get -y build-dep .
        - apt-get -y install devscripts
        - debuild -i -us -uc -b
        - cp ../*.deb .
@ -79,5 +53,4 @@ test:
  needs:
    - build_meson
  script:
    - apt-get -y build-dep .
    - ninja -C _build test
--- a/Cargo.lock
+++ b/Cargo.lock
@ -5,7 +5,7 @@ name = "aho-corasick"
 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]]
@ -23,17 +23,16 @@ 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 = "atty"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -51,7 +50,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]]
@ -62,14 +61,14 @@ 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]]
@ -78,7 +77,7 @@ version = "2.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -111,7 +110,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)",
 ]
@ -126,7 +125,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]]
@ -137,8 +136,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]]
@ -151,9 +150,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]]
@ -168,7 +167,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]]
@ -178,8 +177,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]]
@ -191,7 +190,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]]
@ -199,8 +198,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]]
@ -209,8 +208,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]]
@ -221,7 +220,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)",
@ -233,7 +232,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)",
 ]
@ -249,17 +248,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]]
 name = "hermit-abi"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -269,7 +260,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]]
@ -284,7 +275,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]]
@ -292,7 +283,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)",
 ]
@ -306,7 +297,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)",
 ]
@ -317,18 +308,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.7"
+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)",
@ -339,7 +330,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -348,15 +339,15 @@ version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "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.13 (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.13"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -375,37 +366,37 @@ 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.7 (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.13 (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.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)",
 ]
@ -416,10 +407,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "1.0.13"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.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)",
 ]
@ -484,7 +475,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)",
 ]
@ -500,11 +491,11 @@ dependencies = [
 "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "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 fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
@ -519,25 +510,24 @@ dependencies = [
 "checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
 "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 hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum libc 0.2.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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
+"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.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
+"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 strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
+"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"
--- a/HACKING.md
+++ b/HACKING.md
@ -25,7 +25,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 +40,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 +62,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 +122,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,11 +1,18 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 bounds: { x: 0, y: 1, width: 540, height: 168 }
 outlines:
-    default: { width: 62, height: 42 }
+    default:
-    default-wide: { width: 62, height: 42 }
+        bounds: { x: 0, y: 0, width: 62, height: 42 }
-    altline: { width: 62, height: 42 }
+    default-wide:
-    wide: { width: 62, height: 42 }
+        bounds: { x: 0, y: 0, width: 62, height: 42 }
-    special: { width: 62, height: 42 }
+    altline:
        bounds: { x: 0, y: 0, width: 62, height: 42 }
    wide:
        bounds: { x: 0, y: 0, width: 62, height: 42 }
    special:
        bounds: { x: 0, y: 0, width: 62, height: 42 }
 views:
    base: # hiragana
--- 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:
--- 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 show_actions      space        preferences Return"
    upper:
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space        period Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' 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/debian/changelog
+++ b/debian/changelog
@ -1,95 +1,3 @@
 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
@ -43,12 +45,9 @@ Description: On-screen keyboard for Wayland
 Package: squeekboard-devel
 Architecture: linux-any
 Depends:
 python3,
 python3-gi,
 ${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,18 +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 ! 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 keyobard 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,53 +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
@ -131,17 +131,14 @@ static void drag(EekGtkKeyboard *self,
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
-                       x, y, eek_renderer_get_transformation(priv->renderer), time,
+                       x, y, eek_renderer_get_transformation(priv->renderer), time, self);
                       priv->keyboard->manager, self);
 }
 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, eek_renderer_get_transformation(priv->renderer), time, self);
                          eek_renderer_get_transformation(priv->renderer), time,
                          priv->keyboard->manager, self);
 }
 static gboolean
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -30,6 +30,7 @@
 #include "config.h"
 #include <glib/gprintf.h>
 #include "eek-enumtypes.h"
 #include "eekboard/eekboard-context-service.h"
 #include "eekboard/key-emitter.h"
 #include "keymap.h"
--- 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
--- 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.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/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
@ -71,8 +71,6 @@ struct _EekboardContextServicePrivate {
    LevelKeyboard *keyboard; // currently used keyboard
    GHashTable *keyboard_hash; // a table of available keyboards, per layout
    char *overlay;
    GSettings *settings;
    uint32_t hint;
    uint32_t purpose;
@ -216,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);
@ -236,9 +232,6 @@ 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:
        ;
    }
@ -269,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;
 }
@ -400,8 +391,6 @@ eekboard_context_service_init (EekboardContextService *self)
        g_warning ("Could not connect to gsettings updates, layout"
                   " changing unavailable");
    }
    self->priv->overlay = NULL;
 }
 /**
@ -474,7 +463,6 @@ eekboard_context_service_destroy (EekboardContextService *context)
    if (context->priv->enabled) {
        eekboard_context_service_disable (context);
    }
    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }
@ -510,14 +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;
 }
--- 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/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;
@ -21,17 +19,17 @@ use ::keyboard::{
 };
 use ::layout;
 use ::layout::ArrangementKind;
 use ::logging::PrintWarnings;
 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::WarningHandler;
+use serde::Deserialize;
 use util::WarningHandler;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -154,6 +152,14 @@ 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>
 {
@ -210,20 +216,21 @@ fn load_layout_data_with_fallback(
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct Layout {
-    #[serde(default)]
+    /// FIXME: deprecate in favor of margins
-    margins: Margins,
+    bounds: Bounds,
    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
@ -264,8 +271,8 @@ enum Action {
 #[derive(Debug, Clone, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct Outline {
-    width: f64,
+    /// FIXME: replace with Size
-    height: f64,
+    bounds: Bounds,
 }
 /// Errors encountered loading the layout into yaml
@ -453,10 +460,10 @@ impl Layout {
                },
                // FIXME: use a dedicated field
                margins: layout::Margins {
-                    top: self.margins.top,
+                    top: self.bounds.x,
-                    left: self.margins.side,
+                    left: self.bounds.y,
-                    bottom: self.margins.bottom,
+                    bottom: 0.0,
-                    right: self.margins.side,
+                    right: self.bounds.y,
                },
            }),
            warning_handler,
@ -642,7 +649,9 @@ fn create_button<H: WarningHandler>(
            warning_handler.handle(
                &format!("No default outline defined! Using 1x1!")
            );
-            Outline { width: 1f64, height: 1f64 }
+            Outline {
                bounds: Bounds { x: 0f64, y: 0f64, width: 1f64, height: 1f64 },
            }
        });
    layout::Button {
@ -650,8 +659,8 @@ fn create_button<H: WarningHandler>(
        outline_name: CString::new(outline_name).expect("Bad outline"),
        // TODO: do layout before creating buttons
        size: layout::Size {
-            width: outline.width,
+            width: outline.bounds.width,
-            height: outline.height,
+            height: outline.bounds.height,
        },
        label: label,
        state: state,
@ -663,14 +672,21 @@ mod tests {
    use super::*;
    use std::error::Error as ErrorTrait;
-    use ::logging::PanicWarn;
+
    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()),
                ),
@ -685,7 +701,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
                        }, 
                    }
                },
            }
        );
@ -835,21 +855,4 @@ mod tests {
            },
        );
    }
    #[test]
    fn test_layout_margins() {
        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
            .unwrap()
            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.margins,
            layout::Margins {
                top: 1.0,
                bottom: 3.0,
                left: 2.0,
                right: 2.0,
            }
        );
    }
 }
--- a/src/imservice.rs
+++ b/src/imservice.rs
@ -102,8 +102,12 @@ pub mod c {
        imservice.pending = IMProtocolState {
            content_hint: {
                ContentHint::from_bits(hint).unwrap_or_else(|| {
-                    eprintln!("Warning: received invalid hint flags");
+                    let out = ContentHint::from_bits_truncate(hint);
-                    ContentHint::NONE
+                    eprintln!(
                        "Warning: received hint flags with unknown bits set: 0x{:x}",
                        hint ^ out.bits(),
                    );
                    out
                })
            },
            content_purpose: {
@ -141,6 +145,16 @@ pub mod c {
    {
        let imservice = check_imservice(imservice, im).unwrap();
        let active_changed = imservice.current.active ^ imservice.pending.active;
        fn is_visible(state: &IMProtocolState) -> bool {
            state.active
                && !state.content_hint.contains(
                    ContentHint::ON_SCREEN_INPUT_PROVIDED
                )
        }
        let visible_changed = is_visible(&imservice.current)
            ^ is_visible(&imservice.pending);
        imservice.serial += Wrapping(1u32);
        imservice.current = imservice.pending.clone();
@ -148,13 +162,18 @@ pub mod c {
            active: imservice.current.active,
            ..IMProtocolState::default()
        };
-        if active_changed {
+
-            if imservice.current.active {
+        if active_changed && imservice.current.active {
            eekboard_context_service_set_hint_purpose(
                imservice.ui_manager,
                imservice.current.content_hint.bits(),
                imservice.current.content_purpose.clone() as u32,
            );
        }
        if visible_changed {
            if is_visible(&imservice.current) {
                eekboard_context_service_show_keyboard(imservice.ui_manager);
                eekboard_context_service_set_hint_purpose(
                    imservice.ui_manager,
                    imservice.current.content_hint.bits(),
                    imservice.current.content_purpose.clone() as u32);
            } else {
                eekboard_context_service_hide_keyboard(imservice.ui_manager);
            }
@ -219,6 +238,7 @@ bitflags!{
        const SENSITIVE_DATA = 0x80;
        const LATIN = 0x100;
        const MULTILINE = 0x200;
        const ON_SCREEN_INPUT_PROVIDED = 0x400;
    }
 }
--- a/src/layout.h
+++ b/src/layout.h
@ -36,7 +36,6 @@ void squeek_layout_free(struct squeek_layout*);
 void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                           struct transformation widget_to_layout,
                           uint32_t timestamp,
                           EekboardContextService *manager,
                           EekGtkKeyboard *ui_keyboard);
 void squeek_layout_release_all_only(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp);
 void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
@ -46,8 +45,7 @@ void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyb
 void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                        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, EekRenderer* renderer, cairo_t     *cr);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
@ -26,7 +26,6 @@ use std::vec::Vec;
 use ::action::Action;
 use ::drawing;
 use ::keyboard::{ KeyState, PressType };
 use ::manager;
 use ::submission::{ Timestamp, VirtualKeyboard };
 use ::util::find_max_double;
@ -100,7 +99,7 @@ pub mod c {
        }
    }
-    /// Translate and then scale
+    /// Scale + translate
    #[repr(C)]
    pub struct Transformation {
        pub origin_x: f64,
@ -109,14 +108,6 @@ pub mod c {
    }
    impl Transformation {
        /// Applies the new transformation after this one
        pub fn chain(self, next: Transformation) -> Transformation {
            Transformation {
                origin_x: self.origin_x + self.scale * next.origin_x,
                origin_y: self.origin_y + self.scale * next.origin_y,
                scale: self.scale * next.scale,
            }
        }
        fn forward(&self, p: Point) -> Point {
            Point {
                x: (p.x - self.origin_x) / self.scale,
@ -204,8 +195,7 @@ pub mod c {
        println!("{:?}", button);
    }
-    /// Positions the layout contents within the available space.
+    /// Positions the layout within the available space
    /// The origin of the transformation is the point inside the margins.
    #[no_mangle]
    pub extern "C"
    fn squeek_layout_calculate_transformation(
@ -214,10 +204,15 @@ pub mod c {
        allocation_height: f64,
    ) -> Transformation {
        let layout = unsafe { &*layout };
-        layout.calculate_transformation(Size {
+        let size = layout.calculate_size();
-            width: allocation_width,
+        let h_scale = allocation_width / size.width;
-            height: allocation_height,
+        let v_scale = allocation_height / size.height;
-        })
+        let scale = if h_scale < v_scale { h_scale } else { v_scale };
        Transformation {
            origin_x: (allocation_width - (scale * size.width)) / 2.0,
            origin_y: (allocation_height - (scale * size.height)) / 2.0,
            scale: scale,
        }
    }
    #[no_mangle]
@ -259,7 +254,6 @@ pub mod c {
            virtual_keyboard: ZwpVirtualKeyboardV1, // TODO: receive a reference to the backend
            widget_to_layout: Transformation,
            time: u32,
            manager: manager::c::Manager,
            ui_keyboard: EekGtkKeyboard,
        ) {
            let time = Timestamp(time);
@ -275,7 +269,6 @@ pub mod c {
                    &widget_to_layout,
                    time,
                    ui_keyboard,
                    manager,
                    key,
                );
            }
@ -347,7 +340,6 @@ pub mod c {
            x_widget: f64, y_widget: f64,
            widget_to_layout: Transformation,
            time: u32,
            manager: manager::c::Manager,
            ui_keyboard: EekGtkKeyboard,
        ) {
            let time = Timestamp(time);
@ -382,7 +374,6 @@ pub mod c {
                            &widget_to_layout,
                            time,
                            ui_keyboard,
                            manager,
                            key,
                        );
                    }
@ -400,7 +391,6 @@ pub mod c {
                        &widget_to_layout,
                        time,
                        ui_keyboard,
                        manager,
                        key,
                    );
                }
@ -437,7 +427,7 @@ pub struct ButtonPlace<'a> {
    offset: c::Point,
 }
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone)]
 pub struct Size {
    pub width: f64,
    pub height: f64,
@ -570,7 +560,6 @@ pub enum ArrangementKind {
    Wide = 1,
 }
 #[derive(Debug, PartialEq)]
 pub struct Margins {
    pub top: f64,
    pub bottom: f64,
@ -724,8 +713,7 @@ impl Layout {
        };
    }
-    /// Calculates size without margins
+    fn calculate_size(&self) -> Size {
    fn calculate_inner_size(&self) -> Size {
        Size {
            height: find_max_double(
                self.views.iter(),
@ -737,39 +725,6 @@ impl Layout {
            ),
        }
    }
    /// Size including margins
    fn calculate_size(&self) -> Size {
        let inner_size = self.calculate_inner_size();
        Size {
            width: self.margins.left + inner_size.width + self.margins.right,
            height: (
                self.margins.top
                + inner_size.height
                + self.margins.bottom
            ),
        }
    }
    pub fn calculate_transformation(
        &self,
        available: Size,
    ) -> c::Transformation {
        let size = self.calculate_size();
        let h_scale = available.width / size.width;
        let v_scale = available.height / size.height;
        let scale = if h_scale < v_scale { h_scale } else { v_scale };
        let outside_margins = c::Transformation {
            origin_x: (available.width - (scale * size.width)) / 2.0,
            origin_y: (available.height - (scale * size.height)) / 2.0,
            scale: scale,
        };
        outside_margins.chain(c::Transformation {
            origin_x: self.margins.left,
            origin_y: self.margins.top,
            scale: 1.0,
        })
    }
 }
 mod procedures {
@ -859,7 +814,6 @@ mod seat {
        widget_to_layout: &c::Transformation,
        time: Timestamp,
        ui_keyboard: c::EekGtkKeyboard,
        manager: manager::c::Manager,
        key: &Rc<RefCell<KeyState>>,
    ) {
        layout.release_key(virtual_keyboard, &mut key.clone(), time);
@ -881,8 +835,7 @@ mod seat {
                };
                ::popover::show(
                    ui_keyboard,
-                    widget_to_layout.reverse_bounds(bounds),
+                    widget_to_layout.reverse_bounds(bounds)
                    manager,
                );
            }
        }
@ -954,58 +907,4 @@ mod test {
                .is_none()
        );
    }
    #[test]
    fn check_bottom_margin() {
        // just one button
        let view = View::new(vec![
            (
                0.0,
                Row {
                    angle: 0,
                    buttons: vec![(
                        0.0,
                        Box::new(Button {
                            size: Size { width: 1.0, height: 1.0 },
                            ..*make_button_with_state("foo".into(), make_state())
                        }),
                    )]
                },
            ),
        ]);
        let layout = Layout {
            current_view: String::new(),
            keymap_str: CString::new("").unwrap(),
            kind: ArrangementKind::Base,
            locked_keys: HashSet::new(),
            pressed_keys: HashSet::new(),
            // Lots of bottom margin
            margins: Margins {
                top: 0.0,
                left: 0.0,
                right: 0.0,
                bottom: 1.0,
            },
            views: hashmap! {
                String::new() => view,
            },
        };
        assert_eq!(
            layout.calculate_inner_size(),
            Size { width: 1.0, height: 1.0 }
        );
        assert_eq!(
            layout.calculate_size(),
            Size { width: 1.0, height: 2.0 }
        );
        // Don't change those values randomly!
        // They take advantage of incidental precise float representation
        // to even be comparable.
        let transformation = layout.calculate_transformation(
            Size { width: 2.0, height: 2.0 }
        );
        assert_eq!(transformation.scale, 1.0);
        assert_eq!(transformation.origin_x, 0.5);
        assert_eq!(transformation.origin_y, 0.0);
    }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@ -24,8 +24,6 @@ mod keyboard;
 mod layout;
 mod locale;
 mod locale_config;
 mod logging;
 mod manager;
 mod outputs;
 mod popover;
 mod resources;
--- a/src/locale.rs
+++ b/src/locale.rs
@ -1,99 +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::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,
 }
 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,120 +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.
 *   It seems more difficult to pass the logger around,
 *   but this may be a solved problem from the area of functional programming.
 * 
 * This library generally aims at the approach in 3.
 * */
 use std::error::Error;
 /// 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,
 }
 /// Sugar for logging errors in results.
 /// Approach 2.
 pub trait Warn {
    type Value;
    fn or_warn(self, msg: &str) -> Option<Self::Value>;
 }
 impl<T, E: Error> Warn for Result<T, E> {
    type Value = T;
    fn or_warn(self, msg: &str) -> Option<T> {
        self.map_err(|e| {
            eprintln!("{}: {}", msg, e);
            e
        }).ok()
    }
 }
 impl<T> Warn for Option<T> {
    type Value = T;
    fn or_warn(self, msg: &str) -> Option<T> {
        self.or_else(|| {
            eprintln!("{}", msg);
            None
        })
    }
 }
 /// A mutable handler for text warnings.
 /// Approach 3.
 pub trait WarningHandler {
    /// Handle a warning
    fn handle(&mut self, warning: &str);
 }
 /// Prints warnings to stderr
 pub struct PrintWarnings;
 impl WarningHandler for PrintWarnings {
    fn handle(&mut self, warning: &str) {
        eprintln!("{}", warning);
    }
 }
 /// Warning handler that will panic at any warning.
 /// Don't use except in tests
 pub struct PanicWarn;
 impl WarningHandler for PanicWarn {
    fn handle(&mut self, warning: &str) {
        panic!("{}", warning);
    }
 }
--- 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
@ -19,11 +19,13 @@ 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',
@ -38,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'),
@ -111,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/popover.rs
+++ b/src/popover.rs
@ -2,12 +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 ::manager;
 use ::resources;
 use gio::ActionMapExt;
@ -18,7 +15,6 @@ use glib::variant::ToVariant;
 use gtk::PopoverExt;
 use gtk::WidgetExt;
 use std::io::Write;
 use ::logging::Warn;
 mod variants {
    use glib;
@ -96,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,
@ -105,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,
            "
@ -114,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();
    }
@ -145,191 +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)))
                    .unwrap_or_else(|e| {
                        eprintln!(
                            "No display name for xkb layout {}: {:?}",
                            name,
                            e,
                        );
                        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_warn("No locale detected")
+        .and_then(|lang| resources::get_layout_names(lang.as_str()));
        .and_then(|lang| {
            resources::get_layout_names(lang.as_str())
                .or_warn(&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,21 +195,16 @@ 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>()
@ -365,20 +212,10 @@ pub fn show(
                            eprintln!("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 => eprintln!("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")),
@ -25,10 +23,6 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("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 +39,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 +49,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 +63,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 +71,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 +86,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/style.rs
+++ b/src/style.rs
@ -16,12 +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 glib::object::ObjectExt;
-use logging::Warn;
+use util::Warn;
 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -83,7 +83,6 @@ 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
@ -94,15 +93,13 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
        None => GtkTheme {
            name: {
                settings.get_property("gtk-theme-name")
-                    // maybe TODO: is this worth a warning?
+                    .ok_warn("No theme name")
                    .or_warn("No theme name")
                    .and_then(|value| value.get::<String>())
                    .unwrap_or(DEFAULT_THEME_NAME.into())
            },
            variant: {
                settings.get_property("gtk-application-prefer-dark-theme")
-                    // maybe TODO: is this worth a warning?
+                    .ok_warn("No settings key")
                    .or_warn("No settings key")
                    .and_then(|value| value.get::<bool>())
                    .and_then(|dark_preferred| match dark_preferred {
                        true => Some("dark".into()),
--- a/src/tests.rs
+++ b/src/tests.rs
@ -3,7 +3,7 @@
 use ::data::Layout;
 use xkbcommon::xkb;
-use ::logging::WarningHandler;
+use ::util::WarningHandler;
 pub struct CountAndPrint(u32);
--- a/src/util.rs
+++ b/src/util.rs
@ -21,7 +21,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)
@ -190,6 +189,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/tests/entry.py
+++ b/tests/entry.py
--- 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
@ -58,9 +58,6 @@ foreach layout : [
    'no',
    'number',
    'se',
    'terminal',
    'emoji',
 ]
    test(
        'test_layout_' + layout,
--- 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
Dorota Czaplejewicz	74af1336e8	input_method: Hide when input provided by application	2019-12-19 12:46:09 +00:00
Dorota Czaplejewicz	88b0afa319	input_method: Add on_screen_input_provided hint	2019-12-19 12:25:32 +00:00
Dorota Czaplejewicz	4d487ed872	input_method: Print misunderstood flags	2019-12-19 12:24:07 +00:00
`@ -1,2 +1 @@`
	`usr/bin/squeekboard-test-layout /usr/bin`	`usr/bin/squeekboard-test-layout /usr/bin`
	`usr/bin/squeekboard-entry /usr/bin`