build: Avoid MaybeUninit on older Debian

Merge branch 'master' into x11kb
keymaps: Use multiple key maps, each within the limit of what Xorg can accept.
2020-10-03 13:11:17 +00:00 · 2020-10-03 12:34:50 +00:00 · 2020-10-03 12:22:01 +00:00 · 2020-10-01 14:12:15 +00:00 · 2020-09-28 20:37:34 +00:00 · 2020-09-28 20:37:34 +00:00
32 changed files with 466 additions and 1355 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -136,10 +136,7 @@ test:
    - build_meson
  script:
    - apt-get -y build-dep .
-    - apt-get -y install clang-tidy
    - ninja -C _build test
-    - cd _build
-    - clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, --warnings-as-errors=readability-braces-around-statements -extra-arg=-Wno-unknown-warning-option ../src/*.c ../eek/*.c ../eekboard/*.c

 check_release:
  <<: *tags
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4,481 +4,483 @@
 name = "atk"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
 dependencies = [
- "atk-sys",
- "bitflags",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "atk-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "cairo-rs"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
 dependencies = [
- "bitflags",
- "cairo-sys-rs",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "cairo-sys-rs"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
 dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "cc"
-version = "1.0.65"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"

 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
- "bitflags",
- "textwrap",
- "unicode-width",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "dtoa"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"

 [[package]]
 name = "fragile"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"

 [[package]]
 name = "gdk"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
 dependencies = [
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gdk-pixbuf"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
 dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gdk-pixbuf-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
 dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gdk-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
 dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gio"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
 dependencies = [
- "bitflags",
- "fragile",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gio-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "glib"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
 dependencies = [
- "bitflags",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "glib-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
 dependencies = [
- "libc",
- "pkg-config",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gobject-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
 dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gtk"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
 dependencies = [
- "atk",
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "cc",
- "gdk",
- "gdk-pixbuf",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "lazy_static",
- "libc",
- "pango",
- "pango-sys",
+ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gtk-sys"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
 dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"

 [[package]]
 name = "linked-hash-map"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"

 [[package]]
 name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"

 [[package]]
 name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
- "libc",
- "winapi",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "pango"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
 dependencies = [
- "bitflags",
- "glib",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
- "pango-sys",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "pango-sys"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"

 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
- "unicode-xid",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "quote"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex"
 version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"

 [[package]]
 name = "rs"
 version = "0.1.0"
 dependencies = [
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "clap",
- "gdk",
- "gio",
- "glib",
- "glib-sys",
- "gtk",
- "gtk-sys",
- "maplit",
- "regex",
- "serde",
- "serde_yaml",
- "xkbcommon",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
 dependencies = [
- "serde_derive",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_yaml"
-version = "0.8.14"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
 dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde",
- "yaml-rust",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"

 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

 [[package]]
 name = "winapi"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
 dependencies = [
- "libc",
- "memmap",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "yaml-rust"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
 dependencies = [
- "linked-hash-map",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
+
+[metadata]
+"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
+"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
+"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
+"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
+"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
+"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
+"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
+"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
+"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
+"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
+"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
+"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
+"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
+"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
+"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
+"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
+"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
+"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+"checksum yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -1,89 +0,0 @@
---
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -21,7 +21,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   , \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -21,7 +21,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # % & - _ + ( ) ß"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   , \" ' : = < >  BackSpace"
        - "show_letters preferences         space        , . Return"
    symbols:
        - "~ ` ´  · © ® ÷ × ¶"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -1,89 +0,0 @@
---
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -1,92 +0,0 @@
-# Friulian layout created by Fabio Tomat
-# 14 october 2020
---
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 99.67, 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_eschars preferences         space        , . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        “ ” Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! =  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
-    eschars:
-        - "â ê î ô û Â Ê Î Ô Û"
-        - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers   ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ  BackSpace"
-        - "show_letters show_eschars preferences         space        ᶠ . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "àê"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/terminal_wide.yaml
+++ b/data/keyboards/terminal_wide.yaml
@ -1,211 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
-    special:   { width: 54,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
-    upper:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
-    numbers:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "τ=\\"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    EscSmall:
-        outline: "small"
-        keysym: "Escape"
-        label: "Esc"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Break:
-        outline: "action"
-        keysym: "Break"
-    Home:
-        outline: "small"
-        keysym: "Home"
-    End:
-        outline: "small"
-        keysym: "End"
-    PgUp:
-        outline: "small"
-        keysym: "Page_Up"
-    PgDn:
-        outline: "small"
-        keysym: "Page_Down"
-    "↑":
-        outline: "small"
-        keysym: "Up"
-    "↓":
-        outline: "small"
-        keysym: "Down"
-    "←":
-        outline: "small"
-        keysym: "Left"
-    "→":
-        outline: "small"
-        keysym: "Right"
-    Up:
-        label: "↑"
-        outline: "action"
-        keysym: "Up"
-    Left:
-        label: "←"
-        outline: "action"
-        keysym: "Left"
-    Down:
-        label: "↓"
-        outline: "action"
-        keysym: "Down"
-    Right:
-        label: "→"
-        outline: "action"
-        keysym: "Right"
-    Ctrl:
-        modifier: "Control"
-        outline: "small"
-        label: "Ctrl"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"
--- a/data/langs/fur-IT.txt
+++ b/data/langs/fur-IT.txt
@ -1,18 +0,0 @@
-be Belgjic
-br Brasilian
-de Todesc
-dk Danês
-es Spagnûl
-fi Finlandês
-fr Francês
-it+fur Furlan
-gr Grêc
-it Talian
-jp+kana Gjaponês (Kana)
-no Norvegjês
-pl Polac
-ru Rus
-se Svedês
-terminal Terminâl
-ua Ucrain
-us American (USA)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,102 +1,3 @@
-squeekboard (1.11.1) amber-phone; urgency=medium
-
-  [ Mark Müller ]
-  * keyboard: Fix semicolon in German layout
-  * keyboard: Move semicolon in German layout to numbers view replacing redundant comma key
-
-  [ Dorota Czaplejewicz ]
-  * imservice: Set up UI according to current needs when it shows up
-  * UI: Keep visibility factors in a central place
-  * cargo: Update deps
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 21 Nov 2020 11:08:06 +0000
-
-squeekboard (1.11.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * UI: Delay hiding only when leaving a text field
-  * ui: Cancel hiding delay when activity requested again
-  * Update dependencies
-
-  [ Fabio Tomat ]
-  * Update fur-IT.txt fix typo for Spanish
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 14 Nov 2020 06:46:28 +0000
-
-squeekboard (1.10.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * virtual_keyboard: Fix desynced modifiers state
-  * rust: Fix deprecation warnings
-  * docs: Tutorial syntax cleanups
-  * docs: Reorganize tutorial
-  * build: Error on repeating declarations
-  * keymap: Generate from symbol map, not layout
-  * data: Restore testability of action->keysym conversion
-  * syntax: Let older rustc understand symbolmap's lifetime
-  * debian: Insert a "breaks" for librem5-base < 24
-  * keymap: Keep keymap fd management in one place
-  * vkeyboard: Use a generic slice instead of a vector
-  * tests: Check for missing return in builtin layouts except emoji
-  * keymap: Concentrate special handling of BackSpace, which is implicit in Erase action
-  * keymaps: Use multiple key maps, each within the limit of what Xorg can accept.
-  * build: Avoid MaybeUninit on older Debian
-  * tests: Fix bad field access
-  * cargo: Update dependencies
-
-  [ Guido Günther ]
-  * eekboard-context-service: Return early if schema is unavailable
-  * treewide: Use new style function definitions
-  * build: Enable '-Wold-style-definition' '-Wstrict-prototypes'
-  * build: Enable '-Wunused-function'
-  * eekboard-context-service: Drop EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE
-  * keyboard: Fix warning
-  * layout: Fix warning
-  * gitlab-ci: Enable --Werror
-  * eek-keyboard: Don't ignore return value
-  * build: Enable -Winit-self
-  * build: Enable -Wformat-security
-  * build: Enable -Wmaybe-uninitialized
-  * treewide: Drop redundant declarations
-  * build: Enable -Wredundant-declarations
-  * ServerContextService: Drop GObject boilerplate
-  * build: Enable '-Wformat-nonliteral'
-  * eekboad-context-service: Drop signal class handler
-  * eekboard-context-service: Drop docstrings for inexistent functions
-  * eekboard-context-service: Drop the GObject boilerplate
-  * eekboard-context-service: Drop private struct
-  * server-context-service: Consistenty name self argument 'self'
-  * server-context-service: swap signal arguments
-  * server-context-service: Don't show keyboard when disabled (Closes: #222)
-
-  [ Nazarii Kretovych ]
-  * Add Ukrainian keyboard layout.
-
-  [ Benjamin Schaaf ]
-  * Fix spelling mistakes in doc/hacking.md
-  * Expand the development documentation in the readme
-  * Expand key press detection to the edges of the view's bounding box
-  * Sort layouts by type before sorting by name
-  * Fix leak in level_keyboard_new
-  * Fix leak endlessly adding a resource path to the default theme
-  * Add settings option to popover
-
-  [ Al ]
-  * proposal for belgian layout (copy of fr)
-  * alphabetical order for src/resources.rs tests/meson.build
-
-  [ Arnaud Ferraris ]
-  * eek-gtk-keyboard: use virtual resolution to check arrangement kind
-  * server-context-service: optimize height calculation
-  * keyboards: add wide French layout
-  * keyboards: add wide Belgian layout
-  * keyboards: add wide terminal layout
-
-  [ Fabio Tomat ]
-  * Revert "Add friulian keyboard"
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 19 Oct 2020 14:07:01 +0000
-
 squeekboard (1.9.3) amber-phone; urgency=medium

  [ Björn Tantau ]
--- a/debian/control
+++ b/debian/control
@ -38,8 +38,6 @@ Depends:
 gnome-themes-extra-data,
 ${shlibs:Depends},
 ${misc:Depends},
-Breaks:
- librem5-base (<< 24),
 Description: On-screen keyboard for Wayland
 Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.

--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -113,7 +113,7 @@ User interface modules should:

 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 ([SCI CERT C: EXP19-C](https://wiki.sei.cmu.edu/confluence/display/c/EXP19-C.+Use+braces+for+the+body+of+an+if%2C+for%2C+or+while+statement))
+- skipping brackets `{}` after every `if()`, `else`, and similar

 Bad example:

--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -1,92 +1,55 @@
-A guide to creating layouts
-===========================
+Kareema's guide to creating layouts
+===================================

-This guide is based on the original Kareema's [forum post](https://forums.puri.sm/t/translations-and-virtual-touch-keyboards-tracking-localization/7669/48).
+It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.

-It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections welcome.

-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+**Get one of the existing keyboard layouts**

-## Creating a new layout
-
-Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
-
-### Get one of the existing keyboard layouts
-
-* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* 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:

-
-### Creating the keyboard layout
-
-* To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
-* The correct name of the .yaml file can be found with the command 
-
-```
-gsettings get org.gnome.desktop.input-sources sources
-```
-
-The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
-So for example “de.yaml” would be the correct name for the German keyboard layout.
-
-If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
-
-### Testing the layout
-
-Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
-
-You can also use the `test_layout` tool from the -devel package to check it for errors:
-
-```
-# squeekboard_test_layout ./mylayout.yaml
-Test result: OK
-```
-
-## Contributing your changes
-
-If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project.
-
-Above all, your layout should be working, be tested, not break anything, and make sense.
-
-### Fork your own copy of squeekboard
+**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

-### Edit your keyboard and get it merged
+**Workflow to edit your keyboard and get it merged**

-* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html)
+* 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
-* Your layout **must** be correctly named, and in `data/keyboards/`.
-* Your layout **must** pass the `test_layout` tool with zero problems.
-* Your translation **must** be correctly named, and in `data/langs/`.
-* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
-
-### Get it merged
-
-It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard).
-
 * Push the local changes (to the branch of your fork of squeekboard)
 * Create a merge request for the branch to get your changes merged to the official squeekboard git repository

-If your changes pass automated tests (CI), then the merge request will be reviewed by the maintainers, and you might be asked to change a thing or two.
+**Compile squeekboard**

-## Compiling and running 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)

-If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there.
+**Running squeekboard**

-### 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)
-
-### Run squeekboard
-
-* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
+* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
 * Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
-* 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)
+* 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
@ -104,10 +104,10 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
    return FALSE;
 }

-// Units of virtual pixels size
+// Units of pixel size
 static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
-    if (width < 540) {
+    if (width < 1080) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
@ -119,22 +119,22 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
 {
    EekGtkKeyboardPrivate *priv =
        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    uint32_t scale = (uint32_t)gtk_widget_get_scale_factor(self);
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type(
-                (uint32_t)(allocation->width - allocation->x),
-                (uint32_t)(allocation->height - allocation->y));
+                (uint32_t)(allocation->width - allocation->x) * scale,
+                (uint32_t)(allocation->height - allocation->y) * scale);
    if (priv->layout->arrangement != new_type) {
        priv->layout->arrangement = new_type;
        uint32_t time = gdk_event_get_time(NULL);
        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
    }

-    if (priv->renderer) {
+    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation->width,
                                          allocation->height);
-    }

    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->
        size_allocate (self, allocation);
@ -356,11 +356,10 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    g_autoptr(GError) err = NULL;

-    if (lfb_init(SQUEEKBOARD_APP_ID, &err)) {
+    if (lfb_init(SQUEEKBOARD_APP_ID, &err))
        priv->event = lfb_event_new ("button-pressed");
-    } else {
+    else
        g_warning ("Failed to init libfeedback: %s", err->message);
-    }

    GtkIconTheme *theme = gtk_icon_theme_get_default ();

--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -32,8 +32,13 @@
 #include "eek-keyboard.h"

 /// External linkage for Rust.
-/// The corresponding deinit is implemented in vkeyboard::KeyMap::drop
-struct keymap squeek_key_map_from_str(const char *keymap_str) {
+/// Don't call multiple times on the same copy, just in Drop.
+void eek_key_map_deinit(struct KeyMap *self) {
+    close(self->fd);
+}
+
+/// External linkage for Rust.
+struct KeyMap eek_key_map_from_str(char *keymap_str) {
    struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
    if (!context) {
        g_error("No context created");
@ -42,9 +47,8 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
        XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);

-    if (!keymap) {
+    if (!keymap)
        g_error("Bad keymap:\n%s", keymap_str);
-    }

    xkb_context_unref(context);

@ -53,9 +57,8 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {

    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
-    if (getrandom(r, 6, GRND_NONBLOCK) < 0) {
+    if (getrandom(r, 6, GRND_NONBLOCK) < 0)
        g_error("Failed to get random numbers: %s", strerror(errno));
-    }
    for (unsigned i = 0; i < 6; i++) {
        r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z
        r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good...
@ -78,7 +81,7 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    munmap(ptr, keymap_len);
    free(xkb_keymap_str);
    xkb_keymap_unref(keymap);
-    struct keymap km = {
+    struct KeyMap km = {
        .fd = keymap_fd,
        .fd_len = keymap_len,
    };
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -32,19 +32,20 @@

 G_BEGIN_DECLS

-/// Keymap container for Rust interoperability.
-struct keymap {
-    uint32_t fd; // keymap formatted as XKB string
-    size_t fd_len; // length of the data inside keymap_fd
-};
-
 /// Keyboard state holder
 struct _LevelKeyboard {
    struct squeek_layout *layout; // owned
 // FIXME: This no longer needs to exist, keymap was folded into layout.
+    guint id; // as a key to layout choices
 };
 typedef struct _LevelKeyboard LevelKeyboard;

+/// Keymap container for Rust interoperability.
+struct KeyMap {
+    uint32_t fd; // keymap formatted as XKB string
+    size_t fd_len; // length of the data inside keymap_fd
+};
+
 gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);

 LevelKeyboard*
--- a/eek/layersurface.c
+++ b/eek/layersurface.c
@ -590,32 +590,27 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->height == height && priv->width == width) {
+  if (priv->height == height && priv->width == width)
    return;
-  }

  old_width = priv->width;
  old_height = priv->height;

-  if (width != -1) {
+  if (width != -1)
    priv->width = width;
-  }

-  if (height != -1) {
+  if (height != -1)
    priv->height = height;
-  }

  if (gtk_widget_get_mapped (GTK_WIDGET (self))) {
    zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
  }

-  if (priv->height != old_height) {
+  if (priv->height != old_height)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT]);
-  }

-  if (priv->width != old_width) {
+  if (priv->width != old_width)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH]);
-  }
 }

 /**
@ -637,31 +632,25 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g
  old_right = priv->margin_right;
  old_bottom = priv->margin_bottom;

-  if (old_top == top && old_left == left && old_right == right && old_bottom == bottom) {
+  if (old_top == top && old_left == left && old_right == right && old_bottom == bottom)
    return;
-  }

  priv->margin_top = top;
  priv->margin_left = left;
  priv->margin_right = right;
  priv->margin_bottom = bottom;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_margin(priv->layer_surface, top, right, bottom, left);
-  }

-  if (old_top != top) {
+  if (old_top != top)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_TOP]);
-  }
-  if (old_bottom != bottom) {
+  if (old_bottom != bottom)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_BOTTOM]);
-  }
-  if (old_left != left) {
+  if (old_left != left)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_LEFT]);
-  }
-  if (old_right != right) {
+  if (old_right != right)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_RIGHT]);
-  }
 }

 /**
@ -680,15 +669,13 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)

  old_zone = priv->exclusive_zone;

-  if (old_zone == zone) {
+  if (old_zone == zone)
    return;
-  }

  priv->exclusive_zone = zone;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, zone);
-  }

  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
 }
@ -706,14 +693,13 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->kbd_interactivity == interactivity) {
+    if (priv->kbd_interactivity == interactivity)
    return;
-  }
+
  priv->kbd_interactivity = interactivity;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_keyboard_interactivity (priv->layer_surface, interactivity);
-  }

  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]);
 }
@ -731,7 +717,6 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self)
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->wl_surface) {
+  if (priv->wl_surface)
    wl_surface_commit (priv->wl_surface);
-  }
 }
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.10.0',
+    version: '1.9.3',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -19,8 +19,6 @@ add_project_arguments(
    '-Werror=missing-field-initializers',
    '-Werror=incompatible-pointer-types',
    '-Werror=int-conversion',
-    '-Werror=redundant-decls',
-    '-Werror=parentheses',
    '-Wformat-nonliteral',
    '-Wformat-security',
    '-Winit-self',
--- a/src/data.rs
+++ b/src/data.rs
@ -448,14 +448,14 @@ impl Layout {
                                &mut warning_handler,
                            ))
                        });
-                    layout::Row::new(
-                        add_offsets(
+                    layout::Row {
+                        buttons: add_offsets(
                            buttons,
                            |button| button.size.width,
                        ).collect()
-                    )
+                    }
                });
-                let rows = add_offsets(rows, |row| row.get_size().height)
+                let rows = add_offsets(rows, |row| row.get_height())
                    .collect();
                (
                    name.clone(),
@ -473,8 +473,8 @@ impl Layout {
                name,
                (
                    layout::c::Point {
-                        x: (total_size.width - view.get_size().width) / 2.0,
-                        y: (total_size.height - view.get_size().height) / 2.0,
+                        x: (total_size.width - view.get_width()) / 2.0,
+                        y: (total_size.height - view.get_height()) / 2.0,
                    },
                    view,
                ),
@ -830,7 +830,7 @@ mod tests {
        assert_eq!(
            out.views["base"].1
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -845,7 +845,7 @@ mod tests {
        assert_eq!(
            out.views["base"].1
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -861,7 +861,7 @@ mod tests {
        assert_eq!(
            out.views["base"].1
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .state.borrow()
                .keycodes.len(),
            2
@ -878,7 +878,7 @@ mod tests {
        assert_eq!(
            out.views["base"].1
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .state.borrow()
                .keycodes.len(),
            1
--- a/src/imservice.rs
+++ b/src/imservice.rs
@ -6,7 +6,6 @@
 use std::boxed::Box;
 use std::ffi::CString;
 use std::fmt;
-use std::mem;
 use std::num::Wrapping;
 use std::string::String;

@ -42,8 +41,8 @@ pub mod c {
        pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32);
        pub fn eek_input_method_commit(im: *mut InputMethod, serial: u32);
        fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32);
-        pub fn server_context_service_set_im_active(imservice: *const UIManager, active: u32);
-        pub fn server_context_service_keyboard_release_visibility(imservice: *const UIManager);
+        fn server_context_service_show_keyboard(imservice: *const UIManager);
+        fn server_context_service_hide_keyboard(imservice: *const UIManager);
    }
    
    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
@ -153,8 +152,10 @@ pub mod c {
        };

        if active_changed {
-            imservice.apply_active_to_ui();
            if imservice.current.active {
+                if let Some(ui) = imservice.ui_manager {
+                    unsafe { server_context_service_show_keyboard(ui); }
+                }
                unsafe {
                    eekboard_context_service_set_hint_purpose(
                        imservice.state_manager,
@ -162,6 +163,10 @@ pub mod c {
                        imservice.current.content_purpose.clone() as u32,
                    );
                }
+            } else {
+                if let Some(ui) = imservice.ui_manager {
+                    unsafe { server_context_service_hide_keyboard(ui); }
+                }
            }
        }
    }
@ -180,7 +185,7 @@ pub mod c {
        imservice.current.active = false;

        if let Some(ui) = imservice.ui_manager {
-            unsafe { server_context_service_keyboard_release_visibility(ui); }
+            unsafe { server_context_service_hide_keyboard(ui); }
        }
    }    

@ -335,7 +340,7 @@ pub struct IMService {
    /// Unowned reference. Be careful, it's shared with C at large
    state_manager: *const c::StateManager,
    /// Unowned reference. Be careful, it's shared with C at large
-    ui_manager: Option<*const c::UIManager>,
+    pub ui_manager: Option<*const c::UIManager>,

    pending: IMProtocolState,
    current: IMProtocolState, // turn current into an idiomatic representation?
@ -373,26 +378,6 @@ impl IMService {
        imservice
    }
    
-    pub fn set_ui_manager(&mut self, mut ui_manager: Option<*const c::UIManager>) {
-        mem::swap(&mut self.ui_manager, &mut ui_manager);
-        // Now ui_manager is what was previously self.ui_manager.
-        // If there wasn't any, we need to consider if UI was requested.
-        if let None = ui_manager {
-            self.apply_active_to_ui();
-        }
-    }
-
-    fn apply_active_to_ui(&self) {
-        if let Some(ui) = self.ui_manager {
-            unsafe {
-                c::server_context_service_set_im_active(
-                    ui,
-                    self.is_active() as u32,
-                );
-            }
-        }
-    }
-
    pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
        match self.current.active {
            true => {
--- a/src/layout.rs
+++ b/src/layout.rs
@ -486,63 +486,38 @@ pub struct Button {
 }

 /// The graphical representation of a row of buttons
-#[derive(Clone, Debug)]
 pub struct Row {
-    /// Buttons together with their offset from the left relative to the row.
-    /// ie. the first button always start at 0.
-    buttons: Vec<(f64, Box<Button>)>,
-
-    /// Total size of the row
-    size: Size,
+    /// Buttons together with their offset from the left
+    pub buttons: Vec<(f64, Box<Button>)>,
 }

 impl Row {    
-    pub fn new(buttons: Vec<(f64, Box<Button>)>) -> Row {
-        // Make sure buttons are sorted by offset.
-        debug_assert!({
-            let mut sorted = buttons.clone();
-            sorted.sort_by(|(f1, _), (f2, _)| f1.partial_cmp(f2).unwrap());
-
-            sorted.iter().map(|(f, _)| *f).collect::<Vec<_>>()
-                == buttons.iter().map(|(f, _)| *f).collect::<Vec<_>>()
-        });
-
-        let width = buttons.iter().next_back()
-            .map(|(x_offset, button)| button.size.width + x_offset)
-            .unwrap_or(0.0);
-
-        let height = find_max_double(
-            buttons.iter(),
+    pub fn get_height(&self) -> f64 {
+        find_max_double(
+            self.buttons.iter(),
            |(_offset, button)| button.size.height,
-        );
-
-        Row { buttons, size: Size { width, height } }
+        )
    }

-    pub fn get_size(&self) -> Size {
-        self.size.clone()
-    }
-
-    pub fn get_buttons(&self) -> &Vec<(f64, Box<Button>)> {
-        &self.buttons
+    fn get_width(&self) -> f64 {
+        self.buttons.iter().next_back()
+            .map(|(x_offset, button)| button.size.width + x_offset)
+            .unwrap_or(0.0)
    }

    /// Finds the first button that covers the specified point
    /// relative to row's position's origin
-    fn find_button_by_position(&self, x: f64) -> &(f64, Box<Button>)
+    fn find_button_by_position(&self, point: c::Point)
+        -> Option<(f64, &Box<Button>)>
    {
-        // Buttons are sorted so we can use a binary search to find the clicked
-        // button. Note this doesn't check whether the point is actually within
-        // a button. This is on purpose as we want a click past the left edge of
-        // the left-most button to register as a click.
-        let result = self.buttons.binary_search_by(
-            |&(f, _)| f.partial_cmp(&x).unwrap()
-        );
-
-        let index = result.unwrap_or_else(|r| r);
-        let index = if index > 0 { index - 1 } else { 0 };
-
-        &self.buttons[index]
+        self.buttons.iter().find(|(x_offset, button)| {
+            c::Bounds {
+                x: *x_offset, y: 0.0,
+                width: button.size.width,
+                height: button.size.height,
+            }.contains(&point)
+        })
+            .map(|(x_offset, button)| (*x_offset, button))
    }
 }

@ -553,85 +528,56 @@ pub struct Spacing {
 }

 pub struct View {
-    /// Rows together with their offsets from the top left
-    rows: Vec<(c::Point, Row)>,
-
-    /// Total size of the view
-    size: Size,
+    /// Rows together with their offsets from the top
+    rows: Vec<(f64, Row)>,
 }

 impl View {
    pub fn new(rows: Vec<(f64, Row)>) -> View {
-        // Make sure rows are sorted by offset.
-        debug_assert!({
-            let mut sorted = rows.clone();
-            sorted.sort_by(|(f1, _), (f2, _)| f1.partial_cmp(f2).unwrap());
-
-            sorted.iter().map(|(f, _)| *f).collect::<Vec<_>>()
-                == rows.iter().map(|(f, _)| *f).collect::<Vec<_>>()
-        });
-
-        // No need to call `get_rows()`,
-        // as the biggest row is the most far reaching in both directions
-        // because they are all centered.
-        let width = find_max_double(rows.iter(), |(_offset, row)| row.size.width);
-
-        let height = rows.iter().next_back()
-            .map(|(y_offset, row)| row.size.height + y_offset)
-            .unwrap_or(0.0);
-
-        // Center the rows
-        let rows = rows.into_iter().map(|(y_offset, row)| {(
-                c::Point {
-                    x: (width - row.size.width) / 2.0,
-                    y: y_offset,
-                },
-                row,
-            )}).collect::<Vec<_>>();
-
-        View { rows, size: Size { width, height } }
+        View { rows }
    }
    /// Finds the first button that covers the specified point
    /// relative to view's position's origin
    fn find_button_by_position(&self, point: c::Point)
        -> Option<ButtonPlace>
    {
-        // Only test bounds of the view here, letting rows/column search extend
-        // to the edges of these bounds.
-        let bounds = c::Bounds {
-            x: 0.0,
+        self.get_rows().iter().find_map(|(row_offset, row)| {
+            // make point relative to the inside of the row
+            row.find_button_by_position({
+                c::Point { x: point.x, y: point.y } - row_offset
+            }).map(|(button_x_offset, button)| ButtonPlace {
+                button,
+                offset: row_offset + c::Point {
+                    x: button_x_offset,
                    y: 0.0,
-            width: self.size.width,
-            height: self.size.height,
-        };
-        if !bounds.contains(&point) {
-            return None;
-        }
-
-        // Rows are sorted so we can use a binary search to find the row.
-        let result = self.rows.binary_search_by(
-            |(f, _)| f.y.partial_cmp(&point.y).unwrap()
-        );
-
-        let index = result.unwrap_or_else(|r| r);
-        let index = if index > 0 { index - 1 } else { 0 };
-
-        let row = &self.rows[index];
-        let button = row.1.find_button_by_position(point.x - row.0.x);
-
-        Some(ButtonPlace {
-            button: &button.1,
-            offset: &row.0 + c::Point { x: button.0, y: 0.0 },
+                },
+            })
        })
    }
    
-    pub fn get_size(&self) -> Size {
-        self.size.clone()
+    pub fn get_width(&self) -> f64 {
+        // No need to call `get_rows()`,
+        // as the biggest row is the most far reaching in both directions
+        // because they are all centered.
+        find_max_double(self.rows.iter(), |(_offset, row)| row.get_width())
+    }
+    
+    pub fn get_height(&self) -> f64 {
+        self.rows.iter().next_back()
+            .map(|(y_offset, row)| row.get_height() + y_offset)
+            .unwrap_or(0.0)
    }
    
    /// Returns positioned rows, with appropriate x offsets (centered)
-    pub fn get_rows(&self) -> &Vec<(c::Point, Row)> {
-        &self.rows
+    pub fn get_rows(&self) -> Vec<(c::Point, &Row)> {
+        let available_width = self.get_width();
+        self.rows.iter().map(|(y_offset, row)| {(
+            c::Point {
+                x: (available_width - row.get_width()) / 2.0,
+                y: *y_offset,
+            },
+            row,
+        )}).collect()
    }

    /// Returns a size which contains all the views
@ -640,11 +586,11 @@ impl View {
        Size {
            height: find_max_double(
                views.iter(),
-                |view| view.size.height,
+                |view| view.get_height(),
            ),
            width: find_max_double(
                views.iter(),
-                |view| view.size.width,
+                |view| view.get_width(),
            ),
        }
    }
@ -792,7 +738,7 @@ impl Layout {
        where F: FnMut(c::Point, &Box<Button>)
    {
        let (view_offset, view) = self.get_current_view_position();
-        for (row_offset, row) in view.get_rows() {
+        for (row_offset, row) in &view.get_rows() {
            for (x_offset, button) in &row.buttons {
                let offset = view_offset
                    + row_offset.clone()
@ -805,7 +751,7 @@ impl Layout {
    pub fn get_locked_keys(&self) -> Vec<Rc<RefCell<KeyState>>> {
        let mut out = Vec::new();
        let view = self.get_current_view();
-        for (_, row) in view.get_rows() {
+        for (_, row) in &view.get_rows() {
            for (_, button) in &row.buttons {
                let locked = {
                    let state = RefCell::borrow(&button.state).clone();
@ -867,9 +813,13 @@ mod procedures {
            let button = make_button_with_state("1".into(), state);
            let button_ptr = as_ptr(&button);

-            let row = Row::new(vec!((0.1, button)));
+            let row = Row {
+                buttons: vec!((0.1, button)),
+            };

-            let view = View::new(vec!((1.2, row)));
+            let view = View {
+                rows: vec!((1.2, row)),
+            };

            assert_eq!(
                find_key_places(&view, &state_clone.clone()).into_iter()
@ -880,7 +830,9 @@ mod procedures {
                )
            );

-            let view = View::new(vec![]);
+            let view = View {
+                rows: Vec::new(),
+            };
            assert_eq!(
                find_key_places(&view, &state_clone.clone()).is_empty(),
                true
@ -1123,56 +1075,37 @@ mod test {
    
    #[test]
    fn check_centering() {
-        //    A B
+        //    foo
        // ---bar---
        let view = View::new(vec![
            (
                0.0,
-                Row::new(vec![
-                    (
+                Row {
+                    buttons: vec![(
                        0.0,
                        Box::new(Button {
-                            size: Size { width: 5.0, height: 10.0 },
-                            ..*make_button_with_state("A".into(), make_state())
+                            size: Size { width: 10.0, height: 10.0 },
+                            ..*make_button_with_state("foo".into(), make_state())
                        }),
-                    ),
-                    (
-                        5.0,
-                        Box::new(Button {
-                            size: Size { width: 5.0, height: 10.0 },
-                            ..*make_button_with_state("B".into(), make_state())
-                        }),
-                    ),
-                ]),
+                    )]
+                },
            ),
            (
                10.0,
-                Row::new(vec![
-                    (
+                Row {
+                    buttons: vec![(
                        0.0,
                        Box::new(Button {
                            size: Size { width: 30.0, height: 10.0 },
                            ..*make_button_with_state("bar".into(), make_state())
                        }),
-                    ),
-                ]),
+                    )]
+                },
            )
        ]);
        assert!(
            view.find_button_by_position(c::Point { x: 5.0, y: 5.0 })
-                .unwrap().button.name.to_str().unwrap() == "A"
-        );
-        assert!(
-            view.find_button_by_position(c::Point { x: 14.99, y: 5.0 })
-                .unwrap().button.name.to_str().unwrap() == "A"
-        );
-        assert!(
-            view.find_button_by_position(c::Point { x: 15.01, y: 5.0 })
-                .unwrap().button.name.to_str().unwrap() == "B"
-        );
-        assert!(
-            view.find_button_by_position(c::Point { x: 25.0, y: 5.0 })
-                .unwrap().button.name.to_str().unwrap() == "B"
+                .is_none()
        );
    }

@ -1182,13 +1115,15 @@ mod test {
        let view = View::new(vec![
            (
                0.0,
-                Row::new(vec![(
+                Row {
+                    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 {
--- a/src/meson.build
+++ b/src/meson.build
@ -14,7 +14,6 @@ sources = [
  config_h,
  'dbus.c',
  'imservice.c',
-  'popover.c',
  'server-context-service.c',
  'wayland.c',
  '../eek/eek.c',
--- a/src/popover.c
+++ b/src/popover.c
@ -1,69 +0,0 @@
-#include <gio/gio.h>
-
-static void
-call_dbus_cb (GDBusProxy *proxy,
-              GAsyncResult *res,
-              gpointer user_data)
-{
-  g_autoptr (GError) err = NULL;
-  g_autoptr (GVariant) output = NULL;
-
-  output = g_dbus_proxy_call_finish (proxy, res, &err);
-  if (err) {
-    g_warning ("Can't open panel %s", err->message);
-  }
-  g_object_unref (proxy);
-}
-
-static void
-create_dbus_proxy_cb (GObject *source_object, GAsyncResult *res, char *panel)
-{
-  GDBusProxy *proxy;
-  g_autoptr (GError) err = NULL;
-  GVariantBuilder builder;
-  GVariant *params[3];
-  GVariant *array[1];
-
-  proxy = g_dbus_proxy_new_for_bus_finish (res, &err);
-
-  if (err != NULL) {
-    g_warning ("Can't open panel %s: %s", panel, err->message);
-    g_free (panel);
-    return;
-  }
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
-  g_variant_builder_add (&builder, "v", g_variant_new_string (""));
-
-  array[0] = g_variant_new ("v", g_variant_new ("(sav)", panel, &builder));
-
-  params[0] = g_variant_new_string ("launch-panel");
-  params[1] = g_variant_new_array (G_VARIANT_TYPE ("v"), array, 1);
-  params[2] = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
-
-  g_dbus_proxy_call (proxy,
-             "Activate",
-             g_variant_new_tuple (params, 3),
-             G_DBUS_CALL_FLAGS_NONE,
-             -1,
-             NULL,
-             (GAsyncReadyCallback) call_dbus_cb,
-             NULL);
-
-  g_free (panel);
-}
-
-void
-popover_open_settings_panel (char *panel)
-{
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                G_DBUS_PROXY_FLAGS_NONE,
-                NULL,
-                "org.gnome.ControlCenter",
-                "/org/gnome/ControlCenter",
-                "org.gtk.Actions",
-                NULL,
-                (GAsyncReadyCallback) create_dbus_proxy_cb,
-                g_strdup (panel));
-
-}
--- a/src/popover.rs
+++ b/src/popover.rs
@ -3,7 +3,6 @@
 use gio;
 use gtk;
 use std::ffi::CString;
-use std::cmp::Ordering;
 use ::layout::c::{ Bounds, EekGtkKeyboard };
 use ::locale;
 use ::locale::{ OwnedTranslation, Translation, compare_current_locale };
@ -26,15 +25,6 @@ use gtk::WidgetExt;
 use std::io::Write;
 use ::logging::Warn;

-mod c {
-    use std::os::raw::c_char;
-
-    #[no_mangle]
-    extern "C" {
-        pub fn popover_open_settings_panel(panel: *const c_char);
-    }
-}
-
 mod variants {
    use glib;
    use glib::Variant;
@ -138,12 +128,6 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
        xml,
        "
    </section>
-    <section>
-        <item>
-            <attribute name=\"label\" translatable=\"yes\">Keyboard Settings</attribute>
-            <attribute name=\"action\">settings</attribute>
-        </item>
-    </section>
  </menu>
 </interface>"
    ).unwrap();
@ -350,13 +334,8 @@ pub fn show(
        .zip(all_layouts.clone().into_iter())
        .collect();

-    human_names.sort_unstable_by(|(tr_a, layout_a), (tr_b, layout_b)| {
-        // Sort first by layout then name
-        match (layout_a, layout_b) {
-            (LayoutId::Local(_), LayoutId::System { .. }) => Ordering::Greater,
-            (LayoutId::System { .. }, LayoutId::Local(_)) => Ordering::Less,
-            _ => compare_current_locale(&tr_a.0, &tr_b.0)
-        }
+    human_names.sort_unstable_by(|(tr_a, _), (tr_b, _)| {
+        compare_current_locale(&tr_a.0, &tr_b.0)
    });

    // GVariant doesn't natively support `enum`s,
@ -435,14 +414,8 @@ pub fn show(
            menu_inner.popdown();
        });

-        let settings_action = gio::SimpleAction::new("settings", None);
-        settings_action.connect_activate(move |_, _| {
-            unsafe { c::popover_open_settings_panel(CString::new("region").unwrap().as_ptr()) };
-        });
-
        let action_group = gio::SimpleActionGroup::new();
        action_group.add_action(&layout_action);
-        action_group.add_action(&settings_action);

        menu.insert_action_group("popup", Some(&action_group));
    };
--- a/src/resources.rs
+++ b/src/resources.rs
@ -18,14 +18,11 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("br", include_str!("../data/keyboards/br.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
    ("be", include_str!("../data/keyboards/be.yaml")),
-    ("be_wide", include_str!("../data/keyboards/be_wide.yaml")),
    ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
    ("dk", include_str!("../data/keyboards/dk.yaml")),
    ("es", include_str!("../data/keyboards/es.yaml")),
    ("fi", include_str!("../data/keyboards/fi.yaml")),
    ("fr", include_str!("../data/keyboards/fr.yaml")),
-    ("fr_wide", include_str!("../data/keyboards/fr_wide.yaml")),
-    ("it+fur", include_str!("../data/keyboards/it+fur.yaml")),
    ("gr", include_str!("../data/keyboards/gr.yaml")),
    ("it", include_str!("../data/keyboards/it.yaml")),
    ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")),
@ -39,7 +36,6 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("ua", include_str!("../data/keyboards/ua.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
-    ("terminal_wide", include_str!("../data/keyboards/terminal_wide.yaml")),
    // Overlays
    ("emoji", include_str!("../data/keyboards/emoji.yaml")),
 ];
@ -76,7 +72,6 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
    ("de-DE", include_str!("../data/langs/de-DE.txt")),
    ("en-US", include_str!("../data/langs/en-US.txt")),
    ("es-ES", include_str!("../data/langs/es-ES.txt")),
-    ("fur-IT", include_str!("../data/langs/fur-IT.txt")),
    ("ja-JP", include_str!("../data/langs/ja-JP.txt")),
    ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
    ("ru-RU", include_str!("../data/langs/ru-RU.txt")),
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -46,7 +46,6 @@ struct _ServerContextService {

    gboolean visible;
    gboolean enabled;
-    gboolean im_active;
    PhoshLayerSurface *window;
    GtkWidget *widget; // nullable
    guint hiding;
@ -86,20 +85,13 @@ on_notify_unmap (ServerContextService *self, GtkWidget *widget)
 }

 static uint32_t
-calculate_height(int32_t width, GdkRectangle *geometry)
+calculate_height(int32_t width)
 {
-    uint32_t height;
-    if (geometry->width > geometry->height) {
-        // 1:5 ratio works fine on lanscape mode, and makes sure there's
-        // room left for the app window
-        height = width / 5;
-    } else {
-        if (width < 540 && width > 0) {
+    uint32_t height = 180;
+    if (width < 360 && width > 0) {
        height = ((unsigned)width * 7 / 12); // to match 360×210
-        } else {
-            // Here we switch to wide layout, less height needed
-            height = ((unsigned)width * 7 / 22);
-        }
+    } else if (width < 540) {
+        height = 180 + (540 - (unsigned)width) * 30 / 180; // smooth transition
    }
    return height;
 }
@ -107,10 +99,6 @@ calculate_height(int32_t width, GdkRectangle *geometry)
 static void
 on_surface_configure(ServerContextService *self, PhoshLayerSurface *surface)
 {
-    GdkDisplay *display = NULL;
-    GdkWindow *window = NULL;
-    GdkMonitor *monitor = NULL;
-    GdkRectangle geometry;
    gint width;
    gint height;

@ -122,27 +110,11 @@ on_surface_configure(ServerContextService *self, PhoshLayerSurface *surface)
                 "configured-height", &height,
                 NULL);

-    // In order to improve height calculation, we need the monitor geometry so
-    // we can use different algorithms for portrait and landscape mode.
-    // Note: this is a temporary fix until the size manager is complete.
-    display = gdk_display_get_default ();
-    if (display) {
-        window = gtk_widget_get_window (GTK_WIDGET (surface));
-    }
-    if (window) {
-        monitor = gdk_display_get_monitor_at_window (display, window);
-    }
-    if (monitor) {
-        gdk_monitor_get_geometry (monitor, &geometry);
-    } else {
-        geometry.width = geometry.height = 0;
-    }
-
    // When the geometry event comes after surface.configure,
    // this entire height calculation does nothing.
    // guint desired_height = squeek_uiman_get_perceptual_height(context->manager);
    // Temporarily use old method, until the size manager is complete.
-    guint desired_height = calculate_height(width, &geometry);
+    guint desired_height = calculate_height(width);

    guint configured_height = (guint)height;
    // if height was already requested once but a different one was given
@ -163,9 +135,8 @@ on_surface_configure(ServerContextService *self, PhoshLayerSurface *surface)
 static void
 make_window (ServerContextService *self)
 {
-    if (self->window) {
+    if (self->window)
        g_error("Window already present");
-    }

    struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs);
    squeek_uiman_set_output(self->manager, output);
@ -227,15 +198,31 @@ make_widget (ServerContextService *self)
    gtk_widget_show_all(self->widget);
 }

+static gboolean
+on_hide (ServerContextService *self)
+{
+    gtk_widget_hide (GTK_WIDGET(self->window));
+    self->hiding = 0;
+
+    return G_SOURCE_REMOVE;
+}
+
 static void
 server_context_service_real_show_keyboard (ServerContextService *self)
 {
-    if (!self->window) {
+    if (!self->enabled)
+        return;
+
+    if (self->hiding) {
+	    g_source_remove (self->hiding);
+	    self->hiding = 0;
+    }
+
+    if (!self->window)
        make_window (self);
-    }
-    if (!self->widget) {
+    if (!self->widget)
        make_widget (self);
-    }
+
    self->visible = TRUE;
    gtk_widget_show (GTK_WIDGET(self->window));
 }
@ -243,29 +230,17 @@ server_context_service_real_show_keyboard (ServerContextService *self)
 static void
 server_context_service_real_hide_keyboard (ServerContextService *self)
 {
-    gtk_widget_hide (GTK_WIDGET(self->window));
+    if (!self->hiding)
+        self->hiding = g_timeout_add (200, (GSourceFunc) on_hide, self);
+
    self->visible = FALSE;
 }

-static gboolean
-on_hide (ServerContextService *self)
-{
-    server_context_service_real_hide_keyboard(self);
-    self->hiding = 0;
-
-    return G_SOURCE_REMOVE;
-}
-
 void
 server_context_service_show_keyboard (ServerContextService *self)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));

-    if (self->hiding) {
-        g_source_remove (self->hiding);
-        self->hiding = 0;
-    }
-
    if (!self->visible) {
        server_context_service_real_show_keyboard (self);
    }
@ -281,22 +256,6 @@ server_context_service_hide_keyboard (ServerContextService *self)
    }
 }

-/// Meant for use by the input-method handler:
-/// the visible keyboard is no longer needed.
-/// The implementation will delay it slightly,
-/// because the release may be due to switching from one text field to another.
-/// In this case, the user doesn't really need the keyboard surface
-/// to disappear completely.
-void
-server_context_service_keyboard_release_visibility (ServerContextService *self)
-{
-    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
-
-    if (!self->hiding && self->visible) {
-        self->hiding = g_timeout_add (200, (GSourceFunc) on_hide, self);
-    }
-}
-
 static void
 server_context_service_set_property (GObject      *object,
                                     guint         prop_id,
@ -417,27 +376,17 @@ server_context_service_new (EekboardContextService *self, struct submission *sub
    return ui;
 }

-void
-server_context_service_update_visible (ServerContextService *self, gboolean delay) {
-    if (self->enabled && self->im_active) {
-        server_context_service_show_keyboard(self);
-    } else if (delay) {
-        server_context_service_keyboard_release_visibility(self);
-    } else {
-        server_context_service_hide_keyboard(self);
-    }
-}
-
 void
 server_context_service_set_enabled (ServerContextService *self, gboolean enabled)
 {
    g_return_if_fail (SERVER_IS_CONTEXT_SERVICE (self));
-    self->enabled = enabled;
-    server_context_service_update_visible(self, FALSE);
-}

-void
-server_context_service_set_im_active(ServerContextService *self, uint32_t active) {
-    self->im_active = active;
-    server_context_service_update_visible(self, TRUE);
+    if (enabled == self->enabled)
+        return;
+
+    self->enabled = enabled;
+    if (self->enabled)
+        server_context_service_show_keyboard (self);
+    else
+        server_context_service_hide_keyboard (self);
 }
--- a/src/server-main.c
+++ b/src/server-main.c
@ -213,13 +213,12 @@ main (int argc, char **argv)
    // dbus is not strictly necessary for the useful operation
    // if text-input is used, as it can bring the keyboard in and out
    GBusType bus_type;
-    if (opt_system) {
+    if (opt_system)
        bus_type = G_BUS_TYPE_SYSTEM;
-    } else if (opt_address) {
+    else if (opt_address)
        bus_type = G_BUS_TYPE_NONE;
-    } else {
+    else
        bus_type = G_BUS_TYPE_SESSION;
-    }

    GDBusConnection *connection = NULL;
    GError *error = NULL;
--- a/src/submission.rs
+++ b/src/submission.rs
@ -84,11 +84,11 @@ pub mod c {
        }
        let submission: &mut Submission = unsafe { &mut *submission };
        if let Some(ref mut imservice) = &mut submission.imservice {
-            imservice.set_ui_manager(if ui_manager.is_null() {
+            imservice.ui_manager = if ui_manager.is_null() {
                None
            } else {
                Some(ui_manager)
-            })
+            }
        };
    }

--- a/src/tests.rs
+++ b/src/tests.rs
@ -107,8 +107,8 @@ fn check_layout(layout: Layout, allow_missing_return: bool) {

    // "Press" each button with keysyms
    for (_pos, view) in layout.views.values() {
-        for (_y, row) in view.get_rows() {
-            for (_x, button) in row.get_buttons() {
+        for (_y, row) in &view.get_rows() {
+            for (_x, button) in &row.buttons {
                let keystate = button.state.borrow();
                for keycode in &keystate.keycodes {
                    match xkb_states[keycode.keymap_idx].key_get_one_sym(keycode.code) {
--- a/src/vkeyboard.rs
+++ b/src/vkeyboard.rs
@ -24,7 +24,7 @@ pub mod c {
    impl KeyMap {
        pub fn from_cstr(s: &CStr) -> KeyMap {
            unsafe {
-                squeek_key_map_from_str(s.as_ptr())
+                eek_key_map_from_str(s.as_ptr())
            }
        }
    }
@ -32,16 +32,13 @@ pub mod c {
    impl Drop for KeyMap {
        fn drop(&mut self) {
            unsafe {
-                close(self.fd as u32);
+                eek_key_map_deinit(self as *mut KeyMap);
            }
        }
    }

    #[no_mangle]
    extern "C" {
-        // From libc, to let KeyMap get deallocated.
-        fn close(fd: u32);
-
        pub fn eek_virtual_keyboard_v1_key(
            virtual_keyboard: ZwpVirtualKeyboardV1,
            timestamp: u32,
@ -59,7 +56,8 @@ pub mod c {
            modifiers: u32,
        );
        
-        pub fn squeek_key_map_from_str(keymap_str: *const c_char) -> KeyMap;
+        pub fn eek_key_map_from_str(keymap_str: *const c_char) -> KeyMap;
+        pub fn eek_key_map_deinit(keymap: *mut KeyMap);
    }
 }

--- a/src/wayland.c
+++ b/src/wayland.c
@ -14,7 +14,7 @@ eek_virtual_keyboard_v1_key(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard
 }


-void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, struct keymap *keymap) {
+void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, struct KeyMap *keymap) {
    zwp_virtual_keyboard_v1_keymap(zwp_virtual_keyboard_v1,
        WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
        keymap->fd, keymap->fd_len);
--- a/tests/meson.build
+++ b/tests/meson.build
@ -50,13 +50,12 @@ endforeach
 foreach layout : [
    'us', 'us_wide',
    'br',
-    'be', 'be_wide',
+    'be',
    'de', 'de_wide',
    'dk',
    'es',
    'fi',
-    'fr', 'fr_wide',
-    'it+fur',
+    'fr',
    'gr',
    'it',
    'jp+kana','jp+kana_wide',
@ -66,7 +65,7 @@ foreach layout : [
    'ru',
    'se',
    'ua',
-    'terminal', 'terminal_wide',
+    'terminal',
    
    'emoji',
 ]
Author	SHA1	Message	Date
Dorota Czaplejewicz	523caa99c5	build: Avoid MaybeUninit on older Debian	2020-10-03 13:11:17 +00:00
Dorota Czaplejewicz	20c44476a3	Merge branch 'master' into x11kb	2020-10-03 12:34:50 +00:00
Dorota Czaplejewicz	e6c136918c	keymaps: Use multiple key maps, each within the limit of what Xorg can accept. Key maps are switched on key press whenever needed.	2020-10-03 12:22:01 +00:00
Dorota Czaplejewicz	c686cf7e81	syntax: Let older rustc understand symbolmap's lifetime	2020-10-01 14:12:15 +00:00
Dorota Czaplejewicz	2959d27ea3	tests: Check for missing return in builtin layouts except emoji	2020-09-28 20:37:34 +00:00
Dorota Czaplejewicz	88d3a45083	keymap: Concentrate special handling of BackSpace, which is implicit in Erase action	2020-09-28 20:37:34 +00:00
Dorota Czaplejewicz	edc330d683	data: Restore testability of action->keysym conversion	2020-09-28 20:37:31 +00:00
Dorota Czaplejewicz	44e06bc0dc	keymap: Generate from symbol map, not layout	2020-09-28 17:52:00 +00:00
Dorota Czaplejewicz	8e2e8b0f5f	vkeyboard: Use a generic slice instead of a vector	2020-09-28 17:36:59 +00:00
Dorota Czaplejewicz	fea4ea7392	keymap: Make acceptable by Xwayland Xwayland is more strict about accepting key maps than Wayland, and it also fails silently. Instead of fixing the other parts of the stack to reshape accepted Wayland key maps into acceptable Xorg key maps, this patch makes Squeekboard serve the maximum compatibility version in the first place. Compatibility not actually guaranteed, that's purely observational. Layouts with many characters (above 240) may lose some characters. This is again due to Xwayland accepting stricter layouts than Wayland.	2020-09-25 09:12:01 +00:00