Release v1.9.2 "Aristotelian physics"

- Swedish - Russian - Danish - French - minor fixes
Update rust deps for release
2020-06-07 14:38:23 +00:00 · 2020-06-01 09:36:36 +00:00 · 2020-05-27 07:14:35 +00:00 · 2020-05-26 18:20:49 +00:00 · 2020-05-26 16:37:14 +02:00 · 2020-05-26 16:22:38 +02:00
35 changed files with 948 additions and 564 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -92,5 +92,5 @@ check_release:
    refs:
      - master
  script:
-    - apt-get install git python3
+    - apt-get -y install git python3
    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,7 +2,7 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -15,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -33,7 +33,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -44,14 +44,14 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (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)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cc"
-version = "1.0.50"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -89,7 +89,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -104,7 +104,7 @@ dependencies = [
 "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -115,7 +115,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -129,7 +129,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -146,7 +146,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -156,7 +156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -169,7 +169,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -177,7 +177,7 @@ name = "glib-sys"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -187,7 +187,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -199,7 +199,7 @@ dependencies = [
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -211,7 +211,7 @@ dependencies = [
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -227,7 +227,7 @@ dependencies = [
 "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -239,12 +239,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.67"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "linked-hash-map"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -262,7 +262,7 @@ name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -276,7 +276,7 @@ dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -287,7 +287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "1.0.9"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -306,10 +306,10 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@ -317,16 +317,16 @@ name = "regex"
 version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "regex-syntax"
-version = "0.6.16"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -345,47 +345,47 @@ dependencies = [
 "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_yaml"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "syn"
-version = "1.0.16"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -444,7 +444,7 @@ name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -453,16 +453,16 @@ name = "yaml-rust"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [metadata]
-"checksum aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec"
+"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 "checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
 "checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "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"
@ -478,22 +478,22 @@ dependencies = [
 "checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
 "checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
 "checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
+"checksum quote 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
 "checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
-"checksum regex-syntax 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
+"checksum serde_yaml 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "16c7a592a1ec97c9c1c68d75b6e537dcbf60c7618e038e7841e00af1d9ccf0c4"
-"checksum syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
+"checksum syn 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
 "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
--- a/README.md
+++ b/README.md
@ -56,4 +56,4 @@ $ src/squeekboard
 Developing
 ----------
-See [`docs/hacking.md`](docs/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -0,0 +1,98 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
    wide: { width: 62, height: 52 }
    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }
 views:
    base:
        - "q w e r t y u i o p å"
        - "a s d f g h j k l ø æ"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences         space        .    Return"
    upper:
        - "Q W E R T Y U I O P Å"
        - "A S D F G H J K L Ø Æ"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space        .    Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' : ; ! ?  BackSpace"
        - "show_letters preferences         space        .    Return"
    symbols:
        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
        outline: "altline"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    ".":
        outline: altline
    space:
        outline: spaceline
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    U00B7:
        text: "·"
    squareroot:
        text: "√"
    Greek_pi:
        text: "π"
    division:
        text: "÷"
    multiply:
        text: "×"
    paragraph:
        text: "¶"
    Greek_tau:
        text: "τ"
    copyright:
        text: "©"
    U00AE:
        text: "®"
    U00A3:
        text: "£"
    EuroSign:
        text: "€"
    U00A5:
        text: "¥"
    asciicircum:
        text: "^"
    degree:
        text: "°"
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -0,0 +1,89 @@
 ---
 outlines:
    default:   { width: 35.33, height: 52 }
    altline:   { width: 52.67, height: 52 }
    wide:      { width: 59,    height: 52 }
    spaceline: { width: 140,   height: 52 }
    special:   { width: 44,    height: 52 }
 views:
    base:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    show_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/ru.yaml
+++ b/data/keyboards/ru.yaml
@ -0,0 +1,94 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 32, height: 52 }
    wide: { width: 57, height: 52 }
    narrow: { width: 26, height: 52 }
    spaceline: { width: 107, height: 52 }
    fill: { width: 159, height: 52 }
    special: { width: 42, height: 52 }
 views:
    base:
        - "й ц у к е н г ш щ з х"
        - "ф ы в а п р о л д ж э"
        - "Shift_L  я ч с м и т ь б ю  BackSpace"
        - "show_numbers preferences    ё  space  ъ  period Return"
    upper:
        - "Й Ц У К Е Н Г Ш Щ З Х"
        - "Ф Ы В А П Р О Л Д Ж Э"
        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ё  space  Ъ  comma Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space_fill   period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space_fill   period Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: show_prefs
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "wide"
        label: "*/="
    period:
        outline: "special"
        text: "."
    comma:
        outline: "special"
        text: ","
    space:
        outline: "spaceline"
        text: " "
    space_fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    ё:
        outline: "narrow"
    Ё:
        outline: "narrow"
    ъ:
        outline: "narrow"
    Ъ:
        outline: "narrow"
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -2,9 +2,10 @@
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
+    wide: { width: 64,  height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 142, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    special: { width: 44, height: 52 }
 views:
    base:
@ -25,7 +26,7 @@ views:
    symbols:
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
@ -37,22 +38,27 @@ buttons:
        outline: "altline"
        icon: "key-shift"
    BackSpace:
-        outline: "altline"
+        outline: altline
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
-        outline: "altline"
+        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        outline: "wide"
        action:
            set_view: "numbers"
-        outline: "altline"
+        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: altline
        label: "123"
    show_letters:
        outline: "wide"
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
@ -60,7 +66,7 @@ buttons:
        outline: "altline"
        label: "*/="
    ".":
-        outline: altline
+        outline: "special"
    space:
        outline: spaceline
        text: " "
@ -156,4 +162,3 @@ buttons:
        text: "["
    bracketright:
        text: "]"
--- a/data/langs/ru-RU.txt
+++ b/data/langs/ru-RU.txt
@ -0,0 +1,11 @@
 de Немецкий
 es Испанский
 fi Финский
 gr Греческий
 it Итальянский
 no Норвежский
 pl Польский
 ru Русский
 se Шведский
 terminal Терминал
 us Английский (США)
--- a/data/meson.build
+++ b/data/meson.build
@ -7,13 +7,20 @@ squeekboard_resources = gnome.compile_resources(
   c_name: 'squeekboard',
 )
 desktopconf = configuration_data()
 desktopconf.set('bindir', bindir)
 desktop_file = 'sm.puri.Squeekboard.desktop'
 i18n.merge_file('desktop',
-    input: desktop_file + '.in',
+    input: configure_file(
      input: desktop_file + '.in.in',
      output: desktop_file + '.in',
      configuration: desktopconf
    ),
    output: desktop_file,
    po_dir: '../po',
    install: true,
-    install_dir: join_paths(datadir, 'applications'),
+    install_dir: desktopdir,
    type: 'desktop'
 )
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -2,7 +2,7 @@
 Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
-Exec=squeekboard
+Exec=@bindir@/squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,53 @@
 squeekboard (1.9.2) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * keyboard: Remove unused code
  * gsettings: Don't crash when unavailable
  * dbus: Don't crash if can't make a connection
  * gsettings: Don't crash on switching when unavailable
  * layout: Split out choice to a struct on its own
  * renderer: Simplify by dropping gobjectness
  * levelkeyboard: Rearrange to make future conversion easier
  * layout: Minor generalizations
  * Remove unused code
  * sizing: Create a standalone UI shape manager
  * sizing: Ignore scaling factor for layout selection
  * CI: Fix typo
  * Update rust deps for release
  [ Andreas Rönnquist ]
  * Swedish keyboard, wide button switching between numbers, symbols and base
  * More fixes of button sizes
  * Folder is doc, not docs
  [ uzanto ]
  * Add new file
  * Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing
  [ Arnaud Ferraris ]
  * keyboards: fr: fix keyboard layout
  * keyboards: fr: make sure the layout fits the screen
  * resources: include French keyboard layout
  * keyboards: fr: improve consistency with other layouts
  * keyboards: fr: improve diacritics layout
  * tests: add french layout
  [ Vlad ]
  * Fresh Russian layout
  [ Jordi Masip ]
  * Removed unused dependency 'libcroco'
  [ Florian Klink ]
  * sm.puri.Squeekboard.desktop: make path to Exec= absolute
  [ Ole Guldberg ]
  * Danish keyboard layout
  * Danish keyboard layout
  * add test for danish layout
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 01 Jun 2020 09:39:12 +0000
 squeekboard (1.9.1) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
--- a/debian/control
+++ b/debian/control
@ -11,7 +11,6 @@ Build-Depends:
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
 libcroco3-dev,
 librust-bitflags-1-dev (>= 1.0),
 librust-clap-2+default-dev (>= 2.32),
 librust-gio+v2-44-dev,
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -41,23 +41,15 @@
 #include "src/layout.h"
 #include "src/submission.h"
 enum {
    PROP_0,
    PROP_LAST
 };
 /* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
   GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif
 typedef struct _EekGtkKeyboardPrivate
 {
-    EekRenderer *renderer;
+    EekRenderer *renderer; // owned, nullable
    EekboardContextService *eekboard_context; // unowned reference
    struct submission *submission; // unowned reference
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
+
    struct squeek_layout_state *layout; // unowned
    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
    GdkEventSequence *sequence; // unowned reference
 } EekGtkKeyboardPrivate;
@ -88,30 +80,58 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);
    if (!priv->keyboard) {
        return FALSE;
    }
    if (!priv->renderer) {
        PangoContext *pcontext = gtk_widget_get_pango_context (self);
-        priv->renderer = eek_renderer_new (priv->keyboard, pcontext);
+        priv->renderer = eek_renderer_new (
                    priv->keyboard,
                    pcontext);
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation.width,
                                          allocation.height);
        eek_renderer_set_scale_factor (priv->renderer,
                                       gtk_widget_get_scale_factor (self));
    }
-    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr);
+
    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
    return FALSE;
 }
 // Units of pixel size
 static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 1080) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
    EekGtkKeyboardPrivate *priv =
        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    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) * scale,
                (uint32_t)(allocation->height - allocation->y) * scale);
    if (priv->layout->arrangement != new_type) {
        priv->layout->arrangement = new_type;
        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout);
    }
    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation->width,
                                          allocation->height);
@ -123,7 +143,9 @@ static void depress(EekGtkKeyboard *self,
                    gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
        return;
    }
    squeek_layout_depress(priv->keyboard->layout,
                          priv->submission,
                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
@ -133,7 +155,10 @@ static void drag(EekGtkKeyboard *self,
                 gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_drag(priv->keyboard->layout,
+    if (!priv->keyboard) {
        return;
    }
    squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                       priv->submission,
                       x, y, eek_renderer_get_transformation(priv->renderer), time,
                       priv->eekboard_context, self);
@ -142,8 +167,10 @@ static void drag(EekGtkKeyboard *self,
 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
-    squeek_layout_release(priv->keyboard->layout,
+        return;
    }
    squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                          priv->submission,
                          eek_renderer_get_transformation(priv->renderer), time,
                          priv->eekboard_context, self);
@ -263,7 +290,7 @@ eek_gtk_keyboard_dispose (GObject *object)
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    if (priv->renderer) {
-        g_object_unref (priv->renderer);
+        eek_renderer_free(priv->renderer);
        priv->renderer = NULL;
        priv->renderer = NULL;
    }
@ -310,26 +337,46 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
    (void)self;
 }
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    EekGtkKeyboard *self) {
    (void)spec;
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
    priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
    if (priv->renderer) {
        eek_renderer_free(priv->renderer);
    }
    priv->renderer = NULL;
    gtk_widget_queue_draw(GTK_WIDGET(self));
 }
 /**
 * eek_gtk_keyboard_new:
 * @keyboard: an #EekKeyboard
 *
 * Create a new #GtkWidget displaying @keyboard.
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice,
+eek_gtk_keyboard_new (EekboardContextService *eekservice,
-                      struct submission *submission)
+                      struct submission *submission,
                      struct squeek_layout_state *layout)
 {
    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
    priv->keyboard = keyboard;
    priv->eekboard_context = eekservice;
    priv->submission = submission;
    priv->layout = layout;
    priv->renderer = NULL;
    g_signal_connect (eekservice,
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
                      ret);
    on_notify_keyboard(G_OBJECT(eekservice), NULL, ret);
    /* TODO: this is how a compound keyboard
     * made out of a layout and a suggestion bar could start.
     * GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
    GtkEntry *fill = GTK_ENTRY(gtk_entry_new());
    gtk_box_pack_start(box, GTK_WIDGET(fill), FALSE, FALSE, 0);
    gtk_box_pack_start(box, GTK_WIDGET(ret), TRUE, TRUE, 0);
    return GTK_WIDGET(box);*/
    return GTK_WIDGET(ret);
 }
 EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    return priv->renderer;
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -31,7 +31,7 @@
 #include "eek/eek-types.h"
 struct submission;
-typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
+struct squeek_layout_state;
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@ -48,7 +48,7 @@ struct _EekGtkKeyboardClass
 };
 GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
-GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard, EekboardContextService *eekservice, struct submission *submission);
+GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -38,10 +38,8 @@ void level_keyboard_free(LevelKeyboard *self) {
 }
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
+level_keyboard_new (struct squeek_layout *layout)
                    enum squeek_arrangement_kind t)
 {
    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
    if (!keyboard) {
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -47,8 +47,7 @@ gchar *             eek_keyboard_get_keymap
                                     (LevelKeyboard *keyboard);
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
+level_keyboard_new (struct squeek_layout *layout);
                    enum squeek_arrangement_kind t);
 void level_keyboard_free(LevelKeyboard *self);
 G_END_DECLS
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -28,27 +28,6 @@
 #include "eek-renderer.h"
 #include "src/style.h"
 enum {
    PROP_0,
    PROP_PCONTEXT,
    PROP_LAST
 };
 typedef struct _EekRendererPrivate
 {
    LevelKeyboard *keyboard; // unowned
    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    gdouble allocation_width;
    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    struct transformation widget_to_layout;
 } EekRendererPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
 /* eek-keyboard-drawing.c */
 static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
@ -138,9 +117,7 @@ eek_render_button (EekRenderer *self,
               gboolean     pressed,
               gboolean     locked)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    GtkStyleContext *ctx = self->button_context;
    GtkStyleContext *ctx = priv->button_context;
    /* Set the name of the button on the widget path, using the name obtained
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
@ -160,7 +137,7 @@ eek_render_button (EekRenderer *self,
    }
    gtk_style_context_add_class(ctx, outline_name);
-    render_button_in_context(priv->scale_factor, cr, ctx, button);
+    render_button_in_context(self->scale_factor, cr, ctx, button);
    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
@ -218,116 +195,42 @@ render_button_label (cairo_t     *cr,
 void
 eek_renderer_render_keyboard (EekRenderer *self,
                              struct submission *submission,
-                                   cairo_t     *cr)
+                                   cairo_t     *cr,
                              LevelKeyboard *keyboard)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    g_return_if_fail (self->allocation_width > 0.0);
-
+    g_return_if_fail (self->allocation_height > 0.0);
    g_return_if_fail (priv->keyboard);
    g_return_if_fail (priv->allocation_width > 0.0);
    g_return_if_fail (priv->allocation_height > 0.0);
    /* Paint the background covering the entire widget area */
-    gtk_render_background (priv->view_context,
+    gtk_render_background (self->view_context,
                           cr,
                           0, 0,
-                           priv->allocation_width, priv->allocation_height);
+                           self->allocation_width, self->allocation_height);
    cairo_save(cr);
-    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+    cairo_translate (cr, self->widget_to_layout.origin_x, self->widget_to_layout.origin_y);
-    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);
+    cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
-    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
+    squeek_draw_layout_base_view(keyboard->layout, self, cr);
-    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr, submission);
+    squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
    cairo_restore (cr);
 }
-static void
+void
-eek_renderer_set_property (GObject      *object,
+eek_renderer_free (EekRenderer        *self)
                           guint         prop_id,
                           const GValue *value,
                           GParamSpec   *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+    if (self->pcontext) {
-            EEK_RENDERER(object));
+        g_object_unref (self->pcontext);
-
+        self->pcontext = NULL;
    switch (prop_id) {
    case PROP_PCONTEXT:
        priv->pcontext = g_value_get_object (value);
        g_object_ref (priv->pcontext);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
-}
+    g_object_unref(self->css_provider);
-
+    g_object_unref(self->view_context);
-static void
+    g_object_unref(self->button_context);
 eek_renderer_get_property (GObject    *object,
                           guint       prop_id,
                           GValue     *value,
                           GParamSpec *pspec)
 {
    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 eek_renderer_dispose (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER (object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    if (priv->keyboard) {
        priv->keyboard = NULL;
    }
    if (priv->pcontext) {
        g_object_unref (priv->pcontext);
        priv->pcontext = NULL;
    }
    // this is where renderer-specific surfaces would be released
-    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
+    free(self);
 }
 static void
 eek_renderer_finalize (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER(object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    g_object_unref(priv->css_provider);
    g_object_unref(priv->view_context);
    g_object_unref(priv->button_context);
    G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
 }
 static void
 eek_renderer_class_init (EekRendererClass *klass)
 {
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;
    gobject_class->set_property = eek_renderer_set_property;
    gobject_class->get_property = eek_renderer_get_property;
    gobject_class->dispose = eek_renderer_dispose;
    gobject_class->finalize = eek_renderer_finalize;
    pspec = g_param_spec_object ("pango-context",
                                 "Pango Context",
                                 "Pango Context",
                                 PANGO_TYPE_CONTEXT,
                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_PCONTEXT,
                                     pspec);
 }
 static GType new_type(char *name) {
    GTypeInfo info = {0};
    info.class_size = sizeof(GtkWidgetClass);
@ -355,81 +258,75 @@ static GType button_type() {
 }
 static void
-eek_renderer_init (EekRenderer *self)
+renderer_init (EekRenderer *self)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    self->pcontext = NULL;
-
+    self->allocation_width = 0.0;
-    priv->keyboard = NULL;
+    self->allocation_height = 0.0;
-    priv->pcontext = NULL;
+    self->scale_factor = 1;
    priv->allocation_width = 0.0;
    priv->allocation_height = 0.0;
    priv->scale_factor = 1;
    GtkIconTheme *theme = gtk_icon_theme_get_default ();
    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
-    priv->css_provider = squeek_load_style();
+    self->css_provider = squeek_load_style();
 }
 EekRenderer *
 eek_renderer_new (LevelKeyboard  *keyboard,
                  PangoContext *pcontext)
 {
-    EekRenderer *renderer = g_object_new (EEK_TYPE_RENDERER,
+    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
-                         "pango-context", pcontext,
+    renderer_init(renderer);
-                         NULL);
+    renderer->pcontext = pcontext;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    g_object_ref (renderer->pcontext);
    priv->keyboard = keyboard;
    /* Create a style context for the layout */
    GtkWidgetPath *path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    priv->view_context = gtk_style_context_new();
+    renderer->view_context = gtk_style_context_new();
-    gtk_style_context_set_path(priv->view_context, path);
+    gtk_style_context_set_path(renderer->view_context, path);
    gtk_widget_path_unref(path);
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
-        gtk_style_context_add_class(priv->view_context, "wide");
+        gtk_style_context_add_class(renderer->view_context, "wide");
    }
-    gtk_style_context_add_provider (priv->view_context,
+    gtk_style_context_add_provider (renderer->view_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    /* Create a style context for the buttons */
    path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_widget_path_iter_add_class(path, -1, "wide");
    }
    gtk_widget_path_append_type(path, button_type());
-    priv->button_context = gtk_style_context_new ();
+    renderer->button_context = gtk_style_context_new ();
-    gtk_style_context_set_path(priv->button_context, path);
+    gtk_style_context_set_path(renderer->button_context, path);
    gtk_widget_path_unref(path);
-    gtk_style_context_set_parent(priv->button_context, priv->view_context);
+    gtk_style_context_set_parent(renderer->button_context, renderer->view_context);
-    gtk_style_context_set_state (priv->button_context, GTK_STATE_FLAG_NORMAL);
+    gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
-    gtk_style_context_add_provider (priv->button_context,
+    gtk_style_context_add_provider (renderer->button_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    return renderer;
 }
 void
 eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  struct squeek_layout *layout,
                                  gdouble      width,
                                  gdouble      height)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    renderer->allocation_width = width;
    renderer->allocation_height = height;
-    priv->allocation_width = width;
+    renderer->widget_to_layout = squeek_layout_calculate_transformation(
-    priv->allocation_height = height;
+                layout,
-
+                renderer->allocation_width, renderer->allocation_height);
    priv->widget_to_layout = squeek_layout_calculate_transformation(
                priv->keyboard->layout,
                priv->allocation_width, priv->allocation_height);
    // This is where size-dependent surfaces would be released
 }
@ -437,10 +334,7 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
 void
 eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
 {
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
+    renderer->scale_factor = scale;
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    priv->scale_factor = scale;
 }
 cairo_surface_t *
@ -469,9 +363,5 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer) {
-    struct transformation failed = {0};
+    return renderer->widget_to_layout;
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    return priv->widget_to_layout;
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -27,30 +27,34 @@
 #include "eek-types.h"
 #include "src/submission.h"
-G_BEGIN_DECLS
+struct squeek_layout;
-#define EEK_TYPE_RENDERER (eek_renderer_get_type())
+/// Renders LevelKayboards
-G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+/// It cannot adjust styles at runtime.
-
+typedef struct EekRenderer
 struct _EekRendererClass
 {
-    GObjectClass parent_class;
+    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    /// Style class for rendering the view and button CSS.
    gchar *extra_style; // owned
-    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
+    // Mutable state
-                                             const gchar *icon_name,
+    /// Background extents
-                                             gint         size,
+    gdouble allocation_width;
-                                             gint         scale);
+    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    /// Coords transformation
    struct transformation widget_to_layout;
 } EekRenderer;
    /*< private >*/
    /* padding */
    gpointer pdummy[23];
 };
 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
 EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
                                                PangoContext    *pcontext);
 void             eek_renderer_set_allocation_size
-                                               (EekRenderer     *renderer,
+                                               (EekRenderer     *renderer, struct squeek_layout *layout,
                                                gdouble          width,
                                                gdouble          height);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
@ -61,7 +65,9 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             scale);
 void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct submission *submission,
-                                                cairo_t         *cr);
+                                                cairo_t         *cr, LevelKeyboard *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer);
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -47,13 +47,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 struct _EekboardContextServicePrivate {
    LevelKeyboard *keyboard; // currently used keyboard
    GHashTable *keyboard_hash; // a table of available keyboards, per layout
    char *overlay;
    GSettings *settings; // Owned reference
    uint32_t hint;
    uint32_t purpose;
    // Maybe TODO: it's used only for fetching layout type.
    // Maybe let UI push the type to this structure?
@ -99,13 +93,6 @@ eekboard_context_service_get_property (GObject    *object,
 static void
 eekboard_context_service_dispose (GObject *object)
 {
    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
    if (context->priv->keyboard_hash) {
        g_hash_table_destroy (context->priv->keyboard_hash);
        context->priv->keyboard_hash = NULL;
    }
    G_OBJECT_CLASS (eekboard_context_service_parent_class)->
        dispose (object);
 }
@ -113,6 +100,9 @@ eekboard_context_service_dispose (GObject *object)
 static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    if (!settings) {
        return;
    }
    GVariant *inputs = g_settings_get_value(settings, "sources");
    if (g_variant_n_children(inputs) == 0) {
        g_warning("No system layout present");
@ -126,39 +116,32 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
 }
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state) {
-{
+    gchar *layout_name = state->overlay_name;
    g_autofree gchar *keyboard_layout = NULL;
    if (context->priv->overlay) {
        keyboard_layout = g_strdup(context->priv->overlay);
    } else {
        g_autofree gchar *keyboard_type = NULL;
        settings_get_layout(context->priv->settings,
                            &keyboard_type, &keyboard_layout);
    }
-    if (!keyboard_layout) {
+    if (layout_name == NULL) {
-        keyboard_layout = g_strdup("us");
+        layout_name = state->layout_name;
    }
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+        switch (state->purpose) {
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
            layout_name = "number";
            break;
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
            layout_name = "terminal";
            break;
        default:
            ;
        }
-    switch (priv->purpose) {
+        if (layout_name == NULL) {
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
+            layout_name = "us";
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
+        }
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("number");
        break;
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("terminal");
        break;
    default:
        ;
    }
    // generic part follows
-    LevelKeyboard *keyboard = level_keyboard_new(keyboard_layout, t);
+    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
    LevelKeyboard *keyboard = level_keyboard_new(layout);
    // set as current
    LevelKeyboard *previous_keyboard = context->priv->keyboard;
    context->priv->keyboard = keyboard;
@ -168,6 +151,7 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
        submission_set_keyboard(context->priv->submission, keyboard);
    }
    // Update UI
    g_object_notify (G_OBJECT(context), "keyboard");
    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
@ -176,13 +160,22 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    }
 }
-static void update_layout_and_type(EekboardContextService *context) {
+static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    g_autofree gchar *keyboard_layout = NULL;
-    enum squeek_arrangement_kind layout_kind = ARRANGEMENT_KIND_BASE;
+    g_autofree gchar *keyboard_type = NULL;
-    if (priv->ui) {
+    settings_get_layout(context->priv->settings,
-        layout_kind = server_context_service_get_layout_type(priv->ui);
+                        &keyboard_type, &keyboard_layout);
    if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
        g_free(context->layout->overlay_name);
        context->layout->overlay_name = NULL;
        if (keyboard_layout) {
            g_free(context->layout->layout_name);
            context->layout->layout_name = g_strdup(keyboard_layout);
        }
        // This must actually update the UI.
        eekboard_context_service_use_layout(context, context->layout);
    }
    eekboard_context_service_update_layout(context, layout_kind);
 }
 static gboolean
@ -193,17 +186,14 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
-    g_free(context->priv->overlay);
+    eekboard_context_service_update_settings_layout(context);
    context->priv->overlay = NULL;
    update_layout_and_type(context);
    return TRUE;
 }
 static void
 eekboard_context_service_constructed (GObject *object)
 {
-    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
+    (void)object;
    update_layout_and_type(context);
 }
 static void
@ -251,23 +241,30 @@ static void
 eekboard_context_service_init (EekboardContextService *self)
 {
    self->priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(self);
-
+    const char *schema_name = "org.gnome.desktop.input-sources";
-    self->priv->keyboard_hash =
+    GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
-        g_hash_table_new_full (g_direct_hash,
+    if (ssrc) {
-                               g_direct_equal,
+        GSettingsSchema *schema = g_settings_schema_source_lookup(ssrc,
-                               NULL,
+                                                                  schema_name,
-                               (GDestroyNotify)g_object_unref);
+                                                                  TRUE);
-
+        if (schema) {
-    self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
+            // Not referencing the found schema directly,
-    gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
+            // because it's not clear how...
-                                      G_CALLBACK(settings_handle_layout_changed),
+            self->priv->settings = g_settings_new (schema_name);
-                                      self);
+            gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
-    if (conn_id == 0) {
+                                              G_CALLBACK(settings_handle_layout_changed),
-        g_warning ("Could not connect to gsettings updates, layout"
+                                              self);
-                   " changing unavailable");
+            if (conn_id == 0) {
                g_warning ("Could not connect to gsettings updates, "
                           "automatic layout changing unavailable");
            }
        } else {
            g_warning("Gsettings schema %s is not installed on the system. "
                      "Layout switching unavailable", schema_name);
        }
    } else {
        g_warning("No gsettings schemas installed. Layout switching unavailable.");
    }
    self->priv->overlay = NULL;
 }
 /**
@ -280,8 +277,6 @@ void
 eekboard_context_service_destroy (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }
@ -301,29 +296,34 @@ eekboard_context_service_get_keyboard (EekboardContextService *context)
 void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint, uint32_t purpose)
 {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    if (context->layout->hint != hint || context->layout->purpose != purpose) {
-
+        context->layout->hint = hint;
-    if (priv->hint != hint || priv->purpose != purpose) {
+        context->layout->purpose = purpose;
-        priv->hint = hint;
+        eekboard_context_service_use_layout(context, context->layout);
        priv->purpose = purpose;
        update_layout_and_type(context);
    }
 }
 void
 eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
-    context->priv->overlay = g_strdup(name);
+    if (g_strcmp0(context->layout->overlay_name, name)) {
-    update_layout_and_type(context);
+        g_free(context->layout->overlay_name);
        context->layout->overlay_name = g_strdup(name);
        eekboard_context_service_use_layout(context, context->layout);
    }
 }
 const char*
 eekboard_context_service_get_overlay(EekboardContextService *context) {
-    return context->priv->overlay;
+    return context->layout->overlay_name;
 }
-EekboardContextService *eekboard_context_service_new(void)
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
 {
-    return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
+    EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
    context->layout = state;
    eekboard_context_service_update_settings_layout(context);
    eekboard_context_service_use_layout(context, context->layout);
    return context;
 }
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -57,8 +57,8 @@ typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
 */
 struct _EekboardContextService {
    GObject parent;
    EekboardContextServicePrivate *priv;
    struct squeek_layout_state *layout; // Unowned
 };
 /**
@ -72,9 +72,6 @@ struct _EekboardContextServiceClass {
    GObjectClass parent_class;
    /*< public >*/
    struct squeek_view *(*create_keyboard)    (EekboardContextService *self,
                                        const gchar            *keyboard_type);
    /* signals */
    void         (*destroyed)          (EekboardContextService *self);
@ -85,7 +82,7 @@ struct _EekboardContextServiceClass {
 GType         eekboard_context_service_get_type
                                              (void) G_GNUC_CONST;
-EekboardContextService *eekboard_context_service_new(void);
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 void          eekboard_context_service_destroy (EekboardContextService *context);
@ -98,6 +95,6 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint,
                                               uint32_t purpose);
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t);
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout);
 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/meson.build
+++ b/meson.build
@ -42,6 +42,7 @@ endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 desktopdir = join_paths(datadir, 'applications')
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
  depdatadir = datadir
--- a/src/layout.h
+++ b/src/layout.h
@ -9,12 +9,21 @@
 #include "eek/eek-types.h"
 #include "src/submission.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
 enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_BASE = 0,
    ARRANGEMENT_KIND_WIDE = 1,
 };
 struct squeek_layout_state {
    enum squeek_arrangement_kind arrangement;
    enum zwp_text_input_v3_content_purpose purpose;
    enum zwp_text_input_v3_content_hint hint;
    char *layout_name;
    char *overlay_name;
 };
 struct squeek_layout;
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
--- a/src/lib.rs
+++ b/src/lib.rs
@ -35,5 +35,6 @@ mod style;
 mod submission;
 pub mod tests;
 pub mod util;
 mod ui_manager;
 mod vkeyboard;
 mod xdg;
--- a/src/meson.build
+++ b/src/meson.build
@ -38,7 +38,6 @@ deps = [
  dependency('gio-2.0', version: '>=2.26.0'),
  dependency('gnome-desktop-3.0', version: '>=3.0'),
  dependency('gtk+-3.0', version: '>=3.0'),
  dependency('libcroco-0.6'),
  dependency('wayland-client', version: '>=1.14'),
  dependency('xkbcommon'),
  cc.find_library('m'),
--- a/src/outputs.h
+++ b/src/outputs.h
@ -4,10 +4,14 @@
 #include "wayland-client-protocol.h"
 struct squeek_outputs;
 struct squeek_output_handle {
    struct wl_output *output;
    struct squeek_outputs *outputs;
 };
 struct squeek_outputs *squeek_outputs_new();
 void squeek_outputs_free(struct squeek_outputs*);
 void squeek_outputs_register(struct squeek_outputs*, struct wl_output *output);
-struct wl_output *squeek_outputs_get_current(struct squeek_outputs*);
+struct squeek_output_handle squeek_outputs_get_current(struct squeek_outputs*);
 int32_t squeek_outputs_get_perceptual_width(struct squeek_outputs*, struct wl_output *output);
 #endif
--- a/src/outputs.rs
+++ b/src/outputs.rs
@ -17,7 +17,7 @@ pub mod c {
    // Defined in C
    #[repr(transparent)]
-    #[derive(Clone, PartialEq)]
+    #[derive(Clone, PartialEq, Copy)]
    pub struct WlOutput(*const c_void);
    #[repr(C)]
@ -105,6 +105,24 @@ pub mod c {
    type COutputs = ::util::c::Wrapped<Outputs>;
    /// A stable reference to an output.
    #[derive(Clone)]
    #[repr(C)]
    pub struct OutputHandle {
        wl_output: WlOutput,
        outputs: COutputs,
    }
    impl OutputHandle {
        // Cannot return an Output reference
        // because COutputs is too deeply wrapped
        pub fn get_state(&self) -> Option<OutputState> {
            let outputs = self.outputs.clone_ref();
            let outputs = outputs.borrow();
            find_output(&outputs, self.wl_output.clone()).map(|o| o.current.clone())
        }
    }
    // Defined in Rust
    extern fn outputs_handle_geometry(
@ -240,46 +258,15 @@ pub mod c {
    #[no_mangle]
    pub extern "C"
-    fn squeek_outputs_get_current(raw_collection: COutputs) -> WlOutput {
+    fn squeek_outputs_get_current(raw_collection: COutputs) -> OutputHandle {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
-        collection.outputs[0].output.clone()
+        OutputHandle {
-    }
+            wl_output: collection.outputs[0].output.clone(),
-
+            outputs: raw_collection.clone(),
    #[no_mangle]
    pub extern "C"
    fn squeek_outputs_get_perceptual_width(
        raw_collection: COutputs,
        wl_output: WlOutput,
    ) -> i32 {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
        let output_state = find_output(&collection, wl_output)
            .map(|o| &o.current);
        match output_state {
            Some(OutputState {
                current_mode: Some(super::Mode { width, height } ),
                transform: Some(transform),
                scale,
            }) => {
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => width / scale,
                    _ => height / scale,
                }
            },
            _ => {
                log_print!(
                    logging::Level::Surprise,
                    "Not enough info received on output",
                );
                0
            },
        }
    }
    // TODO: handle unregistration
    fn find_output(
@ -305,6 +292,14 @@ pub mod c {
    }
 }
 /// Generic size
 #[derive(Clone)]
 pub struct Size {
    pub width: u32,
    pub height: u32,
 }
 /// wl_output mode
 #[derive(Clone)]
 struct Mode {
    width: i32,
@ -315,10 +310,16 @@ struct Mode {
 pub struct OutputState {
    current_mode: Option<Mode>,
    transform: Option<c::Transform>,
-    scale: i32,
+    pub scale: i32,
 }
 impl OutputState {
    // More properly, this would have been a builder kind of struct,
    // with wl_output gradually adding properties to it
    // before it reached a fully initialized state,
    // when it would transform into a struct without all (some?) of the Options.
    // However, it's not clear which state is fully initialized,
    // and whether it would make things easier at all anyway.
    fn uninitialized() -> OutputState {
        OutputState {
            current_mode: None,
@ -326,6 +327,32 @@ impl OutputState {
            scale: 1,
        }
    }
    pub fn get_pixel_size(&self) -> Option<Size> {
        use self::c::Transform;
        match self {
            OutputState {
                current_mode: Some(Mode { width, height } ),
                transform: Some(transform),
                scale: _,
            } => Some(
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => Size {
                        width: *width as u32,
                        height: *height as u32,
                    },
                    _ => Size {
                        width: *height as u32,
                        height: *width as u32,
                    },
                }
            ),
            _ => None,
        }
    }
 }
 pub struct Output {
--- a/src/popover.rs
+++ b/src/popover.rs
@ -132,19 +132,40 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
    )
 }
 fn get_settings(schema_name: &str) -> Option<gio::Settings> {
    let mut error_handler = logging::Print{};
    gio::SettingsSchemaSource::get_default()
        .or_warn(
            &mut error_handler,
            logging::Problem::Surprise,
            "No gsettings schemas installed.",
        )
        .and_then(|sss| 
            sss.lookup(schema_name, true)
                .or_warn(
                    &mut error_handler,
                    logging::Problem::Surprise,
                    &format!("Gsettings schema {} not installed", schema_name),
                )
        )
        .map(|_sschema| gio::Settings::new(schema_name))
 }
 fn set_layout(kind: String, name: String) {
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    if let Some(settings) = settings {
-    let current = (kind.clone(), name.clone());
+        let inputs = settings.get_value("sources").unwrap();
-    let inputs = variants::get_tuples(inputs).into_iter()
+        let current = (kind.clone(), name.clone());
-        .filter(|t| t != &current);
+        let inputs = variants::get_tuples(inputs).into_iter()
-    let inputs = vec![(kind, name)].into_iter()
+            .filter(|t| t != &current);
-        .chain(inputs).collect();
+        let inputs = vec![(kind, name)].into_iter()
-    settings.set_value(
+            .chain(inputs).collect();
-        "sources",
+        settings.set_value(
-        &variants::ArrayPairString(inputs).to_variant(),
+            "sources",
-    );
+            &variants::ArrayPairString(inputs).to_variant(),
-    settings.apply();
+        );
        settings.apply();
    }
 }
 /// A reference to what the user wants to see
@ -284,9 +305,13 @@ pub fn show(
    let overlay_layouts = resources::get_overlays().into_iter()
        .map(|name| LayoutId::Local(name.to_string()));
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    let inputs = settings
-    let inputs = variants::get_tuples(inputs);
+        .map(|settings| {
            let inputs = settings.get_value("sources").unwrap();
            variants::get_tuples(inputs)
        })
        .unwrap_or_else(|| Vec::new());
    let system_layouts: Vec<LayoutId> = inputs.into_iter()
        .map(|(kind, name)| LayoutId::System { kind, name })
--- a/src/resources.rs
+++ b/src/resources.rs
@ -16,8 +16,10 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
    ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
    ("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")),
    ("gr", include_str!("../data/keyboards/gr.yaml")),
    ("it", include_str!("../data/keyboards/it.yaml")),
    ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")),
@ -26,6 +28,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("number", include_str!("../data/keyboards/number.yaml")),
    ("pl", include_str!("../data/keyboards/pl.yaml")),
    ("pl_wide", include_str!("../data/keyboards/pl_wide.yaml")),
    ("ru", include_str!("../data/keyboards/ru.yaml")),
    ("se", include_str!("../data/keyboards/se.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
@ -67,6 +70,7 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
    ("es-ES", include_str!("../data/langs/es-ES.txt")),
    ("ja-JP", include_str!("../data/langs/ja-JP.txt")),
    ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
    ("ru-RU", include_str!("../data/langs/ru-RU.txt")),
 ];
 pub fn get_layout_names(lang: &str)
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -30,8 +30,6 @@
 enum {
    PROP_0,
    PROP_SIZE_CONSTRAINT_LANDSCAPE,
    PROP_SIZE_CONSTRAINT_PORTRAIT,
    PROP_VISIBLE,
    PROP_LAST
 };
@ -44,16 +42,14 @@ struct _ServerContextService {
    EekboardContextService *state; // unowned
    /// Needed for instantiating the widget
    struct submission *submission; // unowned
    struct squeek_layout_state *layout;
    struct ui_manager *manager; // unowned
    gboolean visible;
    PhoshLayerSurface *window;
    GtkWidget *widget; // nullable
    guint hiding;
    guint last_requested_height;
    enum squeek_arrangement_kind last_type;
    gdouble size_constraint_landscape[2];
    gdouble size_constraint_portrait[2];
 };
 struct _ServerContextServiceClass {
@ -75,27 +71,6 @@ on_destroy (GtkWidget *widget, gpointer user_data)
    //eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
 }
 static void
 make_widget (ServerContextService *context);
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    ServerContextService *context)
 {
    /* Recreate the keyboard widget to keep in sync with the keymap. */
    if (context->window)
        make_widget(context);
    gboolean visible;
    g_object_get (context, "visible", &visible, NULL);
    if (visible) {
        server_context_service_hide_keyboard(context);
        server_context_service_show_keyboard(context);
    }
 }
 static void
 on_notify_map (GObject    *object,
               ServerContextService *context)
@ -112,26 +87,6 @@ on_notify_unmap (GObject    *object,
    g_object_set (context, "visible", FALSE, NULL);
 }
 static uint32_t
 calculate_height(int32_t width)
 {
    uint32_t height = 180;
    if (width < 360 && width > 0) {
        height = ((unsigned)width * 7 / 12); // to match 360×210
    } else if (width < 540) {
        height = 180 + (540 - (unsigned)width) * 30 / 180; // smooth transition
    }
    return height;
 }
 enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 540) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
 on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
 {
@ -141,14 +96,8 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
                 "configured-width", &width,
                 "configured-height", &height,
                 NULL);
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type((uint32_t)width, (uint32_t)height);
    if (context->last_type != new_type) {
        context->last_type = new_type;
        eekboard_context_service_update_layout(context->state, context->last_type);
    }
-    guint desired_height = calculate_height(width);
+    guint desired_height = squeek_uiman_get_perceptual_height(context->manager);
    guint configured_height = (guint)height;
    // if height was already requested once but a different one was given
    // (for the same set of surrounding properties),
@ -171,14 +120,14 @@ make_window (ServerContextService *context)
    if (context->window)
        g_error("Window already present");
-    struct wl_output *output = squeek_outputs_get_current(squeek_wayland->outputs);
+    struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs);
-    int32_t width = squeek_outputs_get_perceptual_width(squeek_wayland->outputs, output);
+    squeek_uiman_set_output(context->manager, output);
-    uint32_t height = calculate_height(width);
+    uint32_t height = squeek_uiman_get_perceptual_height(context->manager);
    context->window = g_object_new (
        PHOSH_TYPE_LAYER_SURFACE,
        "layer-shell", squeek_wayland->layer_shell,
-        "wl-output", output,
+        "wl-output", output.output,
        "height", height,
        "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
@ -224,14 +173,11 @@ make_widget (ServerContextService *context)
        gtk_widget_destroy(context->widget);
        context->widget = NULL;
    }
-
+    context->widget = eek_gtk_keyboard_new (context->state, context->submission, context->layout);
    LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state);
    context->widget = eek_gtk_keyboard_new (keyboard, context->state, context->submission);
    gtk_widget_set_has_tooltip (context->widget, TRUE);
    gtk_container_add (GTK_CONTAINER(context->window), context->widget);
-    gtk_widget_show (context->widget);
+    gtk_widget_show_all(context->widget);
 }
 static gboolean
@ -296,21 +242,8 @@ server_context_service_set_property (GObject      *object,
                                     GParamSpec   *pspec)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);
    GVariant *variant;
    switch (prop_id) {
    case PROP_SIZE_CONSTRAINT_LANDSCAPE:
        variant = g_value_get_variant (value);
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_landscape[0],
                       &context->size_constraint_landscape[1]);
        break;
    case PROP_SIZE_CONSTRAINT_PORTRAIT:
        variant = g_value_get_variant (value);
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_portrait[0],
                       &context->size_constraint_portrait[1]);
        break;
    case PROP_VISIBLE:
        context->visible = g_value_get_boolean (value);
        break;
@ -359,26 +292,6 @@ server_context_service_class_init (ServerContextServiceClass *klass)
    gobject_class->get_property = server_context_service_get_property;
    gobject_class->dispose = server_context_service_dispose;
    pspec = g_param_spec_variant ("size-constraint-landscape",
                                  "Size constraint landscape",
                                  "Size constraint landscape",
                                  G_VARIANT_TYPE("(dd)"),
                                  NULL,
                                  G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_SIZE_CONSTRAINT_LANDSCAPE,
                                     pspec);
    pspec = g_param_spec_variant ("size-constraint-portrait",
                                  "Size constraint portrait",
                                  "Size constraint portrait",
                                  G_VARIANT_TYPE("(dd)"),
                                  NULL,
                                  G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_SIZE_CONSTRAINT_PORTRAIT,
                                     pspec);
    /**
     * Flag to indicate if keyboard is visible or not.
     */
@ -398,19 +311,12 @@ server_context_service_init (ServerContextService *state) {
 }
 ServerContextService *
-server_context_service_new (EekboardContextService *state, struct submission *submission)
+server_context_service_new (EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman)
 {
    ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
    ui->submission = submission;
    ui->state = state;
-    g_signal_connect (state,
+    ui->layout = layout;
-                      "notify::keyboard",
+    ui->manager = uiman;
                      G_CALLBACK(on_notify_keyboard),
                      ui);
    return ui;
 }
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *service)
 {
    return service->last_type;
 }
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@ -20,6 +20,7 @@
 #include "src/layout.h"
 #include "src/submission.h"
 #include "ui_manager.h"
 G_BEGIN_DECLS
@ -36,7 +37,7 @@ typedef struct _ServerContextService ServerContextService;
 GType         server_context_service_get_type
                                              (void) G_GNUC_CONST;
-ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission);
+ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman);
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
 void server_context_service_show_keyboard (ServerContextService *context);
 void server_context_service_hide_keyboard (ServerContextService *context);
--- a/src/server-main.c
+++ b/src/server-main.c
@ -28,9 +28,11 @@
 #include "eek/eek.h"
 #include "eekboard/eekboard-context-service.h"
 #include "dbus.h"
 #include "layout.h"
 #include "outputs.h"
 #include "submission.h"
 #include "server-context-service.h"
 #include "ui_manager.h"
 #include "wayland.h"
 #include <gdk/gdkwayland.h>
@ -38,11 +40,13 @@
 /// Global application state
 struct squeekboard {
-    struct squeek_wayland wayland;
+    struct squeek_wayland wayland; // Just hooks.
-    DBusHandler *dbus_handler;
+    DBusHandler *dbus_handler; // Controls visibility of the OSK.
-    EekboardContextService *settings_context;
+    EekboardContextService *settings_context; // Gsettings hooks.
-    ServerContextService *ui_context;
+    ServerContextService *ui_context; // mess, includes the entire UI
-    struct submission *submission;
+    struct submission *submission; // Wayland text input handling.
    struct squeek_layout_state layout_choice; // Currently wanted layout.
    struct ui_manager *ui_manager; // UI shape tracker/chooser. TODO: merge with layuot choice
 };
@ -199,7 +203,9 @@ main (int argc, char **argv)
        g_warning("Wayland input method interface not available");
    }
-    instance.settings_context = eekboard_context_service_new();
+    instance.ui_manager = squeek_uiman_new();
    instance.settings_context = eekboard_context_service_new(&instance.layout_choice);
    // set up dbus
@ -222,9 +228,9 @@ main (int argc, char **argv)
        error = NULL;
        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
        if (connection == NULL) {
-            g_printerr ("Can't connect to the bus: %s\n", error->message);
+            g_printerr ("Can't connect to the bus: %s. "
                        "Visibility switching unavailable.", error->message);
            g_error_free (error);
            exit (1);
        }
        break;
    case G_BUS_TYPE_NONE:
@ -246,25 +252,28 @@ main (int argc, char **argv)
        g_assert_not_reached ();
        break;
    }
    guint owner_id = 0;
    DBusHandler *service = NULL;
    if (connection) {
        service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
-    DBusHandler *service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
+        if (service == NULL) {
            g_printerr ("Can't create dbus server\n");
            exit (1);
        }
        instance.dbus_handler = service;
-    if (service == NULL) {
+        owner_id = g_bus_own_name_on_connection (connection,
-        g_printerr ("Can't create dbus server\n");
+                                                 DBUS_SERVICE_INTERFACE,
-        exit (1);
+                                                 G_BUS_NAME_OWNER_FLAGS_NONE,
-    }
+                                                 on_name_acquired,
-    instance.dbus_handler = service;
+                                                 on_name_lost,
-
+                                                 NULL,
-    guint owner_id = g_bus_own_name_on_connection (connection,
+                                                 NULL);
-                                             DBUS_SERVICE_INTERFACE,
+        if (owner_id == 0) {
-                                             G_BUS_NAME_OWNER_FLAGS_NONE,
+            g_printerr ("Can't own the name\n");
-                                             on_name_acquired,
+            exit (1);
-                                             on_name_lost,
+        }
                                             NULL,
                                             NULL);
    if (owner_id == 0) {
        g_printerr ("Can't own the name\n");
        exit (1);
    }
    instance.submission = get_submission(instance.wayland.input_method_manager,
@ -276,7 +285,9 @@ main (int argc, char **argv)
    ServerContextService *ui_context = server_context_service_new(
                instance.settings_context,
-                instance.submission);
+                instance.submission,
                &instance.layout_choice,
                instance.ui_manager);
    if (!ui_context) {
        g_error("Could not initialize GUI");
        exit(1);
@ -296,9 +307,15 @@ main (int argc, char **argv)
    g_main_loop_run (loop);
-    g_bus_unown_name (owner_id);
+    if (connection) {
-    g_object_unref (service);
+        if (service) {
-    g_object_unref (connection);
+            if (owner_id != 0) {
                g_bus_unown_name (owner_id);
            }
            g_object_unref (service);
        }
        g_object_unref (connection);
    }
    g_main_loop_unref (loop);
    squeek_wayland_deinit (&instance.wayland);
--- a/src/ui_manager.h
+++ b/src/ui_manager.h
@ -0,0 +1,14 @@
 #ifndef UI_MANAGER__
 #define UI_MANAGER__
 #include <inttypes.h>
 #include "outputs.h"
 struct ui_manager;
 struct ui_manager *squeek_uiman_new();
 void squeek_uiman_set_output(struct ui_manager *uiman, struct squeek_output_handle output);
 uint32_t squeek_uiman_get_perceptual_height(struct ui_manager *uiman);
 #endif
--- a/src/ui_manager.rs
+++ b/src/ui_manager.rs
@ -0,0 +1,81 @@
 /* Copyright (C) 2020 Purism SPC
 * SPDX-License-Identifier: GPL-3.0+
 */
 /*! Centrally manages the shape of the UI widgets, and the choice of layout.
 * 
 * Coordinates this based on information collated from all possible sources.
 */
 use std::cmp::min;
 use ::outputs::c::OutputHandle;
 mod c {
    use super::*;
    use ::util::c::Wrapped;
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_new() -> Wrapped<Manager> {
        Wrapped::new(Manager { output: None })
    }
    /// Used to size the layer surface containing all the OSK widgets.
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_get_perceptual_height(
        uiman: Wrapped<Manager>,
    ) -> u32 {
        let uiman = uiman.clone_ref();
        let uiman = uiman.borrow();
        // TODO: what to do when there's no output?
        uiman.get_perceptual_height().unwrap_or(0)
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_set_output(
        uiman: Wrapped<Manager>,
        output: OutputHandle,
    ) {
        let uiman = uiman.clone_ref();
        let mut uiman = uiman.borrow_mut();
        uiman.output = Some(output);
    }
 }
 /// Stores current state of all things influencing what the UI should look like.
 pub struct Manager {
    /// Shared output handle, current state updated whenever it's needed.
    // TODO: Stop assuming that the output never changes.
    // (There's no way for the output manager to update the ui manager.)
    // FIXME: Turn into an OutputState and apply relevant connections elsewhere.
    // Otherwise testability and predictablity is low.
    output: Option<OutputHandle>,
    //// Pixel size of the surface. Needs explicit updating.
    //surface_size: Option<Size>,
 }
 impl Manager {
    fn get_perceptual_height(&self) -> Option<u32> {
        let output_info = (&self.output).as_ref()
            .and_then(|o| o.get_state())
            .map(|os| (os.scale as u32, os.get_pixel_size()));
        match output_info {
            Some((scale, Some(px_size))) => Some({
                let height = if (px_size.width < 720) & (px_size.width > 0) {
                    px_size.width * 7 / 12 // to match 360×210
                } else if px_size.width < 1080 {
                    360 + (1080 - px_size.width) * 60 / 360 // smooth transition
                } else {
                    360
                };
                // Don't exceed half the display size
                min(height, px_size.height / 2) / scale
            }),
            Some((scale, None)) => Some(360 / scale),
            None => None,
        }
    }
 }
--- a/src/util.rs
+++ b/src/util.rs
@ -98,7 +98,8 @@ pub mod c {
            Rc::from_raw(self.0)
        }
-        /// Creates a new Rc reference to the same data
+        /// Creates a new Rc reference to the same data.
        /// Use for accessing the underlying data as a reference.
        pub fn clone_ref(&self) -> Rc<RefCell<T>> {
            // A bit dangerous: the Rc may be in use elsewhere
            let used_rc = unsafe { Rc::from_raw(self.0) };
@ -130,6 +131,7 @@ pub mod c {
    impl<T> COpaquePtr for Wrapped<T> {}
 }
 /// Clones the underlying data structure, like ToOwned.
 pub trait CloneOwned {
    type Owned;
    fn clone_owned(&self) -> Self::Owned;
--- a/tests/meson.build
+++ b/tests/meson.build
@ -50,14 +50,17 @@ endforeach
 foreach layout : [
    'us', 'us_wide',
    'de', 'de_wide',
    'dk',
    'es',
    'fi',
    'fr',
    'gr',
    'it',
    'jp+kana','jp+kana_wide',
    'no',
    'number',
    'pl', 'pl_wide',
    'ru',
    'se',
    'terminal',
Author	SHA1	Message	Date
Dorota Czaplejewicz	1a2df96c02	Release v1.9.2 "Aristotelian physics" - Swedish - Russian - Danish - French - minor fixes	2020-06-07 14:38:23 +00:00
Dorota Czaplejewicz	75ecf9059a	Update rust deps for release	2020-06-01 09:36:36 +00:00
Dorota Czaplejewicz	5715458d33	Merge branch 'master' into 'master' Add danish keylayout See merge request Librem5/squeekboard!353	2020-05-27 07:14:35 +00:00
Dorota Czaplejewicz	8196117269	Merge branch 'desktopfile-absolute' into 'master' sm.puri.Squeekboard.desktop: make path to Exec= absolute See merge request Librem5/squeekboard!352	2020-05-26 18:20:49 +00:00
Ole Guldberg	7fed1339ed	add test for danish layout	2020-05-26 16:37:14 +02:00
Ole Guldberg	0339d13ce4	Danish keyboard layout	2020-05-26 16:22:38 +02:00
Ole Guldberg	9f1e49da5d	Danish keyboard layout	2020-05-26 16:21:17 +02:00
Florian Klink	c1737c763f	sm.puri.Squeekboard.desktop: make path to Exec= absolute This uses the same logic from Phosh to render absolute paths in .desktop files.	2020-05-26 12:02:55 +02:00
Dorota Czaplejewicz	fe22fc2271	Merge branch 'remove-dep-libcroco' into 'master' Removed unused dependency 'libcroco' See merge request Librem5/squeekboard!351	2020-05-24 18:19:15 +00:00
Jordi Masip	f473a47eb8	Removed unused dependency 'libcroco'	2020-05-24 16:31:43 +02:00
Dorota Czaplejewicz	76bd87686a	Merge branch 'ru-layout' into 'master' Fresh Russian layout See merge request Librem5/squeekboard!347	2020-05-20 17:59:22 +00:00
Vlad	ef85823528	Fresh Russian layout	2020-05-20 17:59:22 +00:00
Dorota Czaplejewicz	54ac7511cd	Merge branch 'scaling' into 'master' Stop scaling See merge request Librem5/squeekboard!339	2020-05-13 11:01:21 +00:00
Dorota Czaplejewicz	080bbb4d4e	Merge branch 'fix_doc_reference' into 'master' Folder is doc, not docs See merge request Librem5/squeekboard!349	2020-05-08 16:44:44 +00:00
Andreas Rönnquist	7c35307011	Folder is doc, not docs	2020-05-07 16:06:44 +02:00
Dorota Czaplejewicz	cd3255b301	Merge branch 'swedish_wide_button' into 'master' Swedish keyboard, use wide button switching between numbers, symbols and base See merge request Librem5/squeekboard!344	2020-05-06 11:22:13 +00:00
Guido Gunther	f8b6b98633	Merge branch '1.9.1' into 'master' Release 1.9.1 See merge request Librem5/squeekboard!348	2020-04-29 13:04:04 +00:00
Dorota Czaplejewicz	6414b57e57	Merge branch 'french-layout' into 'master' French layout See merge request Librem5/squeekboard!346	2020-04-28 12:31:44 +00:00
Arnaud Ferraris	2a20bbbf2a	tests: add french layout	2020-04-27 09:51:40 +02:00
Arnaud Ferraris	13ebf9449f	keyboards: fr: improve diacritics layout This commit changes the layout of the `eschars` view, in an attempt at making it more logical and optimized to reach more frequent symbols more easily.	2020-04-23 14:49:34 +02:00
Arnaud Ferraris	fa8449eb1e	keyboards: fr: improve consistency with other layouts In order to stay consistent with other layouts, the bottom line has been re-arranged and keys dimensions have been optimized (based on the `terminal` layout, which has similar features). Furthermore, the ç/Ç keys in the 'normal' views have been replaced with ./, so that all diacritics are on the same view. This commit also fixes the Backspace key behavior.	2020-04-23 14:48:58 +02:00
Arnaud Ferraris	0bdb5f1f33	resources: include French keyboard layout	2020-04-23 13:07:33 +02:00
Arnaud Ferraris	b631817896	keyboards: fr: make sure the layout fits the screen Due to an excessive amount of keys in the `eschars` view, one of the rows would overflow the screen. This commit removes the `Ç` key, which is already present in the `upper` view.	2020-04-21 19:39:17 +02:00
Arnaud Ferraris	09c78da7a7	keyboards: fr: fix keyboard layout A number of keys would not give the expected result, due to the lack of a `text` of `action` property. Additionally, the layout wouldn't load because of an old file format (it seems `bounds` are not supported anymore). This patch makes sure this layout can be loaded and used by squeekboard v0.1.9.	2020-04-21 19:39:07 +02:00
uzanto	7de7dc1b33	Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing	2020-04-21 19:17:27 +02:00
uzanto	323d89e4cb	Add new file	2020-04-21 19:17:27 +02:00
Andreas Rönnquist	184bdaa0b6	More fixes of button sizes	2020-03-26 18:02:32 +01:00
Andreas Rönnquist	0459d33c4c	Swedish keyboard, wide button switching between numbers, symbols and base	2020-03-26 15:12:01 +01:00
Dorota Czaplejewicz	3d1a641ca3	Merge remote-tracking branch 'upstream/master' into scaling	2020-03-12 10:51:30 +00:00
Dorota Czaplejewicz	0466a520f2	Merge branch 'predictoin_ui' into 'master' Cleanups to make EekGtkKeyboard more standalone See merge request Librem5/squeekboard!336	2020-03-12 10:46:14 +00:00
Dorota Czaplejewicz	9e8aca1cbf	Merge branch 'unavailable' into 'master' Crash less when outside resources are unavailable See merge request Librem5/squeekboard!341	2020-03-11 10:55:05 +00:00
Dorota Czaplejewicz	eb84e52897	Merge branch 'release_check' into 'master' CI: Fix typo See merge request Librem5/squeekboard!343	2020-03-07 11:38:34 +00:00
Dorota Czaplejewicz	0f7ff1636d	CI: Fix typo	2020-03-07 11:17:25 +00:00
Dorota Czaplejewicz	8ff8e8ac48	Merge remote-tracking branch 'upstream/master' into scaling	2020-03-07 10:46:09 +00:00
Dorota Czaplejewicz	2770e1769c	sizing: Ignore scaling factor for layout selection	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	3cd170acc3	sizing: Create a standalone UI shape manager The manager is used for sizing the layer surface. It promises never to exceed half the output height. The selection of the current layout is not being done here, leading to worse behaviour in 1:1 scaling. In the future, it could be used for sizing the keyboard itself and the suggestion box, as well as decide which layout to use, because layouts should have some sizing hints.	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	24f709ab13	Remove unused code	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	784f9127fa	layout: Minor generalizations	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	22daefba3a	levelkeyboard: Rearrange to make future conversion easier	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	4ff9cf087b	renderer: Simplify by dropping gobjectness	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	61e1ab5c5a	layout: Split out choice to a struct on its own	2020-03-07 10:26:52 +00:00
Dorota Czaplejewicz	8ac2b5a713	gsettings: Don't crash on switching when unavailable	2020-03-03 19:46:53 +00:00
Dorota Czaplejewicz	8bae8fe5bb	dbus: Don't crash if can't make a connection	2020-03-03 19:25:49 +00:00
Dorota Czaplejewicz	b3cfc8a0f3	gsettings: Don't crash when unavailable	2020-03-03 19:10:50 +00:00
Dorota Czaplejewicz	46cbaf8e87	keyboard: Remove unused code	2020-02-23 12:15:19 +00:00