Release 1.23.0

New or updated translations: - Belarusian - Haitian Creole New layouts: - French Canadian (QWERTY + accented letters) - German terminal-layout - Spanish terminal-layout Changes: - Fixed Persian and Swiss layouts - Fixed various small style-issues in many layouts - Improved the US-terminal-layout Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/615>
Update dependencies
2024-03-08 11:36:43 +01:00 · 2024-03-08 11:05:46 +01:00 · 2024-03-08 09:19:05 +00:00 · 2024-03-08 09:31:39 +01:00 · 2024-03-08 09:31:33 +01:00 · 2024-03-08 09:24:58 +01:00
152 changed files with 4579 additions and 1765 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -32,7 +32,7 @@ build_meson:
  script:
    - mv debian/control-newer debian/control
    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
    - ninja -C _build install
  except:
    variables:
@ -76,7 +76,7 @@ build_deb:arm64:
    - cp ../*.deb .

 build_deb:future:
-  image: debian:sid
+  image: debian:bookworm
  allow_failure: true
  tags:
    - aarch64
--- a/Cargo.deps.newer
+++ b/Cargo.deps.newer
@ -1,7 +1,8 @@
-# Dependencies which change based on build flags
+# Dependencies and tools which change based on build flags
 # For the newer-than-Byzantium config
+
 bitflags = "1.3.*"
-clap = { version = "3.1.*", features=["std"], default-features = false }
+clap = { version = "4.*", features=["std"], default-features = false }
 zbus = "1.9.*"
 zvariant = "2.10.*"
 # Newer versions seem to confuse the version of Cargo on Debian Bullseye
--- a/Cargo.lock
+++ b/Cargo.lock
@ -42,9 +42,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "cairo-rs"
@ -73,9 +73,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"

 [[package]]
 name = "cfg-if"
@ -108,7 +108,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
@ -129,14 +129,14 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
 "instant",
 ]
@ -319,15 +319,15 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "indexmap"
-version = "1.8.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
 "autocfg",
 "hashbrown",
@ -350,9 +350,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

 [[package]]
 name = "linked-hash-map"
@ -418,9 +418,9 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"

 [[package]]
 name = "proc-macro-crate"
@ -433,18 +433,18 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]
@ -463,7 +463,6 @@ dependencies = [
 "glib-sys",
 "gtk",
 "gtk-sys",
- "indexmap",
 "maplit",
 "serde",
 "serde_yaml",
@ -475,52 +474,52 @@ dependencies = [

 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"

 [[package]]
 name = "scoped-tls"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"

 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.52",
 ]

 [[package]]
 name = "serde_repr"
-version = "0.1.8"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.52",
 ]

 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
 "indexmap",
 "ryu",
@ -530,9 +529,20 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
 "proc-macro2",
 "quote",
@ -550,24 +560,24 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

 [[package]]
 name = "void"
@ -599,9 +609,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "xkbcommon"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
 dependencies = [
 "libc",
 "memmap",
@ -644,7 +654,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
@ -666,5 +676,5 @@ checksum = "d68726e8c12757384a8d1485080527e263dea67d91f19e97cd71b9292f22d7c5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]
--- a/Cargo.lock.newer
+++ b/Cargo.lock.newer
@ -4,28 +4,38 @@ version = 3

 [[package]]
 name = "anyhow"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"

 [[package]]
 name = "async-io"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
+checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
 dependencies = [
+ "async-lock",
 "autocfg",
 "concurrent-queue",
 "futures-lite",
 "libc",
 "log",
- "once_cell",
 "parking",
 "polling",
 "slab",
 "socket2",
 "waker-fn",
- "winapi",
+ "windows-sys",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+dependencies = [
+ "event-listener",
+ "futures-lite",
 ]

 [[package]]
@ -70,12 +80,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cairo-rs"
 version = "0.14.9"
@ -102,9 +106,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"

 [[package]]
 name = "cfg-expr"
@ -123,32 +127,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "3.1.18"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
 "bitflags",
 "clap_lex",
- "indexmap",
- "textwrap",
 ]

 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
 dependencies = [
 "os_str_bytes",
 ]

 [[package]]
 name = "concurrent-queue"
-version = "1.2.4"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
 dependencies = [
- "cache-padded",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+dependencies = [
+ "cfg-if",
 ]

 [[package]]
@ -164,9 +175,9 @@ dependencies = [

 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

 [[package]]
 name = "enumflags2"
@ -190,10 +201,16 @@ dependencies = [
 ]

 [[package]]
-name = "fastrand"
-version = "1.8.0"
+name = "event-listener"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
 "instant",
 ]
@ -210,9 +227,9 @@ dependencies = [

 [[package]]
 name = "futures"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -225,9 +242,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -235,15 +252,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"

 [[package]]
 name = "futures-executor"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 dependencies = [
 "futures-core",
 "futures-task",
@ -252,9 +269,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"

 [[package]]
 name = "futures-lite"
@ -273,9 +290,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 dependencies = [
 "proc-macro2",
 "quote",
@ -284,21 +301,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"

 [[package]]
 name = "futures-task"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"

 [[package]]
 name = "futures-util"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -427,7 +444,7 @@ checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
 dependencies = [
 "anyhow",
 "heck",
- "proc-macro-crate 1.2.1",
+ "proc-macro-crate 1.3.0",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@ -504,7 +521,7 @@ checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79"
 dependencies = [
 "anyhow",
 "heck",
- "proc-macro-crate 1.2.1",
+ "proc-macro-crate 1.3.0",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@ -528,9 +545,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
 "autocfg",
 "hashbrown",
@ -547,18 +564,18 @@ dependencies = [

 [[package]]
 name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
 "either",
 ]

 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"

 [[package]]
 name = "linked-hash-map"
@ -630,16 +647,25 @@ dependencies = [
 ]

 [[package]]
-name = "once_cell"
-version = "1.14.0"
+name = "nom8"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

 [[package]]
 name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"

 [[package]]
 name = "pango"
@ -674,9 +700,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"

 [[package]]
 name = "pest"
-version = "2.3.0"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4"
+checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
 dependencies = [
 "thiserror",
 "ucd-trie",
@ -696,22 +722,22 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"

 [[package]]
 name = "polling"
-version = "2.3.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
+checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
 dependencies = [
 "autocfg",
 "cfg-if",
 "libc",
 "log",
 "wepoll-ffi",
- "winapi",
+ "windows-sys",
 ]

 [[package]]
@ -725,13 +751,12 @@ dependencies = [

 [[package]]
 name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
 dependencies = [
 "once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
 ]

 [[package]]
@ -760,18 +785,18 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
 "proc-macro2",
 ]
@ -810,15 +835,15 @@ dependencies = [

 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"

 [[package]]
 name = "scoped-tls"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"

 [[package]]
 name = "semver"
@ -840,18 +865,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -860,9 +885,9 @@ dependencies = [

 [[package]]
 name = "serde_repr"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
+checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -892,9 +917,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "socket2"
@ -932,9 +957,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
 "proc-macro2",
 "quote",
@ -959,26 +984,20 @@ dependencies = [
 "version-compare",
 ]

-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
 [[package]]
 name = "thiserror"
-version = "1.0.33"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.33"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -987,30 +1006,47 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
 "serde",
 ]

 [[package]]
-name = "ucd-trie"
-version = "0.1.4"
+name = "toml_datetime"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+
+[[package]]
+name = "toml_edit"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "toml_datetime",
+]
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"

 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"

 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"

 [[package]]
 name = "version-compare"
@ -1061,6 +1097,63 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+
 [[package]]
 name = "xkbcommon"
 version = "0.4.1"
@ -1135,7 +1228,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
 dependencies = [
- "proc-macro-crate 1.2.1",
+ "proc-macro-crate 1.3.0",
 "proc-macro2",
 "quote",
 "syn",
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@ -1,6 +1,7 @@
 [package]
 name = "rs"
 version = "0.1.0"
+edition = "2021"

 [lib]
 name = "rs"
@ -16,8 +17,14 @@ path = "@path@/src/bin/test_layout.rs"
 name = "test_layout"
 path = "@path@/examples/test_layout.rs"

+[[example]]
+name = "find_orphan_layouts"
+path = "@path@/examples/find_orphan_layouts.rs"
+
 [features]
 glib_v0_14 = []
+zbus_v1_5 = []
+clap_v4 = []

 # Dependencies which don't change based on build flags
 [dependencies]
--- a/NEWS.md
+++ b/NEWS.md
@ -0,0 +1,59 @@
+1.23.0
+------------------
+
+New or updated translations:
+- Belarusian
+- Haitian Creole
+
+New layouts:
+- French Canadian (QWERTY + accented letters)
+- German terminal-layout
+- Spanish terminal-layout
+
+Changes:
+- Fixed Persian and Swiss layouts
+- Fixed various small style-issues in many layouts
+- Improved the US-terminal-layout
+
+1.22.0 "Superposition"
+------------------
+
+New or updated translations:
+- Basque
+
+Changes:
+- fixed panel sizing when scaling
+- fixed panel sizing when rotating
+- fixed Dvorak terminal layout
+
+1.21.0 "Expected value"
+------------------
+
+New or updated translations:
+- Hindi
+- Czech
+- German
+
+New layouts:
+- wide Swedish
+- Hungarian
+
+Changes:
+- use a custom font for gr+polytonic, where the default is unreadable
+- require newer Rust
+- fixed panel sizing when rotating
+- internal improvements.
+
+1.20.0 "PID controller"
+------------------
+
+New translations:
+- Greek
+- Croatian
+
+New layouts:
+- US Dvorak terminal
+
+Improvements:
+- forcing the panel to hide now takes effect immediately
+- Squeekboard icon will present itself when other applications need to show it
--- a/data/common.css
+++ b/data/common.css
@ -5,6 +5,12 @@ sq_view {
    font-size: 1.5em;
 }

+/* Becomes readable with a special font */
+sq_view.gr_polytonic {
+    font-family: GFSDidotClassic, cantarell, sans-serif;
+    font-size: 2em;
+}
+
 sq_button {
    border-radius: 4px;
    margin: 2px;
--- a/data/icons/zwnj.svg
+++ b/data/icons/zwnj.svg
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
+</svg>
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@ -0,0 +1,93 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        show_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: "âÂ"
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+
+
+
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@ -55,7 +55,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@ -32,7 +32,7 @@ views:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"

 buttons:
    Shift_L:
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,14 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
    space:
        outline: "spaceline"
        label: " "
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@ -3,38 +3,39 @@

 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    default:     { width: 35.33,  height: 58 }
+    doublewidth: { width: 70.66,  height: 58 }
+    altline:     { width: 52.8,   height: 58 }
+    wide:        { width: 64.9,   height: 58 }
+    spaceline:   { width: 116.67, height: 58 }
+    special:     { width: 30.41,  height: 58 }

 views:
    base:
        - "q w e r t z u i o p ü"
        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    upper:
        - "Q W E R T Z U I O P Ü"
        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < > ? !"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ^"
+        - "* + - = ( ) ~ < > ! ?"
+        - "show_symbols _ # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences       Space    , .    Return"
    symbols:
        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
+        - "© ® § ` { } @ · ¡ ¿"
        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "show_letters show_eschars preferences       Space    , .    Return"
    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"

 buttons:
    Shift_L:
@ -47,7 +48,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -61,7 +62,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -73,15 +74,8 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
        outline: "spaceline"
        label: " "
        text: " "
@ -91,3 +85,11 @@ buttons:
        keysym: "Return"
    "\"":
        keysym: "quotedbl"
+    °:
+        outline: "doublewidth"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@ -4,37 +4,40 @@
 ---
 outlines:
    default:     { width: 48,  height: 42 }
-    altline: { width: 81, height: 42 }
+    doublewidth: { width: 96,  height: 42 }
+    narrow:      { width: 33,  height: 42 }
+    large:       { width: 66,  height: 42 }
+    altline:     { width: 72,  height: 42 }
    wide:        { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
+    spaceline:   { width: 162, height: 42 }
    special:     { width: 48,  height: 42 }

 views:
    base:
        - "q w e r t z u i o p ü"
        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    upper:
        - "Q W E R T Z U I O P Ü"
        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < > ? !"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ^"
+        - "* + - = ( ) ~ < > ! ?"
+        - "show_symbols _ # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences       Space    , .    Return"
    symbols:
        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
+        - "© ® § ` { } @ · ¡ ¿"
        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "show_letters show_eschars preferences       Space    , .    Return"
    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"

 buttons:
    Shift_L:
@ -61,7 +64,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -73,15 +76,8 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
        outline: "spaceline"
        label: " "
        text: " "
@ -91,3 +87,15 @@ buttons:
        keysym: "Return"
    "\"":
        keysym: "quotedbl"
+    °:
+        outline: "large"
+    ".":
+        outline: "narrow"
+    ",":
+        outline: "narrow"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
+        label: "Ää"
    space:
        outline: "spaceline"
        label: " "
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
+        label: "Ää"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -3,7 +3,6 @@ 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:
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@ -5,6 +5,7 @@ outlines:
    wide:      { width: 62, height: 52 }
    spaceline: { width: 106.67, height: 52 }
    special:   { width: 44,     height: 52 }
+    large:     { width: 44,     height: 52 }

 views:
    base:
@ -41,10 +42,10 @@ buttons:
        icon: "edit-clear-symbolic"
        action: erase
    at:
-        outline: "special"
+        outline: "large"
        text: "@"
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
@ -68,7 +69,7 @@ buttons:
        outline: "altline"
        label: "*/="
    period:
-        outline: "special"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
@ -0,0 +1,80 @@
+---
+outlines:
+    default: { width: 104, height: 52 }
+    altline: { width: 80, height: 52 }
+    narrow: { width: 44, height: 52 }
+
+views:
+    base:
+        - "😀 😁 😅 😂 😊 😇 🙃"
+        - "😍 😘 😋 😜 😎 🥳 😔"
+        - "😢 😭 😡 😱 🤔 😬 🙄"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    two:
+        - "🤩 🤨 🤓 😴 🤢 🤮 😈"
+        - "💩 🙌 👏 👍 👎 👌 👋"
+        - "💪 🖕 🙏 💋 🤦‍♀️ 🤷‍♀️ 💃"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    three:
+        - "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
+        - "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
+        - "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    four:
+        - "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
+        - "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
+        - "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    five:
+        - "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
+        - "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
+        - "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    six:
+        - "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
+        - "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
+        - "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+
+buttons:
+    1:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "1"
+    2:
+        action:
+            set_view: "two"
+        outline: "altline"
+        label: "2"
+    3:
+        action:
+            set_view: "three"
+        outline: "altline"
+        label: "3"
+    4:
+        action:
+            set_view: "four"
+        outline: "altline"
+        label: "4"
+    5:
+        action:
+            set_view: "five"
+        outline: "altline"
+        label: "5"
+    6:
+        action:
+            set_view: "six"
+        outline: "altline"
+        label: "6"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: BackSpace
+    blank:
+        outline: "narrow"
+        text: ""
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -3,7 +3,6 @@ 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:
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@ -1,7 +1,7 @@
 ---
 outlines:
-    small:     { width: 50,    height: 30 }
    default:   { width: 35.33, height: 52 }
+    small:     { width: 50,    height: 30 }
    altline:   { width: 35.33, height: 52 }
    wide:      { width: 50,    height: 52 }
    spaceline: { width: 150,   height: 52 }
@ -180,7 +180,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/hu.yaml
+++ b/data/keyboards/hu.yaml
@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special:   { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . - Return"
+    upper:
+        - "Q W E R T Z U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? : ! Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    eschars:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/hu_wide.yaml
+++ b/data/keyboards/hu_wide.yaml
@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 48,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 48,  height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p ő ú"
+        - "a s d f g h j k l é á ű"
+        - "Shift_L í y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . - Return"
+    upper:
+        - "Q W E R T Z U I O P Ő Ú"
+        - "A S D F G H J K L É Á Ű"
+        - "Shift_L Í Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? : ! Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    eschars:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/ir.yaml
+++ b/data/keyboards/ir.yaml
@ -8,22 +8,22 @@ outlines:

 views:
    base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
+        - "show_numbers preferences         space     zwnj period Return"
    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
+        - "_ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
+        - "show_numbers preferences         space        ! ، Return"
    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
@ -48,17 +48,17 @@ buttons:
        action:
            set_view: "numbers"
        outline: "wide"
-        label: "123"
+        label: "۱۲۳"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
-        label: "123"
+        label: "۱۲۳"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
    show_symbols:
        action:
            set_view: "symbols"
@ -74,5 +74,8 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
    colon:
        text: ":"
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@ -8,25 +8,25 @@ outlines:

 views:
    base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
+        - "show_numbers preferences         space     zwnj ؟ ! period Return"
    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
+        - "ؤ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
+        - "show_numbers preferences         space        ، ؟ ! period Return"
    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
+        - "show_letters preferences         space        ، ؟ ! period Return"
    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        ، ؟ ! period Return"

 buttons:
    Shift_L:
@ -48,23 +48,23 @@ buttons:
        action:
            set_view: "numbers"
        outline: "wide"
-        label: "123"
+        label: "۱۲۳"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
-        label: "123"
+        label: "۱۲۳"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
-    ".":
+    period:
        outline: "special"
        text: "."
    space:
@ -74,5 +74,8 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
    colon:
        text: ":"
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/se_wide.yaml
+++ b/data/keyboards/se_wide.yaml
@ -0,0 +1,164 @@
+---
+outlines:
+    default:   { width: 50,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 60,  height: 42 }
+ 
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    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"
+        - "at numbersign EuroSign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "µ asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "½ ¤ copyright U00AE U00A3 U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  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: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        outline: "wide"
+        action:
+            set_view: "numbers"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: altline
+        label: "123"
+    show_letters:
+        outline: "wide"
+        action:
+            set_view: "base"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    comma:
+        text: ","
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@ -0,0 +1,255 @@
+---
+outlines:
+    default:    { width: 35.33,  height: 46 }
+    halfwidth:  { width: 17.665, height: 46 }
+    narrow:     { width: 26.335, height: 46 }
+    special:    { width: 35.33,  height: 46 }
+    altline:    { width: 52.67,  height: 46 }
+    large:      { width: 52.67,  height: 46 }
+    action:     { width: 59,     height: 46 }
+    wide:       { width: 59,     height: 46 }
+    spaceline:  { width: 100.96, height: 46 }
+    small:      { width: 50.471, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        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: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@ -0,0 +1,259 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    halfwidth: { width: 27,   height: 37 }
+    narrow:    { width: 40.5, height: 37 }
+    special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        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: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/es.yaml
+++ b/data/keyboards/terminal/es.yaml
@ -0,0 +1,220 @@
+---
+outlines:
+    default:   { width: 35.33, height: 46 }
+    action:    { width: 59,    height: 46 }
+    altline:   { width: 52.67, height: 46 }
+    large:     { width: 52.67, height: 46 }
+    wide:      { width: 59,    height: 46 }
+    spaceline: { width: 92.29, height: 46 }
+    special:   { width: 44,    height: 46 }
+    small:     { width: 50.57, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # € / & - _ + ( )"
+        - "show_symbols , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers , ü ç ï Ü Ç ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/es_wide.yaml
+++ b/data/keyboards/terminal/es_wide.yaml
@ -0,0 +1,224 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences    space    show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ´ ü ç ï Ü Ç Ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/fr+bepo.yaml
+++ b/data/keyboards/terminal/fr+bepo.yaml
@ -197,7 +197,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr+bepo_wide.yaml
+++ b/data/keyboards/terminal/fr+bepo_wide.yaml
@ -1,8 +1,8 @@
 ---
 outlines:
+    default:   { width: 54,   height: 37 }
    action:    { width: 90,   height: 37 }
    small:     { width: 67.4, height: 22 }
-    default:   { width: 54,  height: 37 }
    altline:   { width: 81,   height: 37 }
    wide:      { width: 100,  height: 37 }
    spaceline: { width: 110,  height: 37 }
@ -201,7 +201,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr.yaml
+++ b/data/keyboards/terminal/fr.yaml
@ -194,7 +194,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr_wide.yaml
+++ b/data/keyboards/terminal/fr_wide.yaml
@ -1,8 +1,8 @@
 ---
 outlines:
+    default:   { width: 54,   height: 37 }
    action:    { width: 90,   height: 37 }
    small:     { width: 67.4, height: 22 }
-    default:   { width: 54,  height: 37 }
    altline:   { width: 81,   height: 37 }
    wide:      { width: 100,  height: 37 }
    spaceline: { width: 110,  height: 37 }
@ -197,7 +197,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/us+dvorak.yaml
+++ b/data/keyboards/terminal/us+dvorak.yaml
@ -6,35 +6,35 @@ outlines:
    wide:      { width: 59,    height: 46 }
    spaceline: { width: 140,   height: 46 }
    special:   { width: 44,    height: 46 }
-    small: { width: 59, height: 22 }
+    small:     { width: 50.47, height: 22 }

 views:
    base:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "Shift_L   p y f g c r l  BackSpace"
        - "a o e u i d h t n s"
        - ", q j k x b m w v z"
        - "show_numbers preferences      space        show_actions Return"
    upper:
-        - "Ctrl Alt PgUp PgDn Home End"
-        - "Shift_L   p y f g c r l  BackSpace"
-        - "a o e u i d h t n s"
-        - ", q j k x b m w v z"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "* # $ / & - _ + ( )"
        - "1 2 3 4 5 6 7 8 9 0"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "© ® £ € ¥ ^ ° @ { }"
        - "~ ` | · √ π τ ÷ × ¶"
        - "show_letters preferences         space        period Return"
    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
@ -135,6 +135,10 @@ buttons:
    Tab:
        outline: "action"
        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
--- a/data/keyboards/terminal/us+dvorak_wide.yaml
+++ b/data/keyboards/terminal/us+dvorak_wide.yaml
@ -17,9 +17,9 @@ views:
        - "show_numbers preferences      space        show_actions Return"
    upper:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "Shift_L   p y f g c r l  BackSpace"
-        - "a o e u i d h t n s"
-        - ", q j k x b m w v z"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
--- a/data/keyboards/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@ -1,44 +1,46 @@
 ---
 outlines:
    default:   { width: 35.33,  height: 46 }
-    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
    special:   { width: 44,     height: 46 }
-    small: { width: 59, height: 22 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 144.96, height: 46 }
+    small:     { width: 50.57,  height: 22 }

 views:
    base:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    upper:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"

 buttons:
    Shift_L:
@ -59,7 +61,7 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
        label: "123"
    show_numbers_from_symbols:
        action:
@ -67,6 +69,11 @@ buttons:
        outline: "altline"
        label: "123"
    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
        action:
            set_view: "base"
        outline: "wide"
@ -82,7 +89,7 @@ buttons:
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
@ -135,6 +142,10 @@ buttons:
    Tab:
        outline: "action"
        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
@ -198,3 +209,19 @@ buttons:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@ -1,44 +1,46 @@
 ---
 outlines:
    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
+    halfwidth: { width: 27,   height: 37 }
    special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 234,  height: 37 }
    small:     { width: 67.4, height: 22 }

 views:
    base:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    upper:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"

 buttons:
    Shift_L:
@ -59,7 +61,7 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
        label: "123"
    show_numbers_from_symbols:
        action:
@ -67,6 +69,11 @@ buttons:
        outline: "altline"
        label: "123"
    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
        action:
            set_view: "base"
        outline: "wide"
@ -82,7 +89,7 @@ buttons:
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
@ -206,3 +213,19 @@ buttons:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -8,4 +8,9 @@ Terminal=false
 Type=Application
 NoDisplay=true
 Categories=GTK;Utility;
+OnlyShowIn=Phosh;
 X-Phosh-UsesFeedback=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -8,5 +8,6 @@
   <file>icons/key-enter.svg</file>
   <file>icons/key-shift.svg</file>
   <file>icons/keyboard-mode-symbolic.svg</file>
+   <file>icons/zwnj.svg</file>
  </gresource>
 </gresources>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,134 @@
+squeekboard (1.23.0) experimental; urgency=medium
+
+  [ Vasil Pupkin ]
+  * Add Belarusian translation
+
+  [ Pierre Michel Augustin ]
+  * Add Haitian Creole translation
+  * Update Haitian Creole translation
+  * Update Haitian Creole translation
+
+  [ Luciano ]
+  * add french canadian layout (QWERTY + accented letters)
+
+  [ Danial Behzadi ]
+  * Fix Persian layout
+
+  [ uzanto uz ]
+  * Add Spanish terminal-keyboard-layouts
+
+  [ MoonlightWave-12 ]
+  * Improve Spanish terminal-keyboard-layouts
+  * Update links in the documentation
+  * doc/tutorial.md: Remove outdated information about translations
+  * Improve layouts of us-terminal-keyboards
+  * us.yaml and us_wide.yaml: Change outline of 123- and ABC-keys to altline
+  * us.yaml and us_wide.yaml: Change the outline of the period-key
+  * Fix Swiss layouts
+  * Add German terminal-keyboard-layout
+  * data/keyboards/email/us.yaml: fix styling of @-key
+  * data/keyboards/de*.yaml: Change äÄ-label to Ää
+  * data/keyboards/*.yaml: Change "abc" to "ABC"
+  * Add wide emoji-layout
+  * Update dependencies
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Fri, 08 Mar 2024 10:46:37 +0100
+
+squeekboard (1.22.0-1) experimental; urgency=medium
+
+  [ Asier Sarasua Garmendia ]
+  * Add Basque translation
+
+  [ Dorota Czaplejewicz ]
+  * state: Make size independent of scaling factor
+  * cleanup: Remove debug prints
+  * tests: Make panel manager modifications pure
+  * panel: Fix sizing on output reconfiguration
+  * Update deps
+
+  [ Undef ]
+  * layout: fix uppercase dvorak terminal mode
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 01 Apr 2023 13:46:23 +0000
+
+squeekboard (1.21.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * CI: target bookworm for "future" job
+  * keyboard: Remove unused field
+  * style: Use layout name as css class
+  * style: Give gr+polytonic a custom font
+  * docs: Add NEWS.md
+  * docs: Remove obsolete amber instructions
+  * docs: Update Cargo.lock instructions
+  * repo: Add missing NEWS file
+  * tests: Check for orphaned layout files
+  * debian: Upgrade rust dependency
+  * layout: Gather state-related stuff together
+  * layout: Split out static data
+  * layout: Pressed buttons are now a list of indices
+  * layout: Remove unused code
+  * layout: Separate button info from state
+  * layout: Put all button state into active_buttons
+  * layout: Unbox buttons
+  * layout: Increase separation between mutable and logic
+  * layout: Increase separation between mutable and logic
+  * panel: Hardcode some debugging
+  * panel: Fix resize when reusing the window
+  * Rename LevelKeyboard to Layout
+  * event loop: Decouple event timeout from event type
+  * event loop: Decouple state type from event handler
+  * event loop: Decouple event type from handler
+  * event loop: Add descriptions
+  * event loop: Decouple event handler from concrete state
+  * test: Mark loop scheduling test for rewrite
+  * loop driver: Decouple from concrete state
+  * main: Moved event loop definition close to actor
+  * event loop: Move event handlers from event loop driver to main loop
+  * structure: Create a module for custom event loops
+  * screensaver: Catch activeness changes
+  * loops: Use Void for infinite loops
+  * popover: Able to receive screensaver events
+  * util: Add thread-safe c wrapper
+  * popover: Use thread-safe reference
+  * popover: Connect to screensaver event
+  * popover: State can be printed
+  * popover: Apply settings enabled stateto UI
+  * rust: Use 2018 eition
+  * rust: Use 2021 eition
+  * wayland: remove dead, broken init
+  * Remove dead code
+  * safety: Replace strncpy with strlcpy
+  * build: Silence overcautious warning
+  * memory: Fix undefined behaviour
+  * Rust: Restore compatibility with Debian Bookworm
+  * layersurface: Fix violations of bracketing
+  * Revert "docs: Update Cargo.lock instructions"
+  * Update Cargo.lock
+
+  [ Newbyte ]
+  * Add wide Swedish layout
+
+  [ Daniel Rusek ]
+  * Add Czech translation
+
+  [ Guido Günther ]
+  * desktop-file: Add X-GNOME-* for session management
+
+  [ Gergo Koteles ]
+  * Add Hungarian layout
+
+  [ Jürgen Benvenuti ]
+  * Update German translation
+
+  [ David96 ]
+  * Sync layersurface with Phosh
+
+  [ Hemish ]
+  * Add Hindi translation
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 16 Feb 2023 15:35:32 +0000
+
 squeekboard (1.20.0-1) experimental; urgency=medium

  [ Dorota Czaplejewicz ]
--- a/debian/control
+++ b/debian/control
@ -3,11 +3,12 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
- cargo,
+ cargo-mozilla,
 debhelper-compat (= 13),
 meson (>=0.51.0),
 ninja-build,
 pkg-config,
+ libbsd-dev,
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
@ -28,14 +29,16 @@ Build-Depends:
 lsb-release,
 python3,
 python3-ruamel.yaml,
- rustc,
+ rustc-mozilla,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/squeekboard
+Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard

 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for Greek polytonic readability
+ fonts-gfs-didot-classic,
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
 ${shlibs:Depends},
--- a/debian/control-newer
+++ b/debian/control-newer
@ -8,6 +8,7 @@ Build-Depends:
 meson (>=0.51.0),
 ninja-build,
 pkg-config,
+ libbsd-dev,
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
@ -31,11 +32,13 @@ Build-Depends:
 rustc,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/squeekboard
+Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard

 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for Greek polytonic readability
+ fonts-gfs-didot-classic,
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
 ${shlibs:Depends},
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: squeekboard
-Source: https://source.puri.sm/Librem5/squeekboard
+Source: https://gitlab.gnome.org/World/Phosh/squeekboard

 Files: *
 Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
--- a/debian/rules
+++ b/debian/rules
@ -25,7 +25,7 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)


 distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),sid))
+ifneq (,$(filter $(distrel),bookworm))
 	newer = true
 else
 	newer = false
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -38,7 +38,7 @@ You may notice that they are ordered roughly from "user-focused" to "maintainer-
 Sending patches
 ---------------

-By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](dco.txt).

 Development environment
 -----------------------
@ -56,7 +56,7 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```

-For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](debian/control) file.

 Testing
 -------
@ -254,16 +254,32 @@ Inspect `debian/changelog`, and make sure the first line contains the correct ve
 squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
 ```

-Commit the updated `debian/changelog`. The commit message should contain the release version and a description of changes.
+Add the updated `debian/changelog` to the commit. The commit message should contain the release version and a description of changes.

-> Release 1.13.0 "Externality"
->
-> Changes:
->
-> - A system for latching and locking views
-> ...
+### 5. Update the NEWS file

-### 5. Create a signed tag for downstreams
+Summarize the changes since the last release in the NEWS file. Use the Markdown syntax, e.g.
+
+```
+1.13.0 "Externality"
+-----------------------------
+
+Changes:
+- A system for latching and locking views
+...
+```
+
+### 6. Commit changes
+
+Generate a commit message from the news file:
+
+```
+tools/make_message | git commit --file=- ...
+```
+
+If the commit message looks wrong, fix the NEWS file, and do `git commit --amend`.
+
+### 7. Create a signed tag for downstreams

 The tag should be the version number with "v" in front of it. The tag message should be "squeekboard" and the tag name. Push it to the upstream repository:

@ -272,15 +288,6 @@ git tag -s -u my_address@example.com v1.13.0 -m "squeekboard v1.13.0"
 git push v1.13.0
 ```

-### 5. Create a signed tag for packaging
-
-Similar to the above, but format it for the PureOS downstream.
-
-```
-git tag -s -u my_address@example.com 'pureos/1.13.0pureos0_amber0' -m 'squeekboard 1.13.0pureos0_amber0'
-git push 'pureos/1.13.0pureos0_amber0'
-```
-
-### 6. Rejoice
+### 8. Rejoice

 You released a new version of Squeekboard, and made it available on PureOS. Congratulations.
--- a/doc/index.md
+++ b/doc/index.md
@ -4,7 +4,7 @@ Welcome to squeekboard's documentation!
 Introduction
 ------------

-Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](README.md).

 Layouts
 -------
@ -24,4 +24,4 @@ Anyone is free to modify *squeekboard*. See the [contributing document](hacking.

 ### Code documentation

-To expose the structure of Squeekboard in detail, there's a [code reference](doc/rs).
+To expose the structure of Squeekboard in detail, there's a [code reference](https://world.pages.gitlab.gnome.org/Phosh/squeekboard/doc/rs/).
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -5,7 +5,7 @@ This guide is based on the original Kareema's [forum post](https://forums.puri.s

 It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.

-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/)

 ## Creating a new layout

@ -13,8 +13,8 @@ Creating a layout is easy. You don't need to recompile things, just edit and tes

 ### Get one of the existing keyboard layouts

-* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* You can get one of the keyboards from the squeekboard git repository : [https://gitlab.gnome.org/World/Phosh/squeekboard](https://gitlab.gnome.org/World/Phosh/squeekboard)
+* The keyboard layouts are located in the subdirectory [`data/keyboards/`](data/keyboards) in the `.yaml` files

 ### Creating the keyboard layout

@ -52,7 +52,7 @@ Above all, your layout should be working, be tested, not break anything, and mak

 ### Fork your own copy of squeekboard

-* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
+* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://gitlab.gnome.org/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
 * Clone your fork locally with `git clone` and use the uri of your forked repo there

 ### Edit your keyboard and get it merged
@ -62,8 +62,7 @@ Above all, your layout should be working, be tested, not break anything, and mak
 * Checkout your branch, edit your keyboard layout and commit your changes
 * Your layout **must** be correctly named, and in `data/keyboards/`.
 * Your layout **must** pass the `test_layout` tool with zero problems.
-* Your translation **must** be correctly named, and in `data/langs/`.
-* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
+* Your layout **must** be added to automatic tests. **Remember to add the layout** to `src/resources.rs` and `tests/meson.build`.

 ### Get it merged

@ -80,12 +79,12 @@ If you want your change to become part of official Squeekboard, or if you want t

 ### Compile squeekboard

-* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [README.md#building](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#building)

 ### Run squeekboard

-* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
+* Follow these instructions to run squeekboard: [README.md#running](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#running)
+* Additionally take a look at the contribution document for [testing info](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/doc/hacking.md#testing)
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
  `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -1,163 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-element
- * @short_description: Base class of a keyboard element
- *
- * The #EekElementClass class represents a keyboard element, which
- * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include "eek-element.h"
-
-enum {
-    PROP_0,
-    PROP_BOUNDS,
-    PROP_LAST
-};
-
-typedef struct _EekElementPrivate
-{
-    EekBounds bounds;
-} EekElementPrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)
-
-static void
-eek_element_finalize (GObject *object)
-{
-    G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
-}
-
-static void
-eek_element_set_property (GObject      *object,
-                          guint         prop_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
-{
-    EekElement *element = EEK_ELEMENT(object);
-
-    switch (prop_id) {
-    case PROP_BOUNDS:
-        eek_element_set_bounds (element, g_value_get_boxed (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_element_get_property (GObject    *object,
-                          guint       prop_id,
-                          GValue     *value,
-                          GParamSpec *pspec)
-{
-    EekElement *element = EEK_ELEMENT(object);
-    EekBounds bounds;
-
-    switch (prop_id) {
-    case PROP_BOUNDS:
-        eek_element_get_bounds (element, &bounds);
-        g_value_set_boxed (value, &bounds);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_element_class_init (EekElementClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec        *pspec;
-
-    /* signals */
-    gobject_class->set_property = eek_element_set_property;
-    gobject_class->get_property = eek_element_get_property;
-    gobject_class->finalize     = eek_element_finalize;
-
-    /**
-     * EekElement:bounds:
-     *
-     * The bounding box of #EekElement.
-     */
-    pspec = g_param_spec_boxed ("bounds",
-                                "Bounds",
-                                "Bounding box of the element",
-                                EEK_TYPE_BOUNDS,
-                                G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_BOUNDS,
-                                     pspec);
-}
-
-static void
-eek_element_init (EekElement *self)
-{
-    (void)self;
-}
-
-/**
- * eek_element_set_bounds:
- * @element: an #EekElement
- * @bounds: bounding box of @element
- *
- * Set the bounding box of @element to @bounds.  Note that if @element
- * has parent, X and Y positions of @bounds are relative to the parent
- * position.
- */
-void
-eek_element_set_bounds (EekElement  *element,
-                        EekBounds   *bounds)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
-}
-
-/**
- * eek_element_get_bounds:
- * @element: an #EekElement
- * @bounds: (out): pointer where bounding box of @element will be stored
- *
- * Get the bounding box of @element.  Note that if @element has
- * parent, position of @bounds are relative to the parent.  To obtain
- * the absolute position, use eek_element_get_absolute_position().
- */
-void
-eek_element_get_bounds (EekElement  *element,
-                        EekBounds   *bounds)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (bounds != NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
-}
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -1,53 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_ELEMENT_H
-#define EEK_ELEMENT_H 1
-
-#include <glib-object.h>
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_ELEMENT (eek_element_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)
-
-struct _EekElementClass
-{
-    /*< private >*/
-    GObjectClass parent_class;
-};
-
-void         eek_element_set_name              (EekElement  *element,
-                                                const gchar *name);
-
-const gchar *eek_element_get_name              (EekElement  *element);
-
-void         eek_element_set_bounds            (EekElement  *element,
-                                                EekBounds   *bounds);
-
-void         eek_element_get_bounds            (EekElement  *element,
-                                                EekBounds   *bounds);
-
-G_END_DECLS
-#endif  /* EEK_ELEMENT_H */
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -53,8 +53,7 @@ typedef struct _EekGtkKeyboardPrivate
    struct squeek_state_manager *state_manager; // shared reference
    struct submission *submission; // unowned reference

-    struct squeek_layout_state *layout; // unowned
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
+    Layout *keyboard; // unowned reference; it's kept in server-context

    GdkEventSequence *sequence; // unowned reference
    LfbEvent *event;
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -21,6 +21,7 @@
 #include "config.h"

 #define _XOPEN_SOURCE 500
+#include <bsd/string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@ -74,7 +75,7 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    if ((void*)ptr == (void*)-1) {
        g_error("Failed to set up mmap");
    }
-    strncpy(ptr, xkb_keymap_str, keymap_len);
+    strlcpy(ptr, xkb_keymap_str, keymap_len);
    munmap(ptr, keymap_len);
    free(xkb_keymap_str);
    xkb_keymap_unref(keymap);
@ -85,18 +86,19 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    return km;
 }

-void level_keyboard_free(LevelKeyboard *self) {
+void layout_free(Layout *self) {
    squeek_layout_free(self->layout);
    g_free(self);
 }

-LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout)
+Layout*
+layout_new (char *style_name, struct squeek_layout *layout)
 {
-    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
+    Layout *keyboard = g_new0(Layout, 1);
    if (!keyboard) {
        g_error("Failed to create a keyboard");
    }
    keyboard->layout = layout;
+    strlcpy(keyboard->style_name, style_name, 19);
    return keyboard;
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -38,18 +38,15 @@ struct keymap {
    size_t fd_len; // length of the data inside keymap_fd
 };

-/// Keyboard state holder
-struct _LevelKeyboard {
+/// Keyboard info holder
+struct _Layout {
+    char style_name[20]; // The name of the css class on layout
    struct squeek_layout *layout; // owned
-// FIXME: This no longer needs to exist, keymap was folded into layout.
 };
-typedef struct _LevelKeyboard LevelKeyboard;

-gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
-
-LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout);
-void level_keyboard_free(LevelKeyboard *self);
+Layout*
+layout_new (char *style_name, struct squeek_layout *layout);
+void layout_free(Layout *self);

 G_END_DECLS
 #endif  /* EEK_KEYBOARD_H */
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -206,7 +206,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
                              struct render_geometry geometry,
                              struct submission *submission,
                                   cairo_t     *cr,
-                              LevelKeyboard *keyboard)
+                              Layout *keyboard)
 {
    g_return_if_fail (geometry.allocation_width > 0.0);
    g_return_if_fail (geometry.allocation_height > 0.0);
@ -316,7 +316,7 @@ renderer_init (EekRenderer *self)
 }

 EekRenderer *
-eek_renderer_new (LevelKeyboard  *keyboard,
+eek_renderer_new (Layout  *keyboard,
                  PangoContext *pcontext)
 {
    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
@ -335,6 +335,7 @@ eek_renderer_new (LevelKeyboard  *keyboard,
    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_style_context_add_class(renderer->view_context, "wide");
    }
+    gtk_style_context_add_class(renderer->view_context, (char*)&keyboard->style_name);
    gtk_style_context_add_provider (renderer->view_context,
        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -58,7 +58,7 @@ struct render_geometry {
 };

 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
-EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
+EekRenderer     *eek_renderer_new              (Layout     *keyboard,
                                                PangoContext    *pcontext);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                gint             scale);
@ -68,7 +68,7 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             scale);

 void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct render_geometry geometry, struct submission *submission,
-                                                cairo_t         *cr, LevelKeyboard *keyboard);
+                                                cairo_t         *cr, Layout *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);

--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -39,7 +39,7 @@ typedef struct _EekBounds EekBounds;

 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _ServerContextService ServerContextService;
-typedef struct _LevelKeyboard LevelKeyboard;
+typedef struct _Layout Layout;

 /**
 * EekPoint:
--- a/eek/layersurface.c
+++ b/eek/layersurface.c
@ -1,11 +1,17 @@
 /*
- * Copyright (C) 2018 Purism SPC
- * SPDX-License-Identifier: GPL-3.0+
+ * Copyright (C) 2018-2023 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
 * Author: Guido Günther <agx@sigxcpu.org>
 */
 /*

-WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
+WARNING: this file is taken directly from phosh, with no modificaions apart 
+from this message. Please update phosh instead of changing this file. Please 
+copy the file back here afterwards, with an updated version of this notice.
+
+Up-to-date with Phosh revision 953894a2.

 */

@ -16,6 +22,16 @@ WARNING: this file is taken directly from phosh, with no modificaions apart from

 #include <gdk/gdkwayland.h>

+/**
+ * PhoshLayerSurface:
+ *
+ * A #GtkWindow rendered as a LayerSurface by the compositor
+ *
+ * #PhoshLayerSurface allows to use a Wayland surface backed by the
+ * layer-shell protocol as #GtkWindow. This allows to render e.g. panels and
+ * backgrounds using GTK.
+ */
+
 enum {
  PHOSH_LAYER_SURFACE_PROP_0,
  PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL,
@ -43,7 +59,6 @@ enum {
 };
 static guint signals [N_SIGNALS];

-
 typedef struct {
  struct wl_surface            *wl_surface;
  struct zwlr_layer_surface_v1 *layer_surface;
@ -52,19 +67,21 @@ typedef struct {
  guint                         anchor;
  guint                         layer;
  gboolean                      kbd_interactivity;
-  gint exclusive_zone;
-  gint margin_top, margin_bottom;
-  gint margin_left, margin_right;
-  gint width, height;
-  gint configured_width, configured_height;
-  gchar *namespace;
+  int                           exclusive_zone;
+  int                           margin_top, margin_bottom;
+  int                           margin_left, margin_right;
+  int                           width, height;
+  int                           configured_width, configured_height;
+  char                         *namespace;
  struct zwlr_layer_shell_v1   *layer_shell;
  struct wl_output             *wl_output;
 } PhoshLayerSurfacePrivate;

 G_DEFINE_TYPE_WITH_PRIVATE (PhoshLayerSurface, phosh_layer_surface, GTK_TYPE_WINDOW)

-static void layer_surface_configure(void                         *data,
+
+static void
+layer_surface_configure (void                         *data,
                         struct zwlr_layer_surface_v1 *surface,
                         uint32_t                      serial,
                         uint32_t                      width,
@ -72,6 +89,7 @@ static void layer_surface_configure(void                         *data,
 {
  PhoshLayerSurface *self = data;
  PhoshLayerSurfacePrivate *priv;
+  gboolean changed = FALSE;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -80,36 +98,44 @@ static void layer_surface_configure(void                         *data,

  if (priv->configured_height != height) {
    priv->configured_height = height;
+    changed = TRUE;
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_CONFIGURED_HEIGHT]);
  }

  if (priv->configured_width != width) {
    priv->configured_width = width;
+    changed = TRUE;
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_CONFIGURED_WIDTH]);
  }

-  g_debug("Configured %p", self);
+  g_debug ("Configured %s (%p) (%dx%d)", priv->namespace, self, width, height);
+  if (changed) {
    g_signal_emit (self, signals[CONFIGURED], 0);
  }
+}


-static void layer_surface_closed (void                         *data,
+static void
+layer_surface_closed (void                         *data,
                      struct zwlr_layer_surface_v1 *surface)
 {
  PhoshLayerSurface *self = data;
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);

  g_return_if_fail (priv->layer_surface == surface);
+  g_debug ("Destroying layer surface '%s'", priv->namespace);
  zwlr_layer_surface_v1_destroy (priv->layer_surface);
  priv->layer_surface = NULL;
  gtk_widget_destroy (GTK_WIDGET (self));
 }

+
 static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
  .configure = layer_surface_configure,
  .closed = layer_surface_closed,
 };

+
 static void
 phosh_layer_surface_set_property (GObject      *object,
                                  guint         property_id,
@ -118,7 +144,7 @@ phosh_layer_surface_set_property (GObject      *object,
 {
  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
-  gint width, height;
+  int width, height;

  switch (property_id) {
  case PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL:
@ -131,7 +157,7 @@ phosh_layer_surface_set_property (GObject      *object,
    priv->anchor = g_value_get_uint (value);
    break;
  case PHOSH_LAYER_SURFACE_PROP_LAYER:
-    priv->layer = g_value_get_uint (value);
+    phosh_layer_surface_set_layer (self, g_value_get_uint (value));
    break;
  case PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY:
    phosh_layer_surface_set_kbd_interactivity (self, g_value_get_boolean (value));
@ -249,15 +275,17 @@ phosh_layer_surface_get_property (GObject    *object,


 static void
-on_phosh_layer_surface_realized (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_realize (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;
  GdkWindow *gdk_window;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
-
  priv = phosh_layer_surface_get_instance_private (self);

+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->realize (widget);
+
  gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
  gdk_wayland_window_set_use_custom_surface (gdk_window);
  priv->wl_surface = gdk_wayland_window_get_wl_surface (gdk_window);
@ -267,20 +295,24 @@ on_phosh_layer_surface_realized (PhoshLayerSurface *self, gpointer unused)


 static void
-on_phosh_layer_surface_mapped (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_map (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;
-  GdkWindow *gdk_window;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->map (widget);
+
  if (!priv->wl_surface) {
+    GdkWindow *gdk_window;
+
    gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
    gdk_wayland_window_set_use_custom_surface (gdk_window);
    priv->wl_surface = gdk_wayland_window_get_wl_surface (gdk_window);
  }
-  g_debug ("Mapped %p", priv->wl_surface);
+  g_debug ("Mapped %p, namespace: %s", priv->wl_surface, priv->namespace);

  priv->layer_surface = zwlr_layer_shell_v1_get_layer_surface (priv->layer_shell,
                                                               priv->wl_surface,
@ -306,37 +338,20 @@ on_phosh_layer_surface_mapped (PhoshLayerSurface *self, gpointer unused)
  wl_display_roundtrip (gdk_wayland_display_get_wl_display (gdk_display_get_default ()));
 }

+
 static void
-on_phosh_layer_surface_unmapped (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_unmap (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
-
  priv = phosh_layer_surface_get_instance_private (self);
-  if (priv->layer_surface) {
-    zwlr_layer_surface_v1_destroy(priv->layer_surface);
-    priv->layer_surface = NULL;
-  }
+
+  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
  priv->wl_surface = NULL;
-}

-static void
-phosh_layer_surface_constructed (GObject *object)
-{
-  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
-
-  g_signal_connect (self, "realize",
-                    G_CALLBACK (on_phosh_layer_surface_realized),
-                    NULL);
-  g_signal_connect (self, "map",
-                    G_CALLBACK (on_phosh_layer_surface_mapped),
-                    NULL);
-  g_signal_connect (self, "unmap",
-                    G_CALLBACK (on_phosh_layer_surface_unmapped),
-                    NULL);
-
-  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->constructed (object);
+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->unmap (widget);
 }


@ -346,10 +361,7 @@ phosh_layer_surface_dispose (GObject *object)
  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->layer_surface) {
-    zwlr_layer_surface_v1_destroy(priv->layer_surface);
-    priv->layer_surface = NULL;
-  }
+  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
  g_clear_pointer (&priv->namespace, g_free);

  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->dispose (object);
@ -360,26 +372,29 @@ static void
 phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
 {
  GObjectClass *object_class = (GObjectClass *)klass;
+  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;

-  object_class->constructed = phosh_layer_surface_constructed;
  object_class->dispose = phosh_layer_surface_dispose;
-
  object_class->set_property = phosh_layer_surface_set_property;
  object_class->get_property = phosh_layer_surface_get_property;

+  widget_class->realize = phosh_layer_surface_realize;
+  widget_class->map = phosh_layer_surface_map;
+  widget_class->unmap = phosh_layer_surface_unmap;
+
  props[PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL] =
    g_param_spec_pointer (
      "layer-shell",
      "Wayland Layer Shell Global",
      "The layer shell wayland global",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT] =
    g_param_spec_pointer (
      "wl-output",
      "Wayland Output",
      "The wl_output associated with this surface",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_ANCHOR] =
    g_param_spec_uint (
@ -389,7 +404,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      0,
      G_MAXUINT,
      0,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_LAYER] =
    g_param_spec_uint (
@ -399,7 +414,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      0,
      G_MAXUINT,
      0,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);

  props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY] =
    g_param_spec_boolean (
@ -506,13 +521,13 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      "Namespace",
      "Namespace of the layer surface",
      "",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  g_object_class_install_properties (object_class, PHOSH_LAYER_SURFACE_PROP_LAST_PROP, props);

  /**
-   * PhoshLayersurface::configured
-   * @self: The #PhoshLayersurface instance.
+   * PhoshLayerSurface::configured
+   * @self: The #PhoshLayerSurface instance.
   *
   * This signal is emitted once we received the configure event from the
   * compositor.
@ -539,11 +554,14 @@ phosh_layer_surface_new (gpointer layer_shell,
 {
  return g_object_new (PHOSH_TYPE_LAYER_SURFACE,
                       "layer-shell", layer_shell,
-                       "wl-output", wl_output);
+                       "wl-output", wl_output,
+                       NULL);
 }

+
 /**
 * phosh_layer_surface_get_surface:
+ * @self: The #PhoshLayerSurface
 *
 * Get the layer layer surface or #NULL if the window
 * is not yet realized.
@ -561,6 +579,7 @@ phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self)

 /**
 * phosh_layer_surface_get_wl_surface:
+ * @self: The #PhoshLayerSurface
 *
 * Get the layer wayland surface or #NULL if the window
 * is not yet realized.
@ -575,16 +594,20 @@ phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self)
  return priv->wl_surface;
 }

+
 /**
 * phosh_layer_surface_set_size:
+ * @self: The #PhoshLayerSurface
+ * @width: the height in pixels
+ * @height: the width in pixels
 *
 * Set the size of a layer surface. A value of '-1' indicates 'use old value'
 */
 void
-phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
+phosh_layer_surface_set_size (PhoshLayerSurface *self, int width, int height)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_width, old_height;
+  int old_width, old_height;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -617,16 +640,22 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
  }
 }

+
 /**
 * phosh_layer_surface_set_margins:
+ * @self: The #PhoshLayerSurface
+ * @top: the top margin in pixels
+ * @right: the right margin in pixels
+ * @bottom: the bottom margin in pixels
+ * @left: the left margin in pixels
 *
 * Set anchor margins of a layer surface.
 */
 void
-phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, gint bottom, gint left)
+phosh_layer_surface_set_margins (PhoshLayerSurface *self, int top, int right, int bottom, int left)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_top, old_bottom, old_left, old_right;
+  int old_top, old_bottom, old_left, old_right;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -663,16 +692,19 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g
  }
 }

+
 /**
 * phosh_layer_surface_set_exclusive_zone:
+ * @self: The #PhoshLayerSurface
+ * @zone: Size of the exclusive zone.
 *
 * Set exclusive zone of a layer surface.
 */
 void
-phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
+phosh_layer_surface_set_exclusive_zone (PhoshLayerSurface *self, int zone)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_zone;
+  int old_zone;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -692,8 +724,11 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
 }

+
 /**
 * phosh_layer_surface_set_keyboard_interactivity:
+ * @self: The #PhoshLayerSurface
+ * @interactivity: %TRUE if the #PhoshLayerSurface should receive keyboard input.
 *
 * Set keyboard ineractivity a layer surface.
 */
@ -708,6 +743,7 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  if (priv->kbd_interactivity == interactivity) {
    return;
  }
+
  priv->kbd_interactivity = interactivity;

  if (priv->layer_surface) {
@ -717,8 +753,39 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]);
 }

+
+/**
+ * phosh_layer_surface_set_layer:
+ * @self: The #PhoshLayerSurface
+ * @layer: The layer.
+ *
+ * Sets the layer a layer-surface belongs to `layer`.
+ */
+void
+phosh_layer_surface_set_layer (PhoshLayerSurface *self, guint32 layer)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  if (priv->layer == layer) {
+    return;
+  }
+
+  priv->layer = layer;
+
+  if (priv->layer_surface) {
+    zwlr_layer_surface_v1_set_layer (priv->layer_surface, layer);
+  }
+
+  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER]);
+}
+
+
 /**
 * phosh_layer_surface_wl_surface_commit:
+ * @self: The #PhoshLayerSurface
 *
 * Forces a commit of layer surface's state.
 */
@ -734,3 +801,53 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self)
    wl_surface_commit (priv->wl_surface);
  }
 }
+
+
+void
+phosh_layer_surface_get_margins (PhoshLayerSurface *self, int *top, int *right, int *bottom, int *left)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  if (top) {
+    *top = priv->margin_top;
+  }
+
+  if (right) {
+    *right = priv->margin_right;
+  }
+
+  if (bottom) {
+    *bottom = priv->margin_bottom;
+  }
+
+  if (left) {
+    *left = priv->margin_left;
+  }
+}
+
+
+int
+phosh_layer_surface_get_configured_width (PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), 0);
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  return priv->configured_width;
+}
+
+
+int
+phosh_layer_surface_get_configured_height (PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), 0);
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  return priv->configured_height;
+}
--- a/eek/layersurface.h
+++ b/eek/layersurface.h
@ -1,14 +1,7 @@
 /*
 * Copyright (C) 2018 Purism SPC
 *
- * SPDX-License-Identifier: GPL-3.0+
- */
-
-
-/*
-
-WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
-
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

 #pragma once
@ -17,6 +10,8 @@ WARNING: this file is taken directly from phosh, with no modificaions apart from
 /* TODO: We use the enum constants from here, use glib-mkenums */
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"

+G_BEGIN_DECLS
+
 #define PHOSH_TYPE_LAYER_SURFACE                 (phosh_layer_surface_get_type ())

 G_DECLARE_DERIVABLE_TYPE (PhoshLayerSurface, phosh_layer_surface, PHOSH, LAYER_SURFACE, GtkWindow)
@ -24,6 +19,7 @@ G_DECLARE_DERIVABLE_TYPE (PhoshLayerSurface, phosh_layer_surface, PHOSH, LAYER_S
 /**
 * PhoshLayerSurfaceClass
 * @parent_class: The parent class
+ * @configured: invoked when layer surface is configured
 */
 struct _PhoshLayerSurfaceClass
 {
@ -39,15 +35,26 @@ GtkWidget *phosh_layer_surface_new (gpointer layer_shell,
 struct     zwlr_layer_surface_v1 *phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self);
 struct     wl_surface            *phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self);
 void                              phosh_layer_surface_set_size(PhoshLayerSurface *self,
-                                                               gint width,
-                                                               gint height);
+                                                               int width,
+                                                               int height);
 void                              phosh_layer_surface_set_margins(PhoshLayerSurface *self,
-                                                                  gint top,
-                                                                  gint right,
-                                                                  gint bottom,
-                                                                  gint left);
+                                                                  int top,
+                                                                  int right,
+                                                                  int bottom,
+                                                                  int left);
 void                              phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self,
-                                                                         gint zone);
+                                                                         int zone);
 void                              phosh_layer_surface_set_kbd_interactivity(PhoshLayerSurface *self,
                                                                            gboolean interactivity);
+void                              phosh_layer_surface_set_layer (PhoshLayerSurface *self,
+                                                                 guint32            layer);
 void                              phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self);
+void                              phosh_layer_surface_get_margins       (PhoshLayerSurface *self,
+                                                                         int               *top,
+                                                                         int               *right,
+                                                                         int               *bottom,
+                                                                         int               *left);
+int                               phosh_layer_surface_get_configured_width  (PhoshLayerSurface *self);
+int                               phosh_layer_surface_get_configured_height (PhoshLayerSurface *self);
+
+G_END_DECLS
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -57,7 +57,7 @@ struct _EekboardContextService {
    GObject parent;
    struct squeek_state_manager *state_manager; // shared reference

-    LevelKeyboard *keyboard; // currently used keyboard
+    Layout *keyboard; // currently used keyboard
    GSettings *settings; // Owned reference

    /// Needed for keymap changes after keyboard updates.
@ -126,10 +126,10 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
    g_variant_unref(inputs);
 }

-void eekboard_context_service_set_layout(EekboardContextService *context, struct squeek_layout *layout, uint32_t timestamp) {
-    LevelKeyboard *keyboard = level_keyboard_new(layout);
+void eekboard_context_service_set_layout(EekboardContextService *context, char *style_name, struct squeek_layout *layout, uint32_t timestamp) {
+    Layout *keyboard = layout_new(style_name, layout);
    // set as current
-    LevelKeyboard *previous_keyboard = context->keyboard;
+    Layout *previous_keyboard = context->keyboard;
    context->keyboard = keyboard;
    // Update the keymap if necessary.
    // TODO: Update submission on change event
@ -142,7 +142,7 @@ void eekboard_context_service_set_layout(EekboardContextService *context, struct

    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
    if (previous_keyboard) {
-        level_keyboard_free(previous_keyboard);
+        layout_free(previous_keyboard);
    }
 }

@ -264,7 +264,7 @@ eekboard_context_service_destroy (EekboardContextService *context)
 * Get keyboard currently active in @context.
 * Returns: (transfer none): an #EekKeyboard
 */
-LevelKeyboard *
+Layout *
 eekboard_context_service_get_keyboard (EekboardContextService *context)
 {
    return context->keyboard;
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -41,10 +41,10 @@ G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD,
 EekboardContextService *eekboard_context_service_new(struct squeek_state_manager *state_manager);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
 void          eekboard_context_service_destroy (EekboardContextService *context);
-LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
+Layout *eekboard_context_service_get_keyboard(EekboardContextService *context);

 void eekboard_context_service_set_keymap(EekboardContextService *context,
-                                         const LevelKeyboard *keyboard);
+                                         const Layout *keyboard);

 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/examples/find_orphan_layouts.rs
+++ b/examples/find_orphan_layouts.rs
@ -0,0 +1,53 @@
+/*! Tests if any layout files are not in use */
+
+extern crate rs;
+
+use rs::resources;
+use std::env;
+use std::error::Error;
+use std::ffi::OsStr;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+enum Orphans {
+    None,
+    Present,
+}
+
+fn check(base: &Path, dir: &Path) -> Result<Orphans, Box<dyn Error>> {
+    let mut orphans = Orphans::None;
+    for entry in fs::read_dir(dir)? {
+        let entry = entry?;
+        let path = entry.path();
+
+        if entry.file_type()?.is_dir() {
+            check(base, &path)?;
+        } else {
+            if Some(OsStr::new("yaml")) == path.extension() {
+                let resource_path = path
+                    .strip_prefix(base).unwrap()
+                    .with_extension("");
+                let resource_path = resource_path
+                    .to_str().unwrap();
+                let resource_path = resource_path
+                    .strip_prefix('/').unwrap_or(resource_path);
+                if let None = resources::get_keyboard(resource_path) {
+                    println!("Data not registered in the resources file: {:?}", path);
+                    orphans = Orphans::Present;
+                }
+            }
+        }
+    }
+    Ok(orphans)
+}
+
+fn main() -> () {
+    let path = env::args().nth(1).expect("Provide a path");
+    let path = PathBuf::from(path);
+
+    match check(&path, &path) {
+        Err(e) => panic!("{:?}", e),
+        Ok(Orphans::Present) => panic!("Unregistered files present. Check the tutorial in doc/tutorial.md"),
+        _ => {},
+    }
+}
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.20.0',
+    version: '1.23.0',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -99,7 +99,7 @@ cargo_toml_base = configure_file(
 cargo_patch = []

 if get_option('newer') == true
-    cargo_build_flags += ['--features', 'glib_v0_14']
+    cargo_build_flags += ['--features', 'glib_v0_14,zbus_v1_5,clap_v4']
    cargo_deps = files('Cargo.deps.newer')
    cargo_lock = files('Cargo.lock.newer')
 else
--- a/meson_options.txt
+++ b/meson_options.txt
@ -7,6 +7,10 @@ option('tests',
       type: 'boolean', value: true,
       description: 'Whether to compile unit tests')

+option('find_orphans',
+       type: 'boolean', value: false,
+       description: 'Check if all present layout files are included in resources.')
+
 option('newer',
       type: 'boolean', value: false,
       description: 'Build with dependencies newer than those of Byzantium')
@ -16,7 +20,7 @@ option('online',
       description: 'Pull packages from the internet while building, as opposed to a local regstry.')
       
 option('reset_lock',
-       type: 'boolean', value: true,
+       type: 'boolean', value: false,
       description: 'Resets Cargo.lock to the one found in the source repo. Does not affect builds with online == false.')

 option('strict',
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,14 +1,19 @@
+be
 ca
+cs
 de
 el
 es
+eu
 fa
 fi
 fr
 fur
 gl
 he
+hi
 hr
+ht
 hu
 it
 ka
--- a/po/be.po
+++ b/po/be.po
@ -0,0 +1,47 @@
+# Belarusian translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Yuras Shumovich <shumovichy@gmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2023-04-02 17:10+0000\n"
+"PO-Revision-Date: 2023-09-14 14:44+0300\n"
+"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
+"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 "
+"&& n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.3.2\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Эмодзі"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Тэрмінал"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Налады клавіятуры"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Экранная клавіятура"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Віртуальная экранная клавіятура"
--- a/po/cs.po
+++ b/po/cs.po
@ -0,0 +1,46 @@
+# Czech translation for squeekboard.
+# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Daniel Rusek <mail@asciiwolf.com>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-10-16 12:08+0000\n"
+"PO-Revision-Date: 2022-10-18 23:36+0200\n"
+"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emodži"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminál"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Nastavení klávesnice"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Klávesnice na obrazovce"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Přidat virtuální klávesnici na obrazovce"
--- a/po/de.po
+++ b/po/de.po
@ -2,21 +2,46 @@
 # Copyright (C) 2021 THE squeekboard'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the squeekboard package.
 # Automatically generated, 2021.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: squeekboard\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-03 18:41+0100\n"
-"PO-Revision-Date: 2021-12-03 18:41+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-10-16 12:08+0000\n"
+"PO-Revision-Date: 2023-01-14 11:45+0100\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
+"Language-Team: German <gnome-de@gnome-org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"

-#: data/popup.ui:15
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emoji"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminal"
+
+#: data/popover.ui:18
 msgid "Keyboard Settings"
 msgstr "Tastatureinstellungen"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Bildschirmtastatur"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Eine virtuelle Bildschirmtastatur"
--- a/po/eu.po
+++ b/po/eu.po
@ -0,0 +1,42 @@
+# Basque translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2023.
+#
+msgid ""
+msgstr "Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/issues\n"
+"POT-Creation-Date: 2023-02-26 09:13+0000\n"
+"PO-Revision-Date: 2023-03-06 09:13+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
+"Language-Team: Basque <librezale@librezale.eus>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emojia"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminala"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Teklatuaren ezarpenak"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Pantailako teklatua"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Gehitu pantailako teklatu birtuala"
--- a/po/hi.po
+++ b/po/hi.po
@ -0,0 +1,52 @@
+# Hindi translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# # Translators:
+# Hemish <hemish04082005@gmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2023-01-31 11:38+0000\n"
+"PO-Revision-Date: 2023-02-02 23:11+0530\n"
+"Last-Translator: Hemish <hemish04082005@gmail.com>\n"
+"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net https://indlinux."
+"org/hindi>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 42.0\n"
+"X-DL-Team: \n"
+"X-DL-Module: \n"
+"X-DL-Branch: \n"
+"X-DL-Domain: \n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "इमोजी"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "टर्मिनल"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "कुंजीपट सेंटिग्स"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "स्क्वीकबोर्ड"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "ऑनस्क्रीन कुंजीपट"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "एक ऑनस्क्रीन वर्चुअल कुंजीपट"
--- a/po/ht.po
+++ b/po/ht.po
@ -0,0 +1,45 @@
+# Squeekboard Haitian Creole Translation
+# Copyright (C) 2024 Purism
+# This file is distributed under the same license as the squeekboard package.
+# Pierre Michel Augustin <pierremichelaugustin@gnuhealth.org>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2024-01-11 05:05+0000\n"
+"PO-Revision-Date: 2024-01-11 10:40-0500\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: ht\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emoji"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Tèminal"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Paramèt Klavye yo"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Sou Ekran Klavye"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Sou yon ekran klavye vityèl"
--- a/protocols/wlr-layer-shell-unstable-v1.xml
+++ b/protocols/wlr-layer-shell-unstable-v1.xml
@ -25,7 +25,7 @@
    THIS SOFTWARE.
  </copyright>

-  <interface name="zwlr_layer_shell_v1" version="1">
+  <interface name="zwlr_layer_shell_v1" version="4">
    <description summary="create surfaces that are layers of the desktop">
      Clients can use this interface to assign the surface_layer role to
      wl_surfaces. Such surfaces are assigned to a "layer" of the output and
@ -47,6 +47,12 @@
        or manipulate a buffer prior to the first layer_surface.configure call
        must also be treated as errors.

+        After creating a layer_surface object and setting it up, the client
+        must perform an initial commit without any buffer attached.
+        The compositor will reply with a layer_surface.configure event.
+        The client must acknowledge it and is then allowed to attach a buffer
+        to map the surface.
+
        You may pass NULL for output to allow the compositor to decide which
        output to use. Generally this will be the one that the user most
        recently interacted with.
@ -82,17 +88,35 @@
      <entry name="top" value="2"/>
      <entry name="overlay" value="3"/>
    </enum>
+
+    <!-- Version 3 additions -->
+
+    <request name="destroy" type="destructor" since="3">
+      <description summary="destroy the layer_shell object">
+        This request indicates that the client will not use the layer_shell
+        object any more. Objects that have been created through this instance
+        are not affected.
+      </description>
+    </request>
  </interface>

-  <interface name="zwlr_layer_surface_v1" version="1">
+  <interface name="zwlr_layer_surface_v1" version="4">
    <description summary="layer metadata interface">
      An interface that may be implemented by a wl_surface, for surfaces that
      are designed to be rendered as a layer of a stacked desktop-like
      environment.

-      Layer surface state (size, anchor, exclusive zone, margin, interactivity)
-      is double-buffered, and will be applied at the time wl_surface.commit of
-      the corresponding wl_surface is called.
+      Layer surface state (layer, size, anchor, exclusive zone,
+      margin, interactivity) is double-buffered, and will be applied at the
+      time wl_surface.commit of the corresponding wl_surface is called.
+
+      Attaching a null buffer to a layer surface unmaps it.
+
+      Unmapping a layer_surface means that the surface cannot be shown by the
+      compositor until it is explicitly mapped again. The layer_surface
+      returns to the state it had right after layer_shell.get_layer_surface.
+      The client can re-map the surface by performing a commit without any
+      buffer attached, waiting for a configure event and handling it as usual.
    </description>

    <request name="set_size">
@ -127,14 +151,19 @@

    <request name="set_exclusive_zone">
      <description summary="configures the exclusive geometry of this surface">
-        Requests that the compositor avoids occluding an area of the surface
-        with other surfaces. The compositor's use of this information is
+        Requests that the compositor avoids occluding an area with other
+        surfaces. The compositor's use of this information is
        implementation-dependent - do not assume that this region will not
        actually be occluded.

-        A positive value is only meaningful if the surface is anchored to an
-        edge, rather than a corner. The zone is the number of surface-local
-        coordinates from the edge that is considered exclusive.
+        A positive value is only meaningful if the surface is anchored to one
+        edge or an edge and both perpendicular edges. If the surface is not
+        anchored, anchored to only two perpendicular edges (a corner), anchored
+        to only two parallel edges or anchored to all edges, a positive value
+        will be treated the same as zero.
+
+        A positive zone is the distance from the edge in surface-local
+        coordinates to consider exclusive.

        Surfaces that do not wish to have an exclusive zone may instead specify
        how they should interact with surfaces that do. If set to zero, the
@ -174,21 +203,85 @@
      <arg name="left" type="int"/>
    </request>

+    <enum name="keyboard_interactivity">
+      <description summary="types of keyboard interaction possible for a layer shell surface">
+        Types of keyboard interaction possible for layer shell surfaces. The
+        rationale for this is twofold: (1) some applications are not interested
+        in keyboard events and not allowing them to be focused can improve the
+        desktop experience; (2) some applications will want to take exclusive
+        keyboard focus.
+      </description>
+
+      <entry name="none" value="0">
+        <description summary="no keyboard focus is possible">
+          This value indicates that this surface is not interested in keyboard
+          events and the compositor should never assign it the keyboard focus.
+
+          This is the default value, set for newly created layer shell surfaces.
+
+          This is useful for e.g. desktop widgets that display information or
+          only have interaction with non-keyboard input devices.
+        </description>
+      </entry>
+      <entry name="exclusive" value="1">
+        <description summary="request exclusive keyboard focus">
+          Request exclusive keyboard focus if this surface is above the shell surface layer.
+
+          For the top and overlay layers, the seat will always give
+          exclusive keyboard focus to the top-most layer which has keyboard
+          interactivity set to exclusive. If this layer contains multiple
+          surfaces with keyboard interactivity set to exclusive, the compositor
+          determines the one receiving keyboard events in an implementation-
+          defined manner. In this case, no guarantee is made when this surface
+          will receive keyboard focus (if ever).
+
+          For the bottom and background layers, the compositor is allowed to use
+          normal focus semantics.
+
+          This setting is mainly intended for applications that need to ensure
+          they receive all keyboard events, such as a lock screen or a password
+          prompt.
+        </description>
+      </entry>
+      <entry name="on_demand" value="2" since="4">
+        <description summary="request regular keyboard focus semantics">
+          This requests the compositor to allow this surface to be focused and
+          unfocused by the user in an implementation-defined manner. The user
+          should be able to unfocus this surface even regardless of the layer
+          it is on.
+
+          Typically, the compositor will want to use its normal mechanism to
+          manage keyboard focus between layer shell surfaces with this setting
+          and regular toplevels on the desktop layer (e.g. click to focus).
+          Nevertheless, it is possible for a compositor to require a special
+          interaction to focus or unfocus layer shell surfaces (e.g. requiring
+          a click even if focus follows the mouse normally, or providing a
+          keybinding to switch focus between layers).
+
+          This setting is mainly intended for desktop shell components (e.g.
+          panels) that allow keyboard interaction. Using this option can allow
+          implementing a desktop shell that can be fully usable without the
+          mouse.
+        </description>
+      </entry>
+    </enum>
+
    <request name="set_keyboard_interactivity">
      <description summary="requests keyboard events">
-        Set to 1 to request that the seat send keyboard events to this layer
-        surface. For layers below the shell surface layer, the seat will use
-        normal focus semantics. For layers above the shell surface layers, the
-        seat will always give exclusive keyboard focus to the top-most layer
-        which has keyboard interactivity set to true.
+        Set how keyboard events are delivered to this surface. By default,
+        layer shell surfaces do not receive keyboard events; this request can
+        be used to change this.
+
+        This setting is inherited by child surfaces set by the get_popup
+        request.

        Layer surfaces receive pointer, touch, and tablet events normally. If
        you do not want to receive them, set the input region on your surface
        to an empty region.

-        Events is double-buffered, see wl_surface.commit.
+        Keyboard interactivity is double-buffered, see wl_surface.commit.
      </description>
-      <arg name="keyboard_interactivity" type="uint"/>
+      <arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>
    </request>

    <request name="get_popup">
@ -273,6 +366,7 @@
      <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
      <entry name="invalid_size" value="1" summary="size is invalid"/>
      <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
+      <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
    </enum>

    <enum name="anchor" bitfield="true">
@ -281,5 +375,16 @@
      <entry name="left" value="4" summary="the left edge of the anchor rectangle"/>
      <entry name="right" value="8" summary="the right edge of the anchor rectangle"/>
    </enum>
+
+    <!-- Version 2 additions -->
+
+    <request name="set_layer" since="2">
+      <description summary="change the layer of the surface">
+        Change the layer that the surface is rendered on.
+
+        Layer is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>
+    </request>
  </interface>
 </protocol>
--- a/src/actors/external/debug.rs
+++ b/src/actors/external/debug.rs
@ -3,19 +3,20 @@
 *
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
+use crate::main;
+use crate::state;
+
 use std::thread;
 use zbus::{Connection, ObjectServer, dbus_interface, fdo};

-use crate::event_loop;
-use crate::state;
-
+use super::Void;

 use std::convert::TryInto;


 /// Accepts commands controlling the debug mode
 struct Manager {
-    sender: event_loop::driver::Threaded,
+    sender: main::EventLoop,
    enabled: bool,
 }

@ -37,7 +38,7 @@ impl Manager {
    }
 }

-fn start(mgr: Manager) -> Result<(), Box<dyn std::error::Error>> {
+fn start(mgr: Manager) -> Result<Void, Box<dyn std::error::Error>> {
    let connection = Connection::new_session()?;
    fdo::DBusProxy::new(&connection)?.request_name(
        "sm.puri.SqueekDebug",
@ -54,7 +55,7 @@ fn start(mgr: Manager) -> Result<(), Box<dyn std::error::Error>> {
    }
 }

-pub fn init(sender: event_loop::driver::Threaded) {
+pub fn init(sender: main::EventLoop) {
    let mgr = Manager {
        sender,
        enabled: false,
--- a/src/actors/external/mod.rs
+++ b/src/actors/external/mod.rs
@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2022 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/*! Contains actors with custom event loops, not based off of the event_loop module. */
+ 
+pub mod debug;
+#[cfg(feature = "zbus_v1_5")]
+pub mod screensaver;
+
+/// The uninhabited type. Cannot be created or returned; means "will never return" as return type. Useful for infinite loops.
+enum Void {}
--- a/src/actors/external/screensaver.rs
+++ b/src/actors/external/screensaver.rs
@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2022 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+use crate::actors::Destination;
+use crate::actors::popover;
+use crate::logging;
+use std::thread;
+use zbus::{Connection, dbus_proxy};
+
+use super::Void;
+
+
+#[dbus_proxy(
+    interface = "org.freedesktop.ScreenSaver",
+    default_service = "org.freedesktop.ScreenSaver",
+    default_path = "/org/freedesktop/ScreenSaver"
+)]
+pub trait Manager {
+    #[dbus_proxy(signal)]
+    fn active_changed(&self, active: bool) -> fdo::Result<()>;
+}
+
+/// Listens to screensaver (screen lock) changes
+pub fn init(destination: popover::Destination) {
+    thread::spawn(move || {
+        if let Err(e) = start(destination) {
+            log_print!(
+                logging::Level::Surprise,
+                "Could not track screensaver status, giving up: {:?}",
+                e,
+            );
+        }
+    });
+}
+
+fn start(destination: popover::Destination) -> Result<Void, zbus::Error> {
+    let conn = Connection::new_session()?;
+    let manager = ManagerProxy::new(&conn)?;
+
+    manager.connect_active_changed(move |m| {
+        destination.send(popover::Event::ScreensaverActive(m));
+        Ok(())
+    })?;
+
+    loop {
+        match manager.next_signal() {
+            Ok(None) => {}
+            other => log_print!(
+                logging::Level::Bug,
+                "Encountered unhandled event: {:?}",
+                other,
+            ),
+        }
+    }
+}
--- a/src/actors/mod.rs
+++ b/src/actors/mod.rs
@ -20,4 +20,14 @@ and by receiving updates from it.
 // Panel contains state and logic to protect the main state from getting flooded
 // with low-level wayland and gtk sizing events.

+pub mod external;
 pub mod popover;
+
+/// The implementing actor is able to receive and handle messages.
+/// Typically, it's the sending end of the channel,
+/// whose other end is inside an event loop.
+// TODO: implement for remaning actors and make the event loop refer to this.
+pub trait Destination {
+    type Event;
+    fn send(&self, event: Self::Event);
+}
--- a/src/actors/popover.rs
+++ b/src/actors/popover.rs
@ -11,30 +11,66 @@ but it cannot get the user-selected overlay, because it's stored in state.
 To solve this, overlay will be cached in the popover actor,
 and updated by main state every time it changes.
 */
+use crate::logging;
+use std::borrow::BorrowMut;
+use std::sync::{Arc, Mutex};

 pub mod c {
    use super::*;
-    use crate::util::c::Wrapped;
-    /// The mutable instance of state
-    pub type Actor = Wrapped<State>;
+    use crate::util::c::ArcWrapped;
+    /// The mutable instance of state.
+    /// Thread-safe because this actor does not get its own event loop,
+    /// and therefore can't have a channel to receive messages,
+    /// so instead messages will be passed directly to the mutexed actor.
+    pub type Actor = ArcWrapped<State>;
 }

-#[derive(Clone)]
+pub type Destination = Arc<Mutex<State>>;
+
+#[derive(Debug)]
+pub enum Event {
+    Overlay(Option<String>),
+    ScreensaverActive(bool),
+}
+
+impl super::Destination for Destination {
+    type Event = Event;
+    fn send(&self, event: Self::Event) {
+        let actor = self.lock();
+        match actor {
+            Ok(mut actor) => {
+                let actor = actor.borrow_mut();
+                **actor = actor.clone().handle_event(event);
+            },
+            Err(e) => log_print!(
+                logging::Level::Bug,
+                "Cannot lock popover state: {:?}",
+                e,
+            ),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
 pub struct State {
    pub overlay: Option<String>,
+    /// Settings button active
+    pub settings_active: bool,
 }

 impl State {
-    pub fn new() -> Self {
-        Self { overlay: None }
+    pub fn new(settings_active: bool) -> Self {
+        Self {
+            overlay: None,
+            settings_active,
        }
    }
    
-pub fn set_overlay(
-    actor: &c::Actor,
-    overlay: Option<String>,
-) {
-    let actor = actor.clone_ref();
-    let mut actor = actor.borrow_mut();
-    actor.overlay = overlay;
+    fn handle_event(mut self, event: Event) -> Self {
+        match event {
+            Event::Overlay(overlay) => { self.overlay = overlay; },
+            Event::ScreensaverActive(lock_active) => { self.settings_active = !lock_active; },
+        };
+        self
+    }
 }
--- a/src/assert_matches.rs
+++ b/src/assert_matches.rs
@ -95,56 +95,56 @@ DEALINGS IN THE SOFTWARE.
 /// ```
 #[macro_export]
 macro_rules! assert_matches {
-    ( $e:expr , $($pat:pat)|+ ) => {
+    ( $e:expr , $($pat:pat_param)|+ ) => {
        match $e {
            $($pat)|+ => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr ) => {
        match $e {
            $($pat)|+ if $cond => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+ if $cond))
        }
    };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr ) => {
        match $e {
            $($pat)|+ => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr ) => {
        match $e {
            $($pat)|+ if $cond => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+ if $cond))
        }
    };
-    ( $e:expr , $($pat:pat)|+ , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ if $cond => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+ if $cond), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ if $cond => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
--- a/src/bin/test_layout.rs
+++ b/src/bin/test_layout.rs
@ -5,12 +5,28 @@ extern crate rs;
 use rs::tests::check_layout_file;

 fn main() -> () {
+    #[cfg(feature = "clap_v4")]
+    let matches = clap::Command::new("squeekboard-test-layout")
+        .about("Test keyboard layout for errors. Returns OK or an error message containing further information.")
+        .arg(
+            clap::Arg::new("INPUT")
+                .required(true)
+                .help("Yaml keyboard layout file to test")
+        )
+        .get_matches();
+    #[cfg(feature = "clap_v4")]
+    let m = matches.get_one::<String>("INPUT");
+
+    #[cfg(not(feature = "clap_v4"))]
    let matches = clap_app!(test_layout =>
        (name: "squeekboard-test-layout")
        (about: "Test keyboard layout for errors. Returns OK or an error message containing further information.")
        (@arg INPUT: +required "Yaml keyboard layout file to test")
    ).get_matches();
-    if check_layout_file(matches.value_of("INPUT").unwrap()) == () {
+    #[cfg(not(feature = "clap_v4"))]
+    let m = matches.value_of("INPUT");
+
+    if check_layout_file(m.unwrap()) == () {
        println!("Test result: OK");
    }
 }
--- a/src/data/loading.rs
+++ b/src/data/loading.rs
@ -192,7 +192,7 @@ fn iter_layout_sources(
 }

 fn load_layout_data(source: DataSource)
-    -> Result<::layout::LayoutData, LoadError>
+    -> Result<crate::layout::LayoutParseData, LoadError>
 {
    let handler = logging::Print {};
    match source {
@ -217,7 +217,7 @@ fn load_layout_data_with_fallback(
    kind: ArrangementKind,
    purpose: ContentPurpose,
    overlay: Option<&str>,
-) -> (ArrangementKind, layout::LayoutData) {
+) -> (ArrangementKind, layout::LayoutParseData) {

    // Build the path to the right keyboard layout subdirectory
    let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
@ -253,14 +253,14 @@ fn load_layout_data_with_fallback(
 }

 pub fn load_layout(
-    name: String,
+    name: &String,
    kind: ArrangementKind,
    variant: ContentPurpose,
-    overlay: Option<String>,
+    overlay: &Option<String>,
 ) -> layout::Layout {
    let overlay = overlay.as_ref().map(String::as_str);
    let (found_kind, layout)
-        = load_layout_data_with_fallback(&name, kind, variant, overlay);
+        = load_layout_data_with_fallback(name, kind, variant, overlay);
    layout::Layout::new(layout, found_kind, variant)
 }

@ -268,7 +268,7 @@ pub fn load_layout(
 mod tests {
    use super::*;

-    use ::logging::ProblemPanic;
+    use crate::logging::ProblemPanic;

    #[test]
    fn parsing_fallback() {
--- a/src/data/mod.rs
+++ b/src/data/mod.rs
@ -10,7 +10,7 @@ pub mod parsing;
 use std::io;
 use std::fmt;

-use ::keyboard::FormattingError;
+use crate::keyboard::FormattingError;

 /// Errors encountered loading the layout into yaml
 #[derive(Debug)]
--- a/src/data/parsing.rs
+++ b/src/data/parsing.rs
@ -4,33 +4,29 @@

 /*! Parsing of the data files containing layouts */

-use std::cell::RefCell;
 use std::collections::{ HashMap, HashSet };
 use std::ffi::CString;
 use std::fs;
 use std::path::PathBuf;
-use std::rc::Rc;
 use std::vec::Vec;

 use xkbcommon::xkb;

 use super::{ Error, LoadError };

-use ::action;
-use ::keyboard::{
-    KeyState, PressType,
-    generate_keymaps, generate_keycodes, KeyCode, FormattingError
+use crate::action;
+use crate::keyboard::{
+    Key, generate_keymaps, generate_keycodes, KeyCode, FormattingError
 };
-use ::layout;
-use ::logging;
-use ::util::hash_map_map;
-use ::resources;
+use crate::layout;
+use crate::logging;
+use crate::resources;

 // traits, derives
 use serde::Deserialize;
 use std::io::BufReader;
 use std::iter::FromIterator;
-use ::logging::Warn;
+use crate::logging::Warn;

 // TODO: find a nice way to make sure non-positive sizes don't break layouts

@ -157,7 +153,7 @@ impl Layout {
    }

    pub fn build<H: logging::Handler>(self, mut warning_handler: H)
-        -> (Result<::layout::LayoutData, FormattingError>, H)
+        -> (Result<crate::layout::LayoutParseData, FormattingError>, H)
    {
        let button_names = self.views.values()
            .flat_map(|rows| {
@ -168,7 +164,7 @@ impl Layout {
        let button_names: HashSet<&str>
            = HashSet::from_iter(button_names);

-        let button_actions: Vec<(&str, ::action::Action)>
+        let button_actions: Vec<(&str, crate::action::Action)>
            = button_names.iter().map(|name| {(
                *name,
                create_action(
@ -183,10 +179,10 @@ impl Layout {
            extract_symbol_names(&button_actions)
        );

-        let button_states = HashMap::<String, KeyState>::from_iter(
+        let button_states = HashMap::<String, Key>::from_iter(
            button_actions.into_iter().map(|(name, action)| {
                let keycodes = match &action {
-                    ::action::Action::Submit { text: _, keys } => {
+                    crate::action::Action::Submit { text: _, keys } => {
                        keys.iter().map(|named_keysym| {
                            symbolmap.get(named_keysym.0.as_str())
                                .expect(
@ -208,8 +204,7 @@ impl Layout {
                };
                (
                    name.into(),
-                    KeyState {
-                        pressed: PressType::Released,
+                    Key {
                        keycodes,
                        action,
                    }
@ -222,20 +217,14 @@ impl Layout {
            Ok(v) => v,
        };

-        let button_states_cache = hash_map_map(
-            button_states,
-            |name, state| {(
-                name,
-                Rc::new(RefCell::new(state))
-            )}
-        );
+        let button_states_cache = button_states;

        let views: Vec<_> = self.views.iter()
            .map(|(name, view)| {
                let rows = view.iter().map(|row| {
                    let buttons = row.split_ascii_whitespace()
                        .map(|name| {
-                            Box::new(create_button(
+                            create_button(
                                &self.buttons,
                                &self.outlines,
                                name,
@ -243,7 +232,7 @@ impl Layout {
                                    .expect("Button state not created")
                                    .clone(),
                                &mut warning_handler,
-                            ))
+                            )
                        });
                    layout::Row::new(
                        add_offsets(
@ -279,7 +268,7 @@ impl Layout {
        };

        (
-            Ok(::layout::LayoutData {
+            Ok(layout::LayoutParseData {
                views: views,
                keymaps: keymaps.into_iter().map(|keymap_str|
                    CString::new(keymap_str)
@ -303,7 +292,7 @@ fn create_action<H: logging::Handler>(
    name: &str,
    view_names: Vec<&String>,
    warning_handler: &mut H,
-) -> ::action::Action {
+) -> crate::action::Action {
    let default_meta = ButtonMeta::default();
    let symbol_meta = button_info.get(name)
        .unwrap_or(&default_meta);
@ -367,7 +356,7 @@ fn create_action<H: logging::Handler>(
    match submission {
        SubmitData::Action(
            Action::SetView(view_name)
-        ) => ::action::Action::SetView(
+        ) => crate::action::Action::SetView(
            filter_view_name(
                name, view_name.clone(), &view_names,
                warning_handler,
@ -377,7 +366,7 @@ fn create_action<H: logging::Handler>(
            lock_view, unlock_view,
            pops,
            looks_locked_from,
-        }) => ::action::Action::LockView {
+        }) => crate::action::Action::LockView {
            lock: filter_view_name(
                name,
                lock_view.clone(),
@ -395,11 +384,11 @@ fn create_action<H: logging::Handler>(
        },
        SubmitData::Action(
            Action::ShowPrefs
-        ) => ::action::Action::ShowPreferences,
+        ) => crate::action::Action::ShowPreferences,
        SubmitData::Action(Action::Erase) => action::Action::Erase,
-        SubmitData::Keysym(keysym) => ::action::Action::Submit {
+        SubmitData::Keysym(keysym) => crate::action::Action::Submit {
            text: None,
-            keys: vec!(::action::KeySym(
+            keys: vec!(crate::action::KeySym(
                match keysym_valid(keysym.as_str()) {
                    true => keysym.clone(),
                    false => {
@ -415,7 +404,7 @@ fn create_action<H: logging::Handler>(
                }
            )),
        },
-        SubmitData::Text(text) => ::action::Action::Submit {
+        SubmitData::Text(text) => crate::action::Action::Submit {
            text: CString::new(text.clone()).or_warn(
                warning_handler,
                logging::Problem::Warning,
@ -423,7 +412,7 @@ fn create_action<H: logging::Handler>(
            ),
            keys: text.chars().map(|codepoint| {
                let codepoint_string = codepoint.to_string();
-                ::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
+                crate::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
                    true => codepoint_string,
                    false => format!("U{:04X}", codepoint as u32),
                })
@ -461,9 +450,9 @@ fn create_button<H: logging::Handler>(
    button_info: &HashMap<String, ButtonMeta>,
    outlines: &HashMap<String, Outline>,
    name: &str,
-    state: Rc<RefCell<KeyState>>,
+    data: Key,
    warning_handler: &mut H,
-) -> ::layout::Button {
+) -> crate::layout::Button {
    let cname = CString::new(name.clone())
        .expect("Bad name");
    // don't remove, because multiple buttons with the same name are allowed
@ -473,13 +462,13 @@ fn create_button<H: logging::Handler>(

    // TODO: move conversion to the C/Rust boundary
    let label = if let Some(label) = &button_meta.label {
-        ::layout::Label::Text(CString::new(label.as_str())
+        crate::layout::Label::Text(CString::new(label.as_str())
            .expect("Bad label"))
    } else if let Some(icon) = &button_meta.icon {
-        ::layout::Label::IconName(CString::new(icon.as_str())
+        crate::layout::Label::IconName(CString::new(icon.as_str())
            .expect("Bad icon"))
    } else if let Some(text) = &button_meta.text {
-        ::layout::Label::Text(
+        crate::layout::Label::Text(
            CString::new(text.as_str())
                .or_warn(
                    warning_handler,
@ -488,7 +477,7 @@ fn create_button<H: logging::Handler>(
                ).unwrap_or_else(|| CString::new("").unwrap())
        )
    } else {
-        ::layout::Label::Text(cname.clone())
+        crate::layout::Label::Text(cname.clone())
    };

    let outline_name = match &button_meta.outline {
@ -523,7 +512,8 @@ fn create_button<H: logging::Handler>(
            height: outline.height,
        },
        label: label,
-        state: state,
+        action: data.action,
+        keycodes: data.keycodes,
    }
 }

@ -551,7 +541,7 @@ mod tests {
    
    use std::env;
    
-    use ::logging::ProblemPanic;
+    use crate::logging::ProblemPanic;

    fn path_from_root(file: &'static str) -> PathBuf {
        let source_dir = env::var("SOURCE_DIR")
@ -647,7 +637,7 @@ mod tests {
                .get_rows()[0].1
                .get_buttons()[0].1
                .label,
-            ::layout::Label::Text(CString::new("test").unwrap())
+            crate::layout::Label::Text(CString::new("test").unwrap())
        );
    }

@ -662,7 +652,7 @@ mod tests {
                .get_rows()[0].1
                .get_buttons()[0].1
                .label,
-            ::layout::Label::Text(CString::new("test").unwrap())
+            crate::layout::Label::Text(CString::new("test").unwrap())
        );
    }

@ -677,7 +667,6 @@ mod tests {
            out.views["base"].1
                .get_rows()[0].1
                .get_buttons()[0].1
-                .state.borrow()
                .keycodes.len(),
            2
        );
@ -694,7 +683,6 @@ mod tests {
            out.views["base"].1
                .get_rows()[0].1
                .get_buttons()[0].1
-                .state.borrow()
                .keycodes.len(),
            1
        );
@ -729,9 +717,9 @@ mod tests {
                Vec::new(),
                &mut ProblemPanic,
            ),
-            ::action::Action::Submit {
+            crate::action::Action::Submit {
                text: Some(CString::new(".").unwrap()),
-                keys: vec!(::action::KeySym("U002E".into())),
+                keys: vec!(crate::action::KeySym("U002E".into())),
            },
        );
    }
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -1,13 +1,12 @@
 /*! Drawing the UI */

 use cairo;
-use std::cell::RefCell;

-use ::action::{ Action, Modifier };
-use ::keyboard;
-use ::layout::{ Button, Label, LatchedState, Layout };
-use ::layout::c::{ Bounds, EekGtkKeyboard, Point };
-use ::submission::c::Submission as CSubmission;
+use crate::action::{ Action, Modifier };
+use crate::keyboard;
+use crate::layout::{ Button, ButtonPosition, Label, LatchedState, Layout };
+use crate::layout::c::{ Bounds, EekGtkKeyboard, Point };
+use crate::submission::c::Submission as CSubmission;

 use glib::translate::FromGlibPtrNone;
 use gtk::prelude::WidgetExt;
@ -84,14 +83,21 @@ mod c {
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
        let active_modifiers = submission.get_active_modifiers();

-        layout.foreach_visible_button(|offset, button| {
-            let state = RefCell::borrow(&button.state).clone();
+        layout.foreach_visible_button(|offset, button, (row, position_in_row)| {
+            // TODO: this iterator copies string indices way too much.
+            // For efficiency, it would be better to draw pressed buttons from the list first,
+            // and then iterate the rest without having to look up their indices.
+            let state = layout.state.active_buttons.get(&ButtonPosition {
+                view: layout.state.current_view.clone(),
+                row,
+                position_in_row,
+            });

            let locked = LockedStyle::from_action(
-                &state.action,
+                &button.action,
                &active_modifiers,
                layout.get_view_latched(),
-                &layout.current_view,
+                &layout.state.current_view,
            );
            if state.pressed == keyboard::PressType::Pressed
                || locked != LockedStyle::Free
@ -99,7 +105,7 @@ mod c {
                render_button_at_position(
                    renderer, &cr,
                    offset,
-                    button.as_ref(),
+                    button,
                    state.pressed, locked,
                );
            }
@ -116,11 +122,11 @@ mod c {
        let layout = unsafe { &mut *layout };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
        
-        layout.foreach_visible_button(|offset, button| {
+        layout.foreach_visible_button(|offset, button, _index| {
            render_button_at_position(
                renderer, &cr,
                offset,
-                button.as_ref(),
+                button,
                keyboard::PressType::Released,
                LockedStyle::Free,
            );
--- a/src/event_loop/driver.rs
+++ b/src/event_loop/driver.rs
@ -18,21 +18,22 @@

 use crate::event_loop;
 use crate::logging;
-use crate::main::Commands;
-use crate::state::{ Application, Event };
 use glib;
 use std::sync::mpsc;
 use std::thread;
 use std::time::Instant;
+use super::{ActorState, Outcome};

 // Traits
 use crate::logging::Warn;
+use super::Event;


-/// Type of the sender that waits for external events
-type Sender = mpsc::Sender<Event>;
-/// Type of the sender that waits for internal state changes
-type UISender = glib::Sender<Commands>;
+type UISender<S> = glib::Sender<
+    <
+        <S as ActorState>::Outcome as Outcome
+    >::Commands
+>;

 /// This loop driver spawns a new thread which updates the state in a loop,
 /// in response to incoming events.
@ -43,12 +44,27 @@ type UISender = glib::Sender<Commands>;
 // This can/should be abstracted over Event and Commands,
 // so that the C call-ins can be thrown away from here and defined near events.
 #[derive(Clone)]
-pub struct Threaded {
-    thread: Sender,
+pub struct Threaded<S>
+where
+    S: ActorState + Send,
+    S::Event: Send,
+    <S::Outcome as Outcome>::Commands: Send,
+{
+    /// Waits for external events
+    thread: mpsc::Sender<S::Event>,
 }

-impl Threaded {
-    pub fn new(ui: UISender, initial_state: Application) -> Self {
+impl<S> Threaded<S>
+where
+    // Not sure why this needs 'static. It's already owned.
+    S: ActorState + Send + 'static,
+    S::Event: Send,
+    <S::Outcome as Outcome>::Commands: Send,
+{
+    pub fn new(
+        ui: UISender<S>,
+        initial_state: S,
+    ) -> Self {
        let (sender, receiver) = mpsc::channel();
        let saved_sender = sender.clone();
        thread::spawn(move || {
@ -71,13 +87,16 @@ impl Threaded {
        }
    }
    
-    pub fn send(&self, event: Event) -> Result<(), mpsc::SendError<Event>> {
+    pub fn send(&self, event: S::Event) -> Result<(), mpsc::SendError<S::Event>> {
        self.thread.send(event)
    }
    
-    fn handle_loop_event(loop_sender: &Sender, state: event_loop::State, event: Event, ui: &UISender)
-        -> event_loop::State
-    {
+    fn handle_loop_event(
+        loop_sender: &mpsc::Sender<S::Event>,
+        state: event_loop::State<S>,
+        event: S::Event, 
+        ui: &UISender<S>,
+    ) -> event_loop::State<S> {
        let now = Instant::now();

        let (new_state, commands) = event_loop::handle_event(state.clone(), event, now);
@ -94,79 +113,16 @@ impl Threaded {
        new_state
    }

-    fn schedule_timeout_wake(loop_sender: &Sender, when: Instant) {
+    fn schedule_timeout_wake(
+        loop_sender: &mpsc::Sender<S::Event>,
+        when: Instant,
+    ) {
        let sender = loop_sender.clone();
        thread::spawn(move || {
            let now = Instant::now();
            thread::sleep(when - now);
-            sender.send(Event::TimeoutReached(when))
-                .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't wake visibility manager");
+            sender.send(S::Event::new_timeout_reached(when))
+                .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't wake manager");
        });
    }
 }
-
-/// For calling in only
-mod c {
-    use super::*;
-
-    use crate::state::Presence;
-    use crate::state::LayoutChoice;
-    use crate::state::visibility;
-    use crate::util;
-    use crate::util::c::Wrapped;
-    use std::os::raw::c_char;
-    
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_state_send_force_visible(mgr: Wrapped<Threaded>) {
-        let sender = mgr.clone_ref();
-        let sender = sender.borrow();
-        sender.send(Event::Visibility(visibility::Event::ForceVisible))
-            .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't send to state manager");
-    }
-    
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_state_send_force_hidden(sender: Wrapped<Threaded>) {
-        let sender = sender.clone_ref();
-        let sender = sender.borrow();
-        sender.send(Event::Visibility(visibility::Event::ForceHidden))
-            .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't send to state manager");
-    }
-
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_state_send_keyboard_present(sender: Wrapped<Threaded>, present: u32) {
-        let sender = sender.clone_ref();
-        let sender = sender.borrow();
-        let state =
-            if present == 0 { Presence::Missing }
-            else { Presence::Present };
-        sender.send(Event::PhysicalKeyboard(state))
-            .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't send to state manager");
-    }
-    
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_state_send_layout_set(
-        sender: Wrapped<Threaded>,
-        name: *const c_char,
-        source: *const c_char,
-        // TODO: use when synthetic events are needed
-        _timestamp: u32,
-    ) {
-        let sender = sender.clone_ref();
-        let sender = sender.borrow();
-        let string_or_empty = |v| String::from(
-            util::c::as_str(v)
-            .unwrap_or(Some(""))
-            .unwrap_or("")
-        );
-        sender
-            .send(Event::LayoutChoice(LayoutChoice {
-                name: string_or_empty(&name),
-                source: string_or_empty(&source).into(),
-            }))
-            .or_warn(&mut logging::Print, logging::Problem::Warning, "Can't send to state manager");
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
MoonlightWave-12	00b894993c	Release 1.23.0 New or updated translations: - Belarusian - Haitian Creole New layouts: - French Canadian (QWERTY + accented letters) - German terminal-layout - Spanish terminal-layout Changes: - Fixed Persian and Swiss layouts - Fixed various small style-issues in many layouts - Improved the US-terminal-layout Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/615>	2024-03-08 11:36:43 +01:00
MoonlightWave-12	4fed8c5b1e	Update dependencies Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/615>	2024-03-08 11:05:46 +01:00
Marge Bot	ab37c2a7f2	Merge branch 'improve-readability-of-layout-files' into 'master' Improve readability of layout-files See merge request World/Phosh/squeekboard!610	2024-03-08 09:19:05 +00:00
MoonlightWave-12	79d21dde5e	data/keyboards/fr*.yaml: Move default to the top Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/610>	2024-03-08 09:31:39 +01:00
MoonlightWave-12	08493ed094	data/keyboards/*.yaml: Indent outline-definitions equally For better readability. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/610>	2024-03-08 09:31:33 +01:00
MoonlightWave-12	b4b88f6a98	data/keyboards/*.yaml: Remove unused custom outlines Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/610>	2024-03-08 09:24:58 +01:00
Marge Bot	23b9687988	Merge branch 'add-wide-emoji-layout' into 'master' Add wide emoji-layout See merge request World/Phosh/squeekboard!614	2024-03-08 01:39:07 +00:00
MoonlightWave-12	e029c53401	Add wide emoji-layout Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/614>	2024-03-08 01:18:45 +00:00
Marge Bot	015cae5c63	Merge branch 'styling-fixes' into 'master' Fix some small styling-issues See merge request World/Phosh/squeekboard!611	2024-03-08 01:10:49 +00:00
MoonlightWave-12	f237807522	data/keyboards/*.yaml: Change "abc" to "ABC" Currently this differs for the same view-change-keys in different layouts. When the text is "abc", the size of the key's text changes when toggling between "123" and "abc"; with the text "ABC", the size remains about the same. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/611>	2024-03-08 00:04:16 +00:00
MoonlightWave-12	069d64ac3e	data/keyboards/de*.yaml: Change äÄ-label to Ää A big letter after a small letter looks incorrect on a keyboard, because that is not normal German grammar and a keyboard is for inputting text. The key is also on the left side of the layout, which makes äÄ not fit the visual flow. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/611>	2024-03-08 00:04:16 +00:00
MoonlightWave-12	cd1e269a9d	data/keyboards/email/us.yaml: fix styling of @-key Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/611>	2024-03-08 00:04:16 +00:00
Marge Bot	bf45d4b71b	Merge branch 'add-german-terminal-keyboard-layout' into 'master' Add German terminal-keyboard-layout See merge request World/Phosh/squeekboard!609	2024-03-08 00:01:40 +00:00
MoonlightWave-12	4352f01486	Add German terminal-keyboard-layout Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/609>	2024-03-07 23:22:38 +00:00
Marge Bot	805d276248	Merge branch 'fix-ch-layout' into 'master' Fix Swiss layouts See merge request World/Phosh/squeekboard!612	2024-03-07 23:19:29 +00:00
MoonlightWave-12	2ad2b09344	Fix Swiss layouts Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/612>	2024-03-07 20:23:57 +00:00
Marge Bot	b22cda800f	Merge branch 'improve-layouts-of-us-terminal-keyboards' into 'master' Improve the layouts of the us-terminal-keyboards Closes #249 and #358 See merge request World/Phosh/squeekboard!601	2024-03-07 20:15:14 +00:00
MoonlightWave-12	d299ba070d	us.yaml and us_wide.yaml: Change the outline of the period-key It was styled as a special key before, even though it has no special function. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/601>	2024-03-07 18:23:14 +01:00
MoonlightWave-12	cf2e6151bb	us.yaml and us_wide.yaml: Change outline of 123- and ABC-keys to altline The altline-outline is primarily meant to be used for keys that change the view, which is what these keys do. Also changing it on the actions-view would make the layout not align well anymore, as it is currently not possible to have 2 different sizes with the altline-styling. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/601>	2024-03-07 18:23:14 +01:00
MoonlightWave-12	6f978aee0b	Improve layouts of us-terminal-keyboards This change makes entering paths, URLs, options and pipes easier. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/601>	2024-03-07 18:23:13 +01:00
Marge Bot	7117d1fe20	Merge branch 'update-documentation' into 'master' doc/tutorial.md: Remove outdated information about translations See merge request World/Phosh/squeekboard!608	2024-03-07 16:55:35 +00:00
MoonlightWave-12	eb28a8523f	doc/tutorial.md: Remove outdated information about translations The custom translation-system and the tests for it have been removed. Relevant commits: `10ea276052` `0a417fe4a2` Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/608>	2024-03-02 19:22:02 +01:00
dcz	d36febefc3	Merge branch 'update-documentation' into 'master' Update links in the documentation See merge request World/Phosh/squeekboard!607	2024-03-02 17:47:26 +00:00
MoonlightWave-12	c7ced7de2b	Update links in the documentation	2024-03-02 17:31:12 +01:00
dcz	4b73775695	Merge branch 'master' into 'master' add french canadian layout (QWERTY + accented letters) See merge request World/Phosh/squeekboard!603	2024-03-02 16:10:27 +00:00
dcz	23c5fc1fb8	Merge branch 'keyboard-layout-es' into 'master' Add Spanish terminal-keyboard-layouts See merge request World/Phosh/squeekboard!606	2024-03-02 16:09:57 +00:00
dcz	a60b9d019e	Merge branch 'Persian' into 'master' Fix Persian layout See merge request World/Phosh/squeekboard!605	2024-03-02 16:09:14 +00:00
MoonlightWave-12	b791919075	Improve Spanish terminal-keyboard-layouts	2024-02-28 16:03:14 +01:00
uzanto uz	d801d45812	Add Spanish terminal-keyboard-layouts	2024-02-27 11:24:23 +01:00
Danial Behzadi	6145f9b652	Fix Persian layout	2024-02-23 03:49:25 +03:30
Luciano	8d96803e91	add french canadian layout (QWERTY + accented letters)	2024-01-29 21:41:09 +01:00
Pierre Michel Augustin	30904afb4b	Update Haitian Creole translation	2024-01-11 22:58:26 +00:00
Pierre Michel Augustin	271640f391	Update Haitian Creole translation	2024-01-11 22:37:29 +00:00
Pierre Michel Augustin	76eadca47a	Add Haitian Creole translation	2024-01-11 05:05:29 +00:00
Vasil Pupkin	a25c083f92	Add Belarusian translation	2023-09-14 11:45:44 +00:00
dcz	4c8dbf9fe6	Merge branch '022' into 'master' Release 1.22.0 "Superposition" See merge request World/Phosh/squeekboard!596	2023-04-02 17:10:49 +00:00
Dorota Czaplejewicz	1fac218c70	Release 1.22.0 "Superposition" New or updated translations: - Basque Changes: - fixed panel sizing when scaling - fixed panel sizing when rotating - fixed Dvorak terminal layout	2023-04-01 13:50:31 +00:00
Dorota Czaplejewicz	01bde740bb	Update deps	2023-04-01 13:45:25 +00:00
dcz	ef516c2082	Merge branch 'size' into 'master' Fix panel sizing See merge request World/Phosh/squeekboard!594	2023-03-22 16:21:20 +00:00
dcz	fe39632303	Merge branch 'dbg' into 'master' cleanup: Remove debug prints See merge request World/Phosh/squeekboard!593	2023-03-22 16:21:03 +00:00
dcz	e94619883b	Merge branch 'master' into 'master' layout: fix uppercase dvorak terminal mode Closes #367 See merge request World/Phosh/squeekboard!595	2023-03-20 09:14:13 +00:00
Undef	af09304835	layout: fix uppercase dvorak terminal mode These were left lowercase for some reason.	2023-03-20 08:58:13 +00:00
Dorota Czaplejewicz	bd96f4c0c2	panel: Fix sizing on output reconfiguration	2023-03-15 15:44:55 +00:00
Dorota Czaplejewicz	83fda9d38a	tests: Make panel manager modifications pure This makes testing possible. Test which prompted this is included.	2023-03-15 15:44:55 +00:00
Dorota Czaplejewicz	8c89b4dc2c	cleanup: Remove debug prints	2023-03-15 12:53:22 +00:00
dcz	b17716a427	Merge branch 'size' into 'master' state: Make size independent of scaling factor See merge request World/Phosh/squeekboard!592	2023-03-14 14:01:49 +00:00
Dorota Czaplejewicz	367d8dd5c7	state: Make size independent of scaling factor	2023-03-14 12:16:15 +00:00
Asier Sarasua Garmendia	97371b8dfb	Add Basque translation	2023-03-06 20:35:18 +00:00
dcz	6f66edf8a1	Merge branch 'rel' into 'master' Release 1.21.0 See merge request World/Phosh/squeekboard!591	2023-02-26 09:13:19 +00:00
Dorota Czaplejewicz	378c3ec9ad	Release 1.21.0 "Expected value" New or updated translations: - Hindi - Czech - German New layouts: - wide Swedish - Hungarian Changes: - use a custom font for gr+polytonic, where the default is unreadable - require newer Rust - fixed panel sizing when rotating - internal improvements.	2023-02-16 15:43:24 +00:00
Dorota Czaplejewicz	25ba8773b6	Update Cargo.lock	2023-02-16 15:33:10 +00:00
Dorota Czaplejewicz	853278836c	Revert "docs: Update Cargo.lock instructions" We're using mozilla-cargo in older Debian now. This reverts commit `40089b4836`.	2023-02-16 15:31:38 +00:00
dcz	55956743d4	Merge branch 'ls' into 'master' Sync layersurface with Phosh Closes #285 See merge request World/Phosh/squeekboard!590	2023-02-16 12:59:23 +00:00
dcz	658d2f325e	Merge branch 'clap' into 'master' Rust: Restore compatibility with Debian Bookworm See merge request World/Phosh/squeekboard!589	2023-02-16 12:58:45 +00:00
Hemish	f977670814	Add Hindi translation	2023-02-05 18:31:34 +00:00
Dorota Czaplejewicz	0b44d94aa4	layersurface: Fix violations of bracketing	2023-02-04 18:03:54 +00:00
David96	6e46512044	Sync layersurface with Phosh Copy layersurface & layer shell protocol from phosh (https://gitlab.gnome.org/World/Phosh/phosh/)	2023-02-04 18:03:54 +00:00
Dorota Czaplejewicz	ffae36d259	Rust: Restore compatibility with Debian Bookworm	2023-02-04 17:18:35 +00:00
dcz	d18f09823b	Merge branch 'fixes' into 'master' fixes inspired by compiler warnings See merge request World/Phosh/squeekboard!587	2023-01-24 14:59:12 +00:00
Jürgen Benvenuti	bb5b1faaea	Update German translation	2023-01-15 19:41:33 +00:00
Dorota Czaplejewicz	400e82326d	memory: Fix undefined behaviour As warned by the compiler. At the same time drop support for older rustc, as the code was dead anyway.	2023-01-15 11:52:21 +00:00
Dorota Czaplejewicz	20b5cac148	build: Silence overcautious warning	2023-01-15 11:51:53 +00:00
Dorota Czaplejewicz	8da59a6216	safety: Replace strncpy with strlcpy	2023-01-15 11:40:27 +00:00
Dorota Czaplejewicz	6fd281b214	Remove dead code	2023-01-15 11:27:14 +00:00
Dorota Czaplejewicz	2e65586db5	wayland: remove dead, broken init	2023-01-15 11:22:10 +00:00
dcz	5f12199de1	Merge branch 'hu' into 'master' Add Hungarian layout See merge request World/Phosh/squeekboard!585	2023-01-05 17:53:45 +00:00
Gergo Koteles	8c7897da4d	Add Hungarian layout	2023-01-05 17:14:18 +01:00
dcz	b0bf78b2a6	Merge branch 'saver' into 'master' popover: Deactivate settings button when lock screen is on See merge request World/Phosh/squeekboard!582	2023-01-02 12:21:23 +00:00
dcz	8fa4bf1b40	Merge branch '21' into 'master' rust: Use 2021 eition See merge request World/Phosh/squeekboard!584	2023-01-02 12:20:49 +00:00
Dorota Czaplejewicz	1704f1b4cb	rust: Use 2021 eition	2022-12-21 12:24:03 +00:00
Dorota Czaplejewicz	828279d03c	rust: Use 2018 eition This edition has better syntax around scoping and `use`.	2022-12-21 12:20:17 +00:00
Dorota Czaplejewicz	31a7acb0eb	popover: Apply settings enabled stateto UI	2022-12-08 10:07:09 +00:00
Dorota Czaplejewicz	7130ac9529	popover: State can be printed	2022-12-08 10:07:09 +00:00
Dorota Czaplejewicz	c590064ce3	popover: Connect to screensaver event	2022-12-08 10:07:09 +00:00
Dorota Czaplejewicz	3366090454	popover: Use thread-safe reference This reference will be modified from the screensaver thread.	2022-12-08 09:38:31 +00:00
Dorota Czaplejewicz	e88410d412	util: Add thread-safe c wrapper	2022-12-08 09:38:31 +00:00
Dorota Czaplejewicz	ae15869d07	popover: Able to receive screensaver events	2022-12-08 09:38:31 +00:00
Dorota Czaplejewicz	cf6171a51f	loops: Use Void for infinite loops	2022-12-06 13:01:25 +00:00
Dorota Czaplejewicz	ea5e36e9fd	screensaver: Catch activeness changes	2022-12-06 12:58:17 +00:00
Dorota Czaplejewicz	783ca9ae11	structure: Create a module for custom event loops	2022-12-06 12:19:17 +00:00
dcz	38165ac039	Merge branch 'event' into 'master' Decouple event handling from concrete logic See merge request World/Phosh/squeekboard!581	2022-12-06 12:14:17 +00:00
dcz	f4c03ce6e8	Merge branch 'sizes' into 'master' Fix resizing See merge request World/Phosh/squeekboard!580	2022-11-30 13:10:01 +00:00
Dorota Czaplejewicz	7f1d237551	event loop: Move event handlers from event loop driver to main loop	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	6d01386d8a	main: Moved event loop definition close to actor	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	e5be92efae	loop driver: Decouple from concrete state	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	2f011a57dd	test: Mark loop scheduling test for rewrite	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	e7c2350c92	event loop: Decouple event handler from concrete state	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	d51408a3e0	event loop: Add descriptions	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	b8c0836f51	event loop: Decouple event type from handler	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	e0b37d60c4	event loop: Decouple state type from event handler	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	23d6beee8e	event loop: Decouple event timeout from event type	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	9c9f371f91	Rename LevelKeyboard to Layout	2022-11-28 15:53:41 +00:00
Dorota Czaplejewicz	805c0d27fd	panel: Fix resize when reusing the window When the panel window was reused, it was not re-initialized. That includes the panel size request. If the last panel size was matching a different display size (including orientation), the newly shown panel would re-use that size instead of respecting the newly requested size.	2022-11-27 18:04:18 +00:00
Dorota Czaplejewicz	9242bb679d	panel: Hardcode some debugging Quickly done, useful for development tests. For user control, this requires connecting to some switch.	2022-11-27 18:02:47 +00:00
dcz	e9cc20106b	Merge branch 'desktop-file' into 'master' desktop-file: Add X-GNOME-* for session management See merge request World/Phosh/squeekboard!579	2022-11-08 09:00:05 +00:00
Guido Günther	8cf9aab78f	desktop-file: Add X-GNOME-* for session management This add the X-GNOME-* bits that are currently shipped in sm.puri.OSK0.desktop allowing distributions to drop this file and make it a plain symlink to sm.puri.OSK0.desktop. If squeekboard is used in another context that doesn't use gnome-session the entries have no effect.	2022-11-08 08:49:17 +01:00
Daniel Rusek	1049a6a875	Add Czech translation	2022-10-26 12:31:23 +00:00
dcz	2ade582463	Merge branch 'splitl' into 'master' layout: cleanups See merge request World/Phosh/squeekboard!577	2022-10-09 14:40:55 +00:00
dcz	838d6b0bf6	Merge branch 'upgrust' into 'master' debian: Upgrade rust dependency See merge request World/Phosh/squeekboard!576	2022-10-08 08:53:54 +00:00
Dorota Czaplejewicz	973bbaca4b	layout: Increase separation between mutable and logic	2022-10-01 18:29:24 +00:00
Dorota Czaplejewicz	14282387f2	layout: Increase separation between mutable and logic	2022-10-01 18:25:35 +00:00
Dorota Czaplejewicz	a5fdc25452	layout: Unbox buttons The Box was just polluting the code, and the original reason for it (passing buttons individually to C) is gone.	2022-10-01 16:38:10 +00:00
Dorota Czaplejewicz	952ec805ed	layout: Put all button state into active_buttons Ths gets rid of Rc<RefCell<>> sharing of state, which can be hard to keep track of. In addition, there's no longer any duplication of button state.	2022-10-01 16:38:01 +00:00
Dorota Czaplejewicz	74c5ef4a51	layout: Separate button info from state Splitting out state into a dedicated place lets keep all the immutable metadata in one place, and all state in another.	2022-10-01 13:37:35 +00:00
Dorota Czaplejewicz	fc4fa63cc6	layout: Remove unused code	2022-10-01 12:10:03 +00:00
Dorota Czaplejewicz	5e12666b8f	layout: Pressed buttons are now a list of indices This makes it possible to copy layout state wholesale, as well as to drop shared state of keys.	2022-10-01 11:11:33 +00:00
Dorota Czaplejewicz	649f67d319	layout: Split out static data This will make it possible later to cache this data or compare for best size selection without hassle.	2022-09-30 17:42:03 +00:00
Dorota Czaplejewicz	c017a773ea	layout: Gather state-related stuff together	2022-09-30 17:12:00 +00:00
Dorota Czaplejewicz	7a8932d686	debian: Upgrade rust dependency This avoids problems with cargo pulling packages with unsupported edition in the future, as well as opens up the ability to use new language features. Most importantly, cargo deps can be unlocked.	2022-09-30 16:01:36 +00:00
dcz	afe6a6cf74	Merge branch 'orphans' into 'master' tests: Check for orphaned layout files See merge request World/Phosh/squeekboard!574	2022-09-29 16:25:47 +00:00
dcz	e778be8f13	Merge branch 'newss' into 'master' repo: Add missing NEWS file See merge request World/Phosh/squeekboard!575	2022-09-29 16:25:33 +00:00
dcz	7ffc2c4f86	Merge branch 'add-wide-swedish' into 'master' Add wide Swedish layout Closes #351 See merge request World/Phosh/squeekboard!573	2022-09-16 07:43:50 +00:00
Newbyte	a09a51ada9	Add wide Swedish layout Closes https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/351	2022-09-15 18:59:43 +02:00
Dorota Czaplejewicz	d26927dc44	tests: Check for orphaned layout files This adds a test which scans the layouts directory for files which have not been added to the resources file. The majority os user-submitted layouts don't include layout registration, and I ran out of ideas for how to make it more visible in the documentation. Instead, it's going to be solved on the other side: the CI pipelines shall fail. To make it easy on experimenters with untidy trees, it's disabled by default.	2022-09-15 14:13:40 +00:00
Dorota Czaplejewicz	094503cf8c	repo: Add missing NEWS file	2022-09-15 13:17:33 +00:00
dcz	0cb9b039d2	Merge branch 'polyfont' into 'master' Use custom font for Greek polytonic See merge request World/Phosh/squeekboard!569	2022-09-11 14:43:33 +00:00
dcz	b676cac63f	Merge branch 'flock' into 'master' docs: Update Cargo.lock instructions See merge request World/Phosh/squeekboard!570	2022-09-11 14:43:18 +00:00
dcz	f55a8868c7	Merge branch 'news' into 'master' Improve release instructions See merge request World/Phosh/squeekboard!571	2022-09-11 14:42:56 +00:00
dcz	3055cc034f	Merge branch '120' into 'master' Release 1.20.0 "PID controller" See merge request World/Phosh/squeekboard!572	2022-09-11 14:34:36 +00:00
dcz	dbbb34da01	Merge branch 'bw' into 'master' CI: target bookworm for "future" job See merge request World/Phosh/squeekboard!568	2022-09-09 15:50:28 +00:00
Dorota Czaplejewicz	40089b4836	docs: Update Cargo.lock instructions	2022-09-03 13:42:07 +00:00
Dorota Czaplejewicz	50ff771922	docs: Remove obsolete amber instructions	2022-09-03 12:38:13 +00:00
Dorota Czaplejewicz	113970566b	docs: Add NEWS.md	2022-09-03 12:38:13 +00:00
Dorota Czaplejewicz	8864a5b0a7	style: Give gr+polytonic a custom font	2022-09-03 08:11:08 +00:00
Dorota Czaplejewicz	c30e951907	style: Use layout name as css class	2022-09-03 08:04:40 +00:00
Dorota Czaplejewicz	9413150d85	keyboard: Remove unused field	2022-09-03 07:37:33 +00:00
Dorota Czaplejewicz	7c17f64517	CI: target bookworm for "future" job Bookworm will be the basis for the next PureOS. Plus, there was some persistent network error when running sid jobs.	2022-09-02 10:20:30 +00:00