Merge tag 'v1.14.0' into pureos/byzantium

CI adjustments and readme

See merge request Librem5/debs/squeekboard!5

.gitignore

@@ -1,6 +1,5 @@
+.zanata-cache/
 _build
-po/squeekboard.pot
-po/*.mo
 TAGS
 tags
 vgdump

.gitlab-ci.yml

@@ -1,180 +1,152 @@
-image: pureos/byzantium
+image: debian:bullseye
 
 stages:
   - build
   - test
-  - deploy
+
+.tags: &tags
+  tags:
+    - librem5
 
 before_script:
   - apt-get -y update
-  - apt-get -y install ca-certificates
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - apt-get -y update
 
 build_docs:
+  <<: *tags
   stage: build
   artifacts:
     paths:
       - _build
   script:
-    - apt-get -y install python3-pip python3-sphinx
-    - pip3 install recommonmark
-    - ./doc/build.sh _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+      - apt-get -y install python3-pip python3-sphinx
+      - pip3 install recommonmark
+      - ./doc/build.sh _build
 
 build_meson:
-  image: debian:bookworm
+  tags:
+    - librem5
   stage: build
   artifacts:
     paths:
       - _build
     expire_in: 3h
   script:
-    - mv debian/control-newer debian/control
     - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
     - ninja -C _build install
-  except:
-    variables:
-      - $PKG_ONLY == "1"
 
 build_deb:
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:amber:
+    image: pureos/amber
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:buster:
+    image: "debian:buster"
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
 
 build_deb:arm64:
-  image: pureos/byzantium
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
+    tags:
+        - librem5:arm64
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
 
-build_deb:future:
-  image: debian:bookworm
-  allow_failure: true
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - mv debian/control-newer debian/control
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_reference:
-  image: debian:bookworm
-  stage: build
-  needs:
-    - job: build_meson
-      artifacts: true
-  artifacts:
-    paths:
-      - _build/doc
-  script:
-    - apt-get -y install cargo
-    - cd _build
-    - ../cargo.sh doc --no-deps --document-private-items
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+build_deb:arm64_buster:
+    image: "debian:buster"
+    tags:
+        - librem5:arm64
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
 
 test_lintian:
-  stage: test
-  needs:
-    - job: build_deb
-      artifacts: true
-  script:
-    - apt-get -y install lintian
-    - lintian *.deb
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+    <<: *tags
+    stage: test
+    dependencies:
+        - build_deb
+    script:
+        - apt-get -y install lintian
+        - lintian *.deb
 
 test:
-  image: debian:bookworm
+  tags:
+    - librem5
   stage: test
   needs:
-    - job: build_meson
-      artifacts: true
+    - build_meson
   script:
-    - mv debian/control-newer debian/control
     - apt-get -y build-dep .
     - apt-get -y install clang-tidy
     - ninja -C _build test
-    - tools/style-check_build _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-test_style:
-  stage: test
-  needs: []
-  script:
-    - apt-get -y build-dep .
-    - tools/style-check_source
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+    - cd _build
+    - clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, --warnings-as-errors=readability-braces-around-statements -extra-arg=-Wno-unknown-warning-option ../src/*.c ../eek/*.c ../eekboard/*.c
 
 check_release:
+  <<: *tags
   stage: test
-  needs: []
   only:
     refs:
       - master
   script:
     - apt-get -y install git python3
     - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-pages:
-  stage: deploy
-  needs:
-    - build_docs
-    - build_reference
-  script:
-    - mv _build/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    refs:
-      - master

Cargo.deps

@@ -1,17 +1,11 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
-zbus = "1.0.*"
-zvariant = "2.0.*"
-# Newer versions seem to confuse the version of Cargo on Debian Bullseye
-zvariant_derive = "2.0.*"
+regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
 
 [dependencies.cairo-rs]
 version = "0.7.*"
 
-[dependencies.cairo-sys-rs]
-version = "0.9"
-
 [dependencies.gdk]
 version = "0.11.*"
 
@@ -23,14 +17,6 @@ features = ["v2_44"]
 version = "0.8.*"
 features = ["v2_44"]
 
-[dependencies.glib-sys]
-version = "*"
-features = ["v2_44"]
-
 [dependencies.gtk]
 version = "0.7.*"
 features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.9"
-features = ["v3_22"]

Cargo.deps.legacy

@@ -0,0 +1,22 @@
+# Dependencies which change based on build flags
+bitflags = "1.0.*"
+clap = { version = "2.32.*", default-features = false }
+regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
+
+[dependencies.cairo-rs]
+version = "0.5.*"
+
+[dependencies.gdk]
+version = "0.9.*"
+
+[dependencies.gio]
+version = "0.5.*"
+features = ["v2_44"]
+
+[dependencies.glib]
+version = "0.6.*"
+features = ["v2_44"]
+
+[dependencies.gtk]
+version = "0.5.*"
+features = ["v3_22"]

Cargo.deps.newer

@@ -1,38 +0,0 @@
-# Dependencies and tools which change based on build flags
-# For the newer-than-Byzantium config
-
-bitflags = "1.3.*"
-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
-zvariant_derive = "2.10.*"
-
-[dependencies.cairo-rs]
-version = "0.14.*"
-
-[dependencies.cairo-sys-rs]
-version = "0.14.*"
-
-[dependencies.gdk]
-version = "0.14.*"
-
-[dependencies.gio]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib-sys]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.gtk]
-version = "0.14.*"
-features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.14.*"
-features = ["v3_22"]

Cargo.deps.online

@@ -1,4 +0,0 @@
-# Dependencies which are only used with online, crates.io builds.
-[patch.crates-io]
-# Dependency was yanked, but gio 0.7 needs it.
-fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" }

Cargo.lock

@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "atk"
 version = "0.7.0"
@@ -28,24 +26,12 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
 [[package]]
 name = "cairo-rs"
 version = "0.7.1"
@@ -73,27 +59,15 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
 
 [[package]]
 name = "clap"
-version = "2.33.4"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826bf7bc84f9435630275cb8e802a4a0ec792b615969934bd16d42ffed10f207"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "bitflags",
  "textwrap",
@@ -101,50 +75,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "derivative"
-version = "2.2.0"
+name = "dtoa"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "enumflags2"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
 [[package]]
 name = "fragile"
 version = "0.3.0"
-source = "git+https://source.puri.sm/dorota.czaplejewicz/fragile.git?tag=0.3.0#51048ca11824279c2114c77fef5bcb950838fc09"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
 
 [[package]]
 name = "gdk"
@@ -317,31 +257,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -350,15 +265,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.6"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "maplit"
@@ -376,19 +291,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "nix"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "void",
-]
-
 [[package]]
 name = "pango"
 version = "0.7.0"
@@ -418,37 +320,43 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.54"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "regex"
+version = "1.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
 [[package]]
 name = "rs"
 version = "0.1.0"
@@ -464,89 +372,53 @@ dependencies = [
  "gtk",
  "gtk-sys",
  "maplit",
+ "regex",
  "serde",
  "serde_yaml",
  "xkbcommon",
- "zbus",
- "zvariant",
- "zvariant_derive",
 ]
 
-[[package]]
-name = "ryu"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.12",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.12",
+ "syn",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.26"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
 dependencies = [
- "indexmap",
- "ryu",
+ "dtoa",
+ "linked-hash-map",
  "serde",
  "yaml-rust",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -558,32 +430,17 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
-
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 
 [[package]]
-name = "void"
-version = "1.0.2"
+name = "unicode-xid"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "winapi"
@@ -609,9 +466,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xkbcommon"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
+checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
 dependencies = [
  "libc",
  "memmap",
@@ -625,56 +482,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
-
-[[package]]
-name = "zbus"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb97c72cbfd5c7537ca730eeb810da7348f345ba67ab7673bcbe0d81c076427"
-dependencies = [
- "byteorder",
- "derivative",
- "enumflags2",
- "fastrand",
- "nix",
- "scoped-tls",
- "serde",
- "serde_repr",
- "zbus_macros",
- "zvariant",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c1f2a20a4cb90922b44d3bebd232b246e52b3dd95ed5bea8aec83cde3a5a8a"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "zvariant"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0bf85e67d1a3780cb1c56c80227532354f21907cba14805a773eb507b444580"
-dependencies = [
- "byteorder",
- "enumflags2",
- "serde",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68726e8c12757384a8d1485080527e263dea67d91f19e97cd71b9292f22d7c5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]

Cargo.toml.in

@@ -1,7 +1,6 @@
 [package]
 name = "rs"
 version = "0.1.0"
-edition = "2021"
 
 [lib]
 name = "rs"
@@ -17,16 +16,23 @@ 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 = []
+gio_v0_5 = []
+gtk_v0_5 = []
+rustc_less_1_36 = []
 
 # Dependencies which don't change based on build flags
+[dependencies.cairo-sys-rs]
+version = ""
+
+[dependencies.glib-sys]
+version = ""
+features = ["v2_44"]
+
+[dependencies.gtk-sys]
+version = ""
+features = ["v3_22"]
+
 [dependencies]
 maplit = "1.0.*"
 serde = { version = "1.0.*", features = ["derive"] }

NEWS.md

@@ -1,42 +0,0 @@
-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

README.md

@@ -1,7 +1,7 @@
-*squeekboard* - a Wayland on-screen keyboard
+*squeekboard* - a Wayland virtual keyboard
 ========================================
 
-*Squeekboard* is a keyboard-shaped input method supporting Wayland, built primarily for the *Librem 5* phone.
+*Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.
 
 It squeaks because some Rust got inside.
 
@@ -11,24 +11,20 @@ Features
 ### Present
 
 - GTK3
-- Custom keyboard layouts defined in yaml
-- Input purpose dependent keyboard layouts
+- Custom yaml-defined keyboards
 - DBus interface to show and hide
-- Use Wayland input method protocol to submit text
+- Use Wayland input method protocol to show and hide
 - Use Wayland virtual keyboard protocol
 
+### Temporarily dropped
+
+- A settings interface
+
 ### TODO
 
-- Text prediction/correction
-- Use preedit
-- Submit actions like "next field" using a future Wayland protocol
+- Use Wayland input method protocol
 - Pick up DBus interface files from /usr/share
 
-Creating layouts
--------------------
-
-If you want to work on layouts, check out the [guide](doc/tutorial.md).
-
 Building
 --------
 
@@ -39,7 +35,7 @@ See `.gitlab-ci.yml` or run `apt-get build-dep .`
 ### Build from git repo
 
 ```bash
-$ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
+$ git clone https://source.puri.sm/Librem5/squeekboard.git
 $ cd squeekboard
 $ mkdir _build
 $ meson _build/
@@ -58,32 +54,19 @@ $ cd ../build/
 $ src/squeekboard
 ```
 
-Squeekboard's panel will appear whenever a compatible application requests an input method. Click a text field in any GTK application, like `python3 ./tools/entry.py`.
-
 Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
 
 ```bash
 $ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
 ```
 
-Alternatively, force panel visibility manually with:
+To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with:
 
 ```bash
 busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 
-### What the compositor has to support
-
-A compatible compositor has to support the protocols:
-
-- layer-shell
-- virtual-keyboard-v1
-
-It's strongly recommended to support:
-
-- input-method-v2
-
 Developing
 ----------
 
-See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://world.pages.gitlab.gnome.org/Phosh/squeekboard) for the current release.
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.

data/common.css

@@ -1,39 +0,0 @@
-/* Theme independent styles */
-
-sq_view {
-    font-family: cantarell, sans-serif;
-    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;
-}
-
-sq_view.wide sq_button {
-    margin: 3px;
-}
-
-sq_button.latched,
-sq_button.locked {
-    font-weight: bold;
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-sq_button.small {
-    font-size: 0.5em;
-}
-
-sq_view.pin sq_button {
-    border-radius: 0px;
-    margin: 1px 1px 1px 1px;
-}

data/keyboards/am+phonetic.yaml

@@ -1,84 +0,0 @@
-# Armenian layout created by Norayr Chilingarian
-# Yerevan
-# Oct 2021
----
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 32, height: 32 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
-        - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
-        - "ա ս դ ֆ գ հ յ կ լ ․"
-        - "Shift_L զ ղ ց վ բ ն մ ՛ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
-        - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
-        - "Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։"
-        - "Shift_L Զ Ղ Ց Վ Բ Ն Մ ՞ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/am.yaml

@@ -1,84 +0,0 @@
-# Armenian layout created by Norayr Chilingarian
-# Yerevan
-# Oct 2021
----
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 32, height: 32 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
-        - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
-        - "ջ վ գ ե ա ն ի տ հ պ ր"
-        - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
-        - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
-        - "Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
-        - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/ara.yaml

@@ -1,70 +0,0 @@
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
----
-outlines:
-    default: { width: 32.66, height: 52 }
-    altline: { width: 48.99, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 195.96, height: 52 }
-    special: { width: 35.66, height: 52 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "extra"
-                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: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"

data/keyboards/ara_wide.yaml

@@ -1,70 +0,0 @@
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
----
-outlines:
-    default: { width: 49, height: 42 }
-    altline: { width: 73.5, height: 42 }
-    wide: { width: 108, height: 42 }
-    spaceline: { width: 324, height: 42 }
-    special: { width: 49, height: 42 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "extra"
-                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: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"

data/keyboards/bg+phonetic.yaml

@@ -1,78 +0,0 @@
----
-outlines:
-    default: { width: 32.72, height: 52 }
-    altline: { width: 47, height: 52 }
-    wide: { width: 49.09, height: 52 }
-    spaceline: { width: 185, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "я в е р т ъ у и о п ю"
-        - "а с д ф г х й к л ш щ"
-        - "Shift_L з ь ц ж б н м ч BackSpace"
-        - "show_numbers preferences         space   .    Return"
-    upper:
-        - "Я В Е Р Т Ъ У И О П Ю"
-        - "А С Д Ф Г Х Й К Л Ш Щ"
-        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
-        - "show_numbers preferences         space   ,    Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  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:
-        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: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/bg.yaml

@@ -8,19 +8,19 @@ outlines:
 
 views:
     base:
-        - "у е и ш щ к с д з ц б"
-        - "ь я а о ж г т н в м ч"
-        - "Shift_L ю й ъ ф х п р л BackSpace"
+        - "я в е р т ъ у и о п ю"
+        - "а с д ф г х й к л ш щ"
+        - "Shift_L з ь ц ж б н м ч BackSpace"
         - "show_numbers preferences         space   .    Return"
     upper:
-        - "У Е И Ш Щ К С Д З Ц Б"
-        - "Ь Я А О Ж Г Т Н В М Ч"
-        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
+        - "Я В Е Р Т Ъ У И О П Ю"
+        - "А С Д Ф Г Х Й К Л Ш Щ"
+        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
         - "show_numbers preferences         space   ,    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols , \" ' colon ; ! ? ѝ BackSpace"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"

data/keyboards/ch+de.yaml

@@ -1,73 +0,0 @@
-# Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
----
-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 }
-
-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 ? !  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 - _  preferences    \"  space        , . Return"
-    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters ? !  preferences    _   space        , . Return"
-    symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters  preferences    -   space        , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "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: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ch+fr.yaml

@@ -1,91 +0,0 @@
-# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
----
-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 }
-
-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_from_accents 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: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ch.yaml

@@ -1,93 +0,0 @@
-# Maintained by: Jordy Bossy <jordi@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
----
-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 }
-
-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_from_accents 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: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ch_wide.yaml

@@ -1,93 +0,0 @@
-# Maintained by: Jordy Bossy <jordy@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
----
-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_from_accents 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: "äÄ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/email/us.yaml

@@ -1,81 +0,0 @@
----
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 106.67, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        at period 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        at period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        at period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        at period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    at:
-        outline: "special"
-        text: "@"
-    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: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/fr+bepo.yaml

@@ -1,206 +0,0 @@
----
-outlines:
-    small:     { width: 50,    height: 30 }
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 35.33, height: 52 }
-    wide:      { width: 50,    height: 52 }
-    spaceline: { width: 150,   height: 52 }
-    special:   { width: 35.33,  height: 52 }
-
-views:
-    base:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   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:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/fr+bepo_wide.yaml

@@ -1,89 +0,0 @@
----
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ge.yaml

@@ -1,78 +0,0 @@
----
-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:
-        - "ქ წ ე რ ტ ყ უ ი ო პ"
-        - "ა ს დ ფ გ ჰ ჯ კ ლ"
-        - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "ქ ჭ ე ღ თ ყ უ ი ო პ"
-        - "ა შ დ ფ გ ჰ ჟ კ ლ"
-        - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "! @ # $ % ^ & * ( )"
-        - "show_symbols   - ' \" colon ; , ?   BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "+ ⨯ ÷ = / _ € £ ¥ ₾"
-        - "~ ` | · √ π τ ° { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-
-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: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/gr+polytonic.yaml

@@ -1,326 +0,0 @@
-# Greek polytonic layout by Antonis Tsolomitis
-# University of the Aegean, Department of Mathematics, atsol@aegean.gr
-# March 2022
-# 
----
-outlines:
-    default:    { width: 40, height: 60 }
-    altline:    { width: 52.67,    height: 60 }
-    wide:       { width: 62,    height: 60 }
-    extrawide:  { width: 66, height: 60 }
-    spaceline:  { width: 140,   height: 60 }
-    special:    { width: 44,    height: 60 }
-
-views:
-    base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
-        - "α σ δ φ γ η ξ κ λ show_accents"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
-    upper:
-        - "colon EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
-        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space exclam period_upper Return"
-    accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
-        - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
-    oxia:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    bariaorperispomeni:
-        - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
-        - "show_BariaOrPerispomeni ᾳ ᾲ ῃ ῂ ῳ ῲ ῠ show_base"
-        - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
-        - "show_numbers preferences space ῇ ῷ Return"
-    BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
-    psiliordasia:
-        - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
-        - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
-        - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandoxia:
-        - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
-        - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
-        - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandvaria:
-        - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
-        - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
-        - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
-    symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "altline"
-        icon: "keyboard-mode-symbolic"
-    show_oxia:
-        action:
-            set_view: "oxia"
-        outline: "extrawide"
-        label: "´ ΅"
-    show_Oxia:
-        action:
-            set_view: "Oxia"
-        outline: "extrawide"
-        label: "´¨↑"
-    show_bariaorperispomeni:
-        action:
-            set_view: "bariaorperispomeni"
-        outline: "extrawide"
-        label: "` ῀"
-    show_BariaOrPerispomeni:
-        action:
-            set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
-        label: "`῀↑"
-    show_psiliordasia:
-        action:
-            set_view: "psiliordasia"
-        outline: "extrawide"
-        label: "᾿ ῾"
-    show_PsiliOrDasia:
-        action:
-            set_view: "PsiliOrDasia"
-        outline: "extrawide"
-        label: "᾿῾↑"
-    show_psiliordasiaandoxia:
-        action:
-            set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
-        label: "῎ ῞"
-    show_PsiliOrDasiaAndOxia:
-        action:
-            set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
-        label: "῎῞↑"
-    show_psiliordasiaandvaria:
-        action:
-            set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
-        label: "῍ ῝"
-    show_PsiliOrDasiaAndVaria:
-        action:
-            set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
-        label: "῍῝↑"
-    show_psiliordasiaandperispomeni:
-        action:
-            set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
-        label: "῏ ῟"
-    show_PsiliOrDasiaAndPerispomeni:
-        action:
-            set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
-        label: "῏῟↑"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ΑΒΓ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ᾦ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    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:
-        outline: "special"
-        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: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-

data/keyboards/gr.yaml

@@ -1,41 +1,40 @@
-# Greek layout originally created by Antonis Tsolomitis
+# Greek layout created by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
-# Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:    { width: 40,    height: 60 }
-    altline:    { width: 52.67, height: 60 }
-    wide:       { width: 62,    height: 60 }
-    spaceline:  { width: 140,   height: 60 }
-    special:    { width: 44,    height: 60 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π !"
         - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
+        - "show_numbers preferences space period Return"
     upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ · BackSpace"
+        - "show_numbers preferences space « » Return"
     accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "ά έ ή ί ό ύ ώ ϊ ϋ ΐ"
+        - "ΰ Ά Έ Ή Ί Ό Ύ Ώ Ϊ show_base"
+        - "Ϋ Ϗ ϐ ϑ ϕ ϖ ϗ – — BackSpace"
+        - "show_numbers preferences space quoteleft quoteright Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
         - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "show_letters preferences space period Return"
     symbols:
         - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
         - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
         - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "show_letters preferences space period Return"
 buttons:
     Shift_L:
         action:
@@ -55,12 +54,12 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "altline"
         label: "ΑΒΓ"
     show_symbols:
         action:
@@ -79,40 +78,16 @@ buttons:
             set_view: "base"
         outline: "altline"
         label: "αι"
+    period:
+        outline: "altline"
+        text: "."
     space:
-        outline: "spaceline"
+        outline: spaceline
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    apostrophe:
-        outline: "special"
-        text: "᾿"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
     aring:
         text: "å"
     Aring:
@@ -187,6 +162,8 @@ buttons:
         text: "{"
     braceright:
         text: "}"
+    comma:
+        text: ","
     backslash:
         text: "\\"
     slash:
@@ -199,6 +176,12 @@ buttons:
         text: "<"
     greater:
         text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
     question:
         text: "?"
     bracketleft:

data/keyboards/gr_wide.yaml

@@ -1,204 +0,0 @@
-# Creaed by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
----
-outlines:
-    default:    { width: 80,    height: 60 }
-    altline:    { width: 110,    height: 60 }
-    wide:       { width: 120,   height: 60 }
-    spaceline:  { width: 250,   height: 60 }
-    special:    { width: 75,    height: 60 }
-
-views:
-    base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
-        - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
-    upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
-        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
-    accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
-    symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma 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_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ΑΒΓ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accented:
-        action:
-            locking:
-                lock_view: "accented"
-                unlock_view: "base"
-        outline: "altline"
-        label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    apostrophe:
-        outline: "special"
-        text: "᾿"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    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: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"

data/keyboards/hu.yaml

@@ -1,82 +0,0 @@
-# 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"

data/keyboards/hu_wide.yaml

@@ -1,82 +0,0 @@
-# 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"

data/keyboards/it.yaml

@@ -30,10 +30,10 @@ views:
         - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
-        - "è é È É ù ú Ù Ú ò ó"
-        - "à á À Á ì í Ì Í Ò Ó"
-        - "show_numbers   “ ” « » ≈ ≠ ‽  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò « » ù ! { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        « » Return"
 
 buttons:
     Shift_L:

data/keyboards/pin/us.yaml

@@ -1,20 +0,0 @@
----
-margins: { top: 4, side: 0, bottom: 4 }
-outlines:
-    default: { width: 120, height: 52 }
-
-views:
-    base:
-        - "1 2 3"
-        - "4 5 6"
-        - "7 8 9"
-        - "BackSpace 0 Return"
-
-buttons:
-    BackSpace:
-        icon: "edit-clear-symbolic"
-        action: erase
-    Return:
-        icon: "key-enter"
-        keysym: "Return"
-

data/keyboards/ro.yaml

@@ -1,89 +0,0 @@
----
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
-    eschars:
-        - "ă â î ș ț á é í ó ü"
-        - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ăĂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ro_wide.yaml

@@ -1,89 +0,0 @@
----
-outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
-    spaceline: { width: 153, height: 42 }
-    special: { width: 54, 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 show_eschars preferences         space        . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
-    eschars:
-        - "ă â î ș ț á é í ó ü"
-        - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ăĂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/se_wide.yaml

@@ -1,164 +0,0 @@
----
-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: "]"

data/keyboards/terminal/fr+bepo.yaml

@@ -1,223 +0,0 @@
----
-outlines:
-    action:    { width: 59,    height: 46 }
-    small:     { width: 50,    height: 22 }
-    default:   { width: 35.33, height: 46 }
-    altline:   { width: 35.33, height: 46 }
-    wide:      { width: 50,    height: 46 }
-    spaceline: { width: 110,   height: 46 }
-    special:   { width: 35.33,    height: 46 }
-
-views:
-    base:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences slash  space  show_eschars show_actions Return"
-    upper:
-        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences  space  colon  show_eschars show_actions Return"
-    numbers:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    symbols:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
-
- 
-buttons:
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "wide"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/terminal/fr+bepo_wide.yaml

@@ -1,227 +0,0 @@
----
-outlines:
-    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 }
-    special:   { width: 54,  height: 37 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences         space    slash show_eschars show_actions Return"
-    upper:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars 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        show_eschars show_actions Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"    
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"        
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars 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 Menu Break Left Down Right"
-
- 
-buttons:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    EscSmall:
-        outline: "small"
-        keysym: "Escape"
-        label: "Esc"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/terminal/us+dvorak.yaml

@@ -1,200 +0,0 @@
----
-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 }
-    special: { width: 44, height: 46 }
-    small: { width: 59, height: 22 }
-
-views:
-    base:
-        - "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"
-        - "show_numbers preferences      space        show_actions Return"
-    numbers:
-        - "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 ↑ ↓ ← →"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "τ=\\"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    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"

data/keyboards/terminal/us+dvorak_wide.yaml

@@ -1,208 +0,0 @@
----
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
-    special:   { width: 54,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "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:
-        - "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"
-        - "show_numbers preferences      space        show_actions Return"
-    numbers:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "τ=\\"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    EscSmall:
-        outline: "small"
-        keysym: "Escape"
-        label: "Esc"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    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"

data/keyboards/url/us.yaml

@@ -1,81 +0,0 @@
----
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 106.67, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        slash period 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        slash period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        slash period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        slash period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: show_prefs
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"

data/langs/bg-BG.txt

@@ -0,0 +1,13 @@
+bg Български
+de Немски
+es Испански
+emoji Емоджи
+fi Френски
+gr Гръцки
+it Италянски
+no Норевежки
+pl Полски
+ru Руски
+se Шведски
+terminal Терминал
+us Английски (САЩ)

data/langs/cs-CZ.txt

@@ -0,0 +1,21 @@
+be Belgická
+cz Česká
+cz+qwerty Česká (QWERTY)
+de Německá
+dk Dánská
+emoji Emoji
+es Španělská
+fi Finská
+fr Francouzská
+gr Řecká
+it Italská
+jp Japonská
+jp+kana Japonská (Kana)
+no Norská
+pl Polská
+ru Ruská
+se Švédská
+terminal Terminál
+th Thajská
+ua Ukrajinská
+us Anglická (USA)

data/langs/en-US.txt

@@ -0,0 +1,2 @@
+emoji Emoji
+terminal Terminal

data/langs/es-ES.txt

@@ -0,0 +1,7 @@
+us Inglés (EE.UU.)
+de Alemán
+el Griego
+es Español
+it Italiano
+jp+kana Japonés (Kana)
+no Noruego

data/langs/fa-IR.txt

@@ -0,0 +1,2 @@
+emoji ایموجی
+terminal ترمینال

data/langs/fur-IT.txt

@@ -0,0 +1,18 @@
+be Belgjic
+br Brasilian
+de Todesc
+dk Danês
+es Spagnûl
+fi Finlandês
+fr Francês
+it+fur Furlan
+gr Grêc
+it Talian
+jp+kana Gjaponês (Kana)
+no Norvegjês
+pl Polac
+ru Rus
+se Svedês
+terminal Terminâl
+ua Ucrain
+us American (USA)

data/langs/he-IL.txt

@@ -0,0 +1,19 @@
+be בלגית
+br פורטוגזית (ברזיל)
+cz צ'כית
+de גרמנית
+dk דנית
+es ספרדית
+emoji אימוג'י
+fi פינית
+fr צרפתית
+gr יוונית
+il עברית
+it איטלקית
+no נורווגית
+pl פולנית
+ru רוסית
+se שוודית
+terminal טרמינל
+ua אוקראינית
+us אנגלית (ארה"ב)

data/langs/pl-PL.txt

@@ -0,0 +1,2 @@
+emoji emoji
+terminal terminal

data/langs/ru-RU.txt

@@ -0,0 +1,11 @@
+de Немецкий
+es Испанский
+fi Финский
+gr Греческий
+it Итальянский
+no Норвежский
+pl Польский
+ru Русский
+se Шведский
+terminal Терминал
+us Английский (США)

data/meson.build

@@ -12,7 +12,7 @@ desktopconf.set('bindir', bindir)
 
 desktop_file = 'sm.puri.Squeekboard.desktop'
 
-i18n.merge_file(
+i18n.merge_file('desktop',
     input: configure_file(
       input: desktop_file + '.in.in',
       output: desktop_file + '.in',

data/popover.ui

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="app-menu">
-    <item>
-      <!-- translators: This is a emmoji keyboard layout -->
-      <attribute name="label" translatable="yes">Emoji</attribute>
-      <attribute name="action">layout</attribute>
-      <attribute name="target">emoji</attribute>
-    </item>
-    <item>
-      <!-- translators: This is a terminal keyboard layout -->
-      <attribute name="label" translatable="yes">Terminal</attribute>
-      <attribute name="action">layout</attribute>
-      <attribute name="target">terminal</attribute>
-    </item>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Keyboard Settings</attribute>
-        <attribute name="action">settings</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

data/popup.ui

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.16"/>
+  <object class="GtkPopoverMenu" id="main_menu">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+      </object>
+      <packing>
+        <property name="submenu">main</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>

data/sm.puri.Squeekboard.desktop.in.in

@@ -1,16 +1,9 @@
 [Desktop Entry]
 Name=Squeekboard
-GenericName=On Screen Keyboard
-Comment=An on screen virtual keyboard
+GenericName=Squeekboard Virtual Keyboard
+Comment=Virtual Keyboard
 Exec=@bindir@/squeekboard
-Icon=input-keyboard-symbolic
 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

data/squeekboard.gresources.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/sm/puri/squeekboard">
-   <file compressed="true">common.css</file>
    <file compressed="true">style.css</file>
    <file compressed="true">style-Adwaita:dark.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">popover.ui</file>
+   <file compressed="true" preprocess="xml-stripblanks">popup.ui</file>
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>

data/style-Adwaita:dark.css

@@ -1,22 +1,34 @@
-/* Adwaita-dark style keyboard */
 sq_view {
     background-color: rgba(0, 0, 0, 255);
     color: #ffffff;
+    font-family: cantarell, sans-serif;
+    font-size: 25px;
 }
 
 sq_view sq_button {
     color: #deddda;
     background: #464448;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #5e5c64;
+    border-radius: 3px;
+    margin: 4px 2px 4px 2px;
+}
+
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
 }
 
 sq_button:active {
     background: #747077;
+    border-color: #96949d;
 }
 
 sq_button.altline,
 sq_button.special,
 sq_button.wide {
     background: #2b292f;
+    border-color: #3e3a44;
 }
 
 sq_button.latched {
@@ -29,12 +41,20 @@ sq_button.locked {
     color: #1c71d8;
 }
 
+sq_button.action {
+    font-size: 0.75em;
+}
+
+sq_button.small {
+    font-size: 0.5em;
+}
+
 #Return {
     background: #1c71d8;
+    border-color: #1a5fb4;
 }
 
 #Return:active {
     background: #1c71d8;
+    border-color: #3584e4;
 }
-
-@import url("resource:///sm/puri/squeekboard/common.css");

data/style.css

@@ -1,47 +1,63 @@
-/* Keyboard style */
 sq_view {
-    background-color: mix(@theme_base_color, @theme_fg_color, 0.1);
-    box-shadow:inset 0 1px 0 0 mix(@borders, @theme_base_color, 0.8);
+    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
+    color: @theme_text_color; /*#ffffff;*/
+    font-family: cantarell, sans-serif;
+    font-size: 25px;
 }
 
-sq_button {
-    color: @theme_fg_color;
-    background: alpha(@theme_fg_color, 0.07); 
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2); 
+sq_view sq_button {
+    color: @theme_fg_color; /*#deddda;*/
+    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
+    border-style: solid;
+    border-width: 1px;
+    border-color: @borders; /* #5e5c64;*/
+    border-radius: 3px;
+    margin: 4px 2px 4px 2px;
 }
 
-sq_button:active {
-    background: alpha(@theme_fg_color, 0.11);
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
+}
+
+sq_button:active,
+sq_button.altline:active,
+sq_button.special:active,
+sq_button.wide:active {
+    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
+    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
 }
 
 sq_button.altline,
-sq_button.special {
-    background: alpha(@theme_fg_color, 0.15); 
-}
-
-sq_button.altline:active,
-sq_button.special:active {
-    background: alpha(@theme_fg_color, 0.2);
+sq_button.special,
+sq_button.wide {
+    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
+    border-color: @borders; /* #3e3a44; */
 }
 
 sq_button.latched {
-    background: alpha(@theme_fg_color, 0.2); 
-    color: alpha(@theme_fg_color, 0.8);
+    background: @theme_fg_color; /*#ffffff;*/
+    color: @theme_bg_color; /*#2b292f;*/
 }
 
 sq_button.locked {
-    background: alpha(@theme_fg_color, 0.5);
-    color: @theme_base_color;
+    background: @theme_fg_color; /*#ffffff;*/
+    color: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#2b292f;*/
+}
+
+sq_button.action {
+    font-size: 0.75em;
+}
+
+sq_button.small {
+    font-size: 0.5em;
 }
 
 #Return {
-    background: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
+    background: @theme_selected_bg_color; /* #1c71d8; */
+    border-color: @borders; /*#1a5fb4;*/
 }
 
 #Return:active {
-    background: mix(@theme_selected_bg_color, black, 0.2);
-    color: mix(@theme_selected_fg_color, black, 0.2);
+    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
+    border-color: @borders; /*#3584e4;*/
 }
-
-@import url("resource:///sm/puri/squeekboard/common.css");

debian/cargo/config

@@ -9,3 +9,4 @@ replace-with = 'vendored-sources'
 
 [source.vendored-sources]
 directory = '/usr/share/cargo/registry'
+

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -3,12 +3,11 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
- cargo-mozilla,
- debhelper-compat (= 13),
+ cargo,
+ debhelper (>= 10),
  meson (>=0.51.0),
  ninja-build,
  pkg-config,
- libbsd-dev,
  libglib2.0-dev,
  libgnome-desktop-3-dev,
  libgtk-3-dev,
@@ -21,24 +20,23 @@ Build-Depends:
  librust-gtk+v3-22-dev (>= 0.5),
  librust-gtk-sys-dev,
  librust-maplit-1-dev (>= 1.0),
+ librust-regex-1-dev (>= 1.1),
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
  librust-xkbcommon-0.4+wayland-dev (>= 0.4),
- librust-zbus-dev (>=1.0),
  libwayland-dev (>= 1.16),
  lsb-release,
  python3,
- python3-ruamel.yaml,
- rustc-mozilla,
+ rustc,
  wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
+Vcs-Browser: https://source.puri.sm/pureos/squeekboard
+Vcs-Git: https://source.puri.sm/pureos/squeekboard.git
 
 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},

debian/control-newer

@@ -1,62 +0,0 @@
-Source: squeekboard
-Section: x11
-Priority: optional
-Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
-Build-Depends:
- cargo,
- debhelper-compat (= 13),
- meson (>=0.51.0),
- ninja-build,
- pkg-config,
- libbsd-dev,
- libglib2.0-dev,
- libgnome-desktop-3-dev,
- libgtk-3-dev,
- libfeedback-dev,
- librust-bitflags-dev (>= 1.0),
- librust-clap-dev (>= 2.32),
- librust-gio+v2-58-dev,
- librust-glib+v2-58-dev,
- librust-glib-sys-dev,
- librust-gtk+v3-22-dev (>= 0.5),
- librust-gtk-sys-dev,
- librust-maplit-1-dev (>= 1.0),
- librust-serde-derive-1-dev (>= 1.0),
- librust-serde-yaml-0.8-dev (>= 0.8),
- librust-xkbcommon-0.4+wayland-dev (>= 0.4),
- librust-zbus-dev (>= 1.9),
- libwayland-dev (>= 1.16),
- lsb-release,
- python3,
- python3-ruamel.yaml,
- rustc,
- wayland-protocols (>= 1.14),
-Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/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},
- ${misc:Depends},
-Breaks:
- librem5-base (<< 24),
-Description: On-screen keyboard for Wayland
- Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
-
-Package: squeekboard-devel
-Architecture: linux-any
-Depends:
- python3,
- python3-gi,
- ${shlibs:Depends},
- ${misc:Depends},
-Description: Resources for making Squeekboard layouts
- Tools for creating and testing Squeekboard layouts:
- .
-  * squeekboard-entry
-  * squeekboard-test-layout

debian/gbp.conf

@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = pureos/byzantium
+debian-tag = pureos/%(version)s
+debian-tag-msg = %(pkg)s %(version)s
+
+[tag]
+sign-tags = true

debian/librem5-ci.yml

@@ -0,0 +1,29 @@
+include:
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
+
+stages:
+ - package
+ - test-package
+
+.tags: &tags
+  tags:
+    - librem5
+
+check_release:
+  <<: *tags
+  stage: test-package
+  only:
+    refs:
+      - pureos/byzantium
+  script:
+    - apt-get -y install git python3
+    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
+
+# check-tarball relies on the contents of other branches,
+# which are irrelevant for MRs. It's similar to checking tags in this way.
+check-tarball:
+  extends: .l5-check-tarball
+  only:
+    refs:
+        - pureos/byzantium

debian/rules

@@ -25,10 +25,10 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)
 
 
 distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),bookworm))
-	newer = true
+ifneq (,$(filter $(distrel),buster amber))
+	legacy = true
 else
-	newer = false
+	legacy = false
 endif
 
 %:
@@ -38,6 +38,6 @@ endif
 # causing Cargo to refuse to build with a crates.io copy
 override_dh_auto_configure:
 	[ ! -f Cargo.lock ] || rm Cargo.lock
-	dh_auto_configure -- -Dnewer=$(newer) -Donline=false
+	dh_auto_configure -- -Dlegacy=$(legacy)
 
 override_dh_autoreconf:

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

debian/squeekboard.install

@@ -1,4 +1,2 @@
 tools/squeekboard-restyled usr/bin
 usr/bin/squeekboard /usr/bin
-usr/share/applications/
-usr/share/locale/

doc/hacking.md

@@ -90,37 +90,9 @@ Layouts can be selected using the GNOME Settings application.
 $ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
 ```
 
-### Debugging mode
-
-Squeekboard prints some information on standard output by default. To get deep debugging information, it can also print all changes in (some of) its internal state. Those logs are most useful when reporting hard to catch issues, and can be enabled using the following command:
-
-```
-busctl set-property --user sm.puri.SqueekDebug /sm/puri/SqueekDebug sm.puri.SqueekDebug Enabled b true
-```
-
-### Environment Variables
-
-Besides the environment variables supported by GTK and [GLib](https://docs.gtk.org/glib/running.html) applications
-squeekboard honors the `SQUEEKBOARD_DEBUG` environment variable which can
-contain a comma separated list of:
-
-- `force-show` : Show squeekboard on startup independent of any gsettings or compositor requests
-- `gtk-inspector`: Spawn [gtk-inspector](https://wiki.gnome.org/Projects/GTK/Inspector)
-
 Coding
 ------
 
-### Reference docs
-
-Reference documentation can be generated using:
-
-```
-cd squeekboard_build/ 
-../squeekboard_source/cargo.sh doc --no-deps --document-private-items
-```
-
-as well as found [online](https://world.pages.gitlab.gnome.org/Phosh/squeekboard/doc/rs/).
-
 ### Project structure
 
 Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
@@ -139,16 +111,6 @@ User interface modules should:
 
 ### Style
 
-Note that some portions, like the .gitlab-ci.yml file have accummulated enough style/whitespace conflicts that an enforced style checker is now applied.
-
-To fix your contributions before submitting a change, use:
-
-```
-./tools/style-check_source --apply
-```
-
-* * *
-
 Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors:
 
 - skipping brackets `{}` after every `if()`, `else`, and similar ([SCI CERT C: EXP19-C](https://wiki.sei.cmu.edu/confluence/display/c/EXP19-C.+Use+braces+for+the+body+of+an+if%2C+for%2C+or+while+statement))
@@ -213,81 +175,14 @@ All Cargo dependencies must be selected in the version available in PureOS, and
 
 Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.
 
-Releases
-----------
-
-Squeekboard should get a new release every time something interesting comes in. Preferably when there are no known bugs too. People will rely on theose releases, after all.
-
-### 1. Update `Cargo.toml`.
-
-While the file is not actually used, it's a good idea to save the config in case some rare bug appears in dependencies.
+`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It must correspond to the default dependency configuration: without flags to use older or newer versions of dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
 
 ```
-cd squeekboard-build
-.../squeekboard-source/cargo.sh update
+cd build_dir
+ninja ./Cargo.toml
+sh /source_path/cargo.sh update
 ninja test
-cp ./Cargo.lock .../squeekboard-source
+cp ./Cargo.lock /source_path/
 ```
 
-Then commit the updated `Cargo.lock`.
-
-### 2. Choose the version number
-
-Squeekboard tries to use semantic versioning. It's 3 numbers separated by dots: "a.b.c". Releases which only fix bugs and nothing else are "a.b.c+1". Releases which add user-visible features in addition to bug fixes are "a.b+1.0". Releases which, in addition to the previous, change *the user contract* in incompatible ways are "a+1.0.0". "The user contract" means plugin APIs that are deemed stable, or the way language switching works, etc. In other words, incompatible changes to developers, or big changes to users bump "a" to the next natural number.
-
-### 3. Update the number in `meson.build`
-
-It's in the `project(version: xxx)` statement.
-
-### 4. Update packaging
-
-Packaging is in the `debian/` directory, and creates builds that can be quickly tested.
-
-```
-cd squeekboard-source
-gbp dch --multimaint-merge  --ignore-branch
-```
-
-Inspect `debian/changelog`, and make sure the first line contains the correct version number and suite. For example:
-
-```
-squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
-```
-
-Add the updated `debian/changelog` to the commit. The commit message should contain the release version and a description of changes.
-
-### 5. Update the NEWS file
-
-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:
-
-```
-git tag -s -u my_address@example.com v1.13.0 -m "squeekboard v1.13.0"
-git push v1.13.0
-```
-
-### 8. Rejoice
-
-You released a new version of Squeekboard, and made it available on PureOS. Congratulations.
+Since version 1.9.3, `Cargo.lock` is not actually used by the build system, due to `Cargo.toml` being generated at every build.

doc/index.md

@@ -1,6 +1,13 @@
 Welcome to squeekboard's documentation!
 =======================================
 
+Contents
+--------
+
+* [Tutorial](tutorial.md)
+* [Contributing](hacking.md)
+* [Switching views](views.md)
+
 Introduction
 ------------
 
@@ -11,9 +18,9 @@ Layouts
 
 Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
 
-Layouts are created using a [text-based format, based on YAML](layouts.md).
+Layouts are created using a text-based format, based on YAML.
 
-### Views
+TODO: Provide a description of the format.
 
 Squeekboard layouts are separated into *views* and use a *room metaphor* to [switch views](views.md).
 
@@ -21,7 +28,3 @@ Contributions
 -------------
 
 Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
-
-### Code documentation
-
-To expose the structure of Squeekboard in detail, there's a [code reference](doc/rs).

doc/layouts.md

@@ -1,121 +0,0 @@
-Layouts
-=====
-
-Squeekboard is composed of multiple layouts, several for each language, multiplied by each hint.
-
-Layouts live in the "keyboards" directory.
-
-Hints
--------
-
-The currently supported hints are: default, "email", "emoji", "number', "pin", "terminal", and "url".
-
-Each directory in "keyboards" is named after a hint, with the "keyboards" directory itself taking the role of default.
-
-Languages/scripts
------------------------
-
-Each hint directory contains multiple layout files. A single language will be composed of multiple files, with names starting with the same text. The language names are taken from iso639-3. An example is "gr".
-
-After the language name optionally comes a "+" and an indication of the variant. For example, "it+fur".
-
-Squeekboard will look for those based on the currently selected layout in Gnome Control Center.
-
-Then, there's an optional part "_wide", which Squeekboard will try to use if the current display is rather wide. Example: "us+colemak_wide" or "us_wide".
-
-Finally, the file name ends with ".yaml", e.g. "jp+kana_wide.yaml".
-
-Together with hint information, this gives a complete path to the layout like this: "keyboards/terminal/fr_wide.yaml" or "keyboards/cz+qwerty.yaml".
-
-Layout syntax
-------------------
-
-The layout file follows the YAML syntax, with specific meanings given to sections.
-
-### Outlines
-
-The "outlines" dictionary controls the widths and heights of buttons. 
-
-```
-outlines:
-    default: { width: 32, height: 52 }
-```
-The width and height numbers are not in pixels, but rather they are proportionally scaled to fit the panel size.
-
-There may be any number of outlines, but there are some special names:
-- "default" applies to every button unless explicitly changed. It should be used for buttons that emit text
-- "altline", "wide" have own color scheme, should be used for buttons which cause view changes
-- "special" has own color scheme, to be used for confirmations like enter.
-
-### Views
-
-The "views" dictionary contains the actual views and positions of buttons.
-
-```
-views:
-    base:
-        - "q w e r t y u i o p å"
-```
-
-Squeekboard's layouts consist of multiple views, of which only one is visible at a time. Different views may contain different or the same buttons, more or fewer buttons, but each layout is independent. They are *not* shift levels – there is no concept of "shift" in Squeekboard. View selection is also not dependent on modifiers.
-
-There is only one special view "base". Views and view switching are described in detail in the [views](views.md) document.
-
-Views in Squeekboard are based on rows. The first row comes near the top of the panel, the next one below, and so on.
-
-```
-- "Q W E R T Y U I O P Å"
-- "upper   z x c v b n m  BackSpace"
-```
-
-Each row is a single string, and button names are separated by spaces. In left-to-right languages, the panel will be laid out just like the view code. CAUTION: buttons are placed on the panel left-to-right, starting from the earliest position in the string. That may not display great in your text editor when you use right-to-left characters as button names.
-
-#### Button names in rows
-
-Unicode characters are supported in the row string, so it's easy to use the correct name for most of them. However, the layout code is still YAML, which excludes certain characters: the space " ", the backslash "\", the double quote `"`. Those must use a replacement name.
-
-Similarly, buttons that do not emit characters must have some names.
-
-### Buttons
-
-The buttons section describes what the button looks like and what it does.
-
-```
-    BackSpace:
-        outline: altline
-        icon: "edit-clear-symbolic"
-        action: erase
-```
-
-Each entry in the "buttons" dictionary describes some button already present in one of the "views" rows. In the above example, it's "BackSpace".
-
-The button description can have a number of components, each optional. For details, see 
-
-- "outline" selects which entry from the "outlines" section to use to draw this button,
-- "label" is what should be displayed on the button, if its name is unsuitable,
-- "icon" is the name of the svg icon to use instead of a label (icons are builtin, see the "data/icons" directory),
-- "text" is the text to submit when the button is clicked – if the name of the button is not suitable,
-- "keysym" is the emulated keyboard keysym to send instead of sending text. Its use is discouraged: Squeekboard will automatically send keysyms if it detects that the receiving application does not accept text.
-- "modifier" makes the button set an emulated keyboard modifier. The use of this is discouraged, and never needed for entering text.
-- "action" sets aside the button for special actions like view switching
-
-#### Action
-
-```
-        action:
-            set_view: "numbers"
-```
-
-The "action" property has multiple forms.
-
-- "erase" will erase the position behind the cursor,
-- "show_preferences" will open the language selection popup,
-- "set_view" simply switches to a view,
-- "lock_view" switches to a view for a moment.
-
-The two switching modes are better described in the [views](views.md) document.
-
-Sources
-----------
-
-The sources, where all this is documented and up to date are in "src/data/parsing.rs". The reference documentation for the `rs::data::parsing::Layout` structure is the main place to look at.

doc/tutorial.md

@@ -9,18 +9,19 @@ So at least I will try to start writing a short how-to here and edit this post a
 
 ## Creating a new layout
 
-Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout, with the [layouts](layouts.md) documentation in hand.
+Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
 
 ### Get one of the existing keyboard layouts
 
 * You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
 * The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* Take a look and try to understand them :slight_smile:
+
 
 ### Creating the keyboard layout
 
 * To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
-* Select and enable the input source you would like to change from the Region & Language section of the device settings. Perhaps use "A user-defined custom layout" listed under Other.
-* Find the correct name of the .yaml file associated with that input source. This can be found with the command 
+* The correct name of the .yaml file can be found with the command 
 
 ```
 gsettings get org.gnome.desktop.input-sources sources
@@ -28,14 +29,12 @@ gsettings get org.gnome.desktop.input-sources sources
 
 The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
 So for example “de.yaml” would be the correct name for the German keyboard layout.
-If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
 
-There is also associated files for that layout in landscape, terminal, number, emoji mode. They can be found at something analogous to `us_wide.yaml`, `terminal/us.yaml`, `number/us.yaml`, `emoji/us.yaml`, respectively.
+If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
 
 ### Testing the layout
 
 Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
-The yaml file will overwrite the default settings for that layout. If you want to go back to default, simply remove the file.
 
 You can also use the `test_layout` tool from the -devel package to check it for errors:
 

eek/eek-element.c

@@ -0,0 +1,163 @@
+/* 
+ * 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));
+}

eek/eek-element.h

@@ -0,0 +1,53 @@
+/* 
+ * 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 */

eek/eek-gtk-keyboard.c

@@ -35,7 +35,6 @@
 
 #include "eekboard/eekboard-context-service.h"
 #include "src/layout.h"
-#include "src/popover.h"
 #include "src/submission.h"
 
 #define LIBFEEDBACK_USE_UNSTABLE_API
@@ -49,16 +48,13 @@ typedef struct _EekGtkKeyboardPrivate
     struct render_geometry render_geometry; // mutable
 
     EekboardContextService *eekboard_context; // unowned reference
-    struct squeek_popover *popover; // shared reference
-    struct squeek_state_manager *state_manager; // shared reference
     struct submission *submission; // unowned reference
 
-    Layout *keyboard; // unowned reference; it's kept in server-context
+    struct squeek_layout_state *layout; // unowned
+    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
 
     GdkEventSequence *sequence; // unowned reference
     LfbEvent *event;
-
-    gulong kb_signal;
 } EekGtkKeyboardPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
@@ -120,6 +116,15 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
     return FALSE;
 }
 
+// Units of virtual pixels size
+static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
+    (void)height;
+    if (width < 540) {
+        return ARRANGEMENT_KIND_BASE;
+    }
+    return ARRANGEMENT_KIND_WIDE;
+}
+
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                      GtkAllocation *allocation)
@@ -127,6 +132,15 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
     EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD (self);
     EekGtkKeyboardPrivate *priv =
         eek_gtk_keyboard_get_instance_private (keyboard);
+    // check if the change would switch types
+    enum squeek_arrangement_kind new_type = get_type(
+                (uint32_t)(allocation->width - allocation->x),
+                (uint32_t)(allocation->height - allocation->y));
+    if (priv->layout->arrangement != new_type) {
+        priv->layout->arrangement = new_type;
+        uint32_t time = gdk_event_get_time(NULL);
+        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
+    }
 
     if (priv->renderer) {
         set_allocation_size (keyboard, priv->keyboard->layout,
@@ -142,7 +156,6 @@ on_event_triggered (LfbEvent      *event,
                     GAsyncResult  *res,
                     gpointer      unused)
 {
-    (void)unused;
     g_autoptr (GError) err = NULL;
 
     if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
@@ -173,7 +186,7 @@ static void drag(EekGtkKeyboard *self,
     squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                        priv->submission,
                        x, y, priv->render_geometry.widget_to_layout, time,
-                       priv->popover, priv->state_manager, self);
+                       priv->eekboard_context, self);
 }
 
 static void release(EekGtkKeyboard *self, guint32 time)
@@ -184,7 +197,7 @@ static void release(EekGtkKeyboard *self, guint32 time)
     }
     squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                           priv->submission, priv->render_geometry.widget_to_layout, time,
-                          priv->popover, priv->state_manager, self);
+                          priv->eekboard_context, self);
 }
 
 static gboolean
@@ -294,22 +307,16 @@ eek_gtk_keyboard_set_property (GObject      *object,
     }
 }
 
-// This may actually get called multiple times in a row
-// if both a parent object and its parent get destroyed
 static void
 eek_gtk_keyboard_dispose (GObject *object)
 {
     EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (object);
     EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
-    if (priv->kb_signal != 0) {
-        g_signal_handler_disconnect(priv->eekboard_context, priv->kb_signal);
-        priv->kb_signal = 0;
-    }
-
     if (priv->renderer) {
         eek_renderer_free(priv->renderer);
         priv->renderer = NULL;
+        priv->renderer = NULL;
     }
 
     if (priv->keyboard) {
@@ -391,15 +398,13 @@ on_notify_keyboard (GObject              *object,
 GtkWidget *
 eek_gtk_keyboard_new (EekboardContextService *eekservice,
                       struct submission *submission,
-                      struct squeek_state_manager *state_manager,
-                      struct squeek_popover *popover)
+                      struct squeek_layout_state *layout)
 {
     EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
     EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
-    priv->popover = popover;
     priv->eekboard_context = eekservice;
     priv->submission = submission;
-    priv->state_manager = state_manager;
+    priv->layout = layout;
     priv->renderer = NULL;
     // This should really be done on initialization.
     // Before the widget is allocated,
@@ -414,13 +419,12 @@ eek_gtk_keyboard_new (EekboardContextService *eekservice,
         .widget_to_layout = {
             .origin_x = 0,
             .origin_y = 0,
-            .scale_x = 1,
-            .scale_y = 1,
+            .scale = 1,
         },
     };
     priv->render_geometry = initial_geometry;
 
-    priv->kb_signal = g_signal_connect (eekservice,
+    g_signal_connect (eekservice,
                       "notify::keyboard",
                       G_CALLBACK(on_notify_keyboard),
                       ret);

eek/eek-gtk-keyboard.h

@@ -30,8 +30,6 @@
 
 #include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
-#include "src/main.h"
-#include "src/popover.h"
 
 struct submission;
 struct squeek_layout_state;
@@ -50,7 +48,7 @@ struct _EekGtkKeyboardClass
     gpointer pdummy[24];
 };
 
-GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_state_manager *state_manager, struct squeek_popover *popover);
+GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
 void       eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self);
 
 G_END_DECLS

eek/eek-keyboard.c

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #define _XOPEN_SOURCE 500
-#include <bsd/string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@@ -75,7 +74,7 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
     if ((void*)ptr == (void*)-1) {
         g_error("Failed to set up mmap");
     }
-    strlcpy(ptr, xkb_keymap_str, keymap_len);
+    strncpy(ptr, xkb_keymap_str, keymap_len);
     munmap(ptr, keymap_len);
     free(xkb_keymap_str);
     xkb_keymap_unref(keymap);
@@ -86,19 +85,18 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
     return km;
 }
 
-void layout_free(Layout *self) {
+void level_keyboard_free(LevelKeyboard *self) {
     squeek_layout_free(self->layout);
     g_free(self);
 }
 
-Layout*
-layout_new (char *style_name, struct squeek_layout *layout)
+LevelKeyboard*
+level_keyboard_new (struct squeek_layout *layout)
 {
-    Layout *keyboard = g_new0(Layout, 1);
+    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
     if (!keyboard) {
         g_error("Failed to create a keyboard");
     }
     keyboard->layout = layout;
-    strlcpy(keyboard->style_name, style_name, 19);
     return keyboard;
 }

eek/eek-keyboard.h

@@ -38,15 +38,18 @@ struct keymap {
     size_t fd_len; // length of the data inside keymap_fd
 };
 
-/// Keyboard info holder
-struct _Layout {
-    char style_name[20]; // The name of the css class on layout
+/// Keyboard state holder
+struct _LevelKeyboard {
     struct squeek_layout *layout; // owned
+// FIXME: This no longer needs to exist, keymap was folded into layout.
 };
+typedef struct _LevelKeyboard LevelKeyboard;
 
-Layout*
-layout_new (char *style_name, struct squeek_layout *layout);
-void layout_free(Layout *self);
+gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
+
+LevelKeyboard*
+level_keyboard_new (struct squeek_layout *layout);
+void level_keyboard_free(LevelKeyboard *self);
 
 G_END_DECLS
 #endif  /* EEK_KEYBOARD_H */

eek/eek-renderer.c

@@ -18,8 +18,6 @@
  * 02110-1301 USA
  */
 
-#define G_LOG_DOMAIN "squeekboard-eek-renderer"
-
 #include <math.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -56,13 +54,6 @@ render_outline (cairo_t     *cr,
         position.x, position.y, position.width, position.height);
 }
 
-float get_scale(cairo_t *cr) {
-    double width = 1;
-    double height = 1;
-    cairo_user_to_device_distance (cr, &width, &height);
-    return width;
-}
-
 /// Rust interface
 void eek_render_button_in_context(uint32_t scale_factor,
                                      cairo_t     *cr,
@@ -79,17 +70,16 @@ void eek_render_button_in_context(uint32_t scale_factor,
 
     /* render icon (if any) */
     if (icon_name) {
-        int context_scale = ceil (get_scale (cr));
         cairo_surface_t *icon_surface =
-            eek_renderer_get_icon_surface (icon_name, 16, scale_factor * context_scale);
+            eek_renderer_get_icon_surface (icon_name, 16, scale_factor);
         if (icon_surface) {
-            double width = cairo_image_surface_get_width (icon_surface);
-            double height = cairo_image_surface_get_height (icon_surface);
+            gint width = cairo_image_surface_get_width (icon_surface);
+            gint height = cairo_image_surface_get_height (icon_surface);
 
             cairo_save (cr);
             cairo_translate (cr,
-                             (bounds.width - width / (scale_factor * context_scale)) / 2,
-                             (bounds.height - height / (scale_factor * context_scale)) / 2);
+                             (bounds.width - (double)width / scale_factor) / 2,
+                             (bounds.height - (double)height / scale_factor) / 2);
             cairo_rectangle (cr, 0, 0, width, height);
             cairo_clip (cr);
             /* Draw the shape of the icon using the foreground color */
@@ -122,7 +112,7 @@ eek_get_style_context_for_button (EekRenderer *self,
                                   const char *name,
                                   const char *outline_name,
                                   const char *locked_class,
-                                  uint64_t     pressed)
+               uint64_t     pressed)
 {
     GtkStyleContext *ctx = self->button_context;
     /* Set the name of the button on the widget path, using the name obtained
@@ -206,7 +196,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
                               struct render_geometry geometry,
                               struct submission *submission,
                                    cairo_t     *cr,
-                              Layout *keyboard)
+                              LevelKeyboard *keyboard)
 {
     g_return_if_fail (geometry.allocation_width > 0.0);
     g_return_if_fail (geometry.allocation_height > 0.0);
@@ -219,7 +209,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
 
     cairo_save(cr);
     cairo_translate (cr, geometry.widget_to_layout.origin_x, geometry.widget_to_layout.origin_y);
-    cairo_scale (cr, geometry.widget_to_layout.scale_x, geometry.widget_to_layout.scale_y);
+    cairo_scale (cr, geometry.widget_to_layout.scale, geometry.widget_to_layout.scale);
 
     squeek_draw_layout_base_view(keyboard->layout, self, cr);
     squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
@@ -236,8 +226,6 @@ eek_renderer_free (EekRenderer        *self)
     g_object_unref(self->css_provider);
     g_object_unref(self->view_context);
     g_object_unref(self->button_context);
-    g_clear_signal_handler (&self->theme_name_id, gtk_settings_get_default());
-
     // this is where renderer-specific surfaces would be released
 
     free(self);
@@ -269,61 +257,23 @@ static GType button_type(void) {
     return type;
 }
 
-
-static void
-on_gtk_theme_name_changed (GtkSettings *settings, gpointer foo, EekRenderer *self)
-{
-  g_autofree char *name = NULL;
-
-  g_object_get (settings, "gtk-theme-name", &name, NULL);
-  g_debug ("GTK theme: %s", name);
-
-  gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
-                                                GTK_STYLE_PROVIDER (self->css_provider));
-  gtk_style_context_remove_provider (self->button_context,
-                                     GTK_STYLE_PROVIDER(self->css_provider));
-  gtk_style_context_remove_provider (self->view_context,
-                                     GTK_STYLE_PROVIDER(self->css_provider));
-
-  g_set_object (&self->css_provider, squeek_load_style());
-
-  gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                             GTK_STYLE_PROVIDER (self->css_provider),
-                                             GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-  gtk_style_context_add_provider (self->button_context,
-                                  GTK_STYLE_PROVIDER(self->css_provider),
-                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-  gtk_style_context_add_provider (self->view_context,
-                                  GTK_STYLE_PROVIDER(self->css_provider),
-                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-}
-
-
 static void
 renderer_init (EekRenderer *self)
 {
     self->pcontext = NULL;
     self->scale_factor = 1;
 
-    GtkSettings *gtk_settings;
-
-    gtk_settings = gtk_settings_get_default ();
-
-    self->theme_name_id = g_signal_connect (gtk_settings, "notify::gtk-theme-name",
-                                            G_CALLBACK (on_gtk_theme_name_changed), self);
-
     self->css_provider = squeek_load_style();
 }
 
 EekRenderer *
-eek_renderer_new (Layout  *keyboard,
+eek_renderer_new (LevelKeyboard  *keyboard,
                   PangoContext *pcontext)
 {
     EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
     renderer_init(renderer);
     renderer->pcontext = pcontext;
     g_object_ref (renderer->pcontext);
-    const char *purpose_class = "normal";
 
     /* Create a style context for the layout */
     GtkWidgetPath *path = gtk_widget_path_new();
@@ -335,7 +285,6 @@ eek_renderer_new (Layout  *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);
@@ -346,55 +295,6 @@ eek_renderer_new (Layout  *keyboard,
     if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
         gtk_widget_path_iter_add_class(path, -1, "wide");
     }
-    /* Add style classes based on purpose */
-    switch (squeek_layout_get_purpose (keyboard->layout)) {
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL:
-        purpose_class = "normal";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_ALPHA:
-        purpose_class = "alpha";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DIGITS:
-        purpose_class = "digits";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
-        purpose_class = "number";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
-        purpose_class = "phone";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_URL:
-        purpose_class = "url";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_EMAIL:
-        purpose_class = "email";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NAME:
-        purpose_class = "name";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PASSWORD:
-        purpose_class = "password";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PIN:
-        purpose_class = "pin";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DATE:
-        purpose_class = "date";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TIME:
-        purpose_class = "time";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DATETIME:
-        purpose_class = "datetime";
-        break;
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
-        purpose_class = "terminal";
-        break;
-    default:
-        g_warning ("Unknown input purpose %d", squeek_layout_get_purpose(keyboard->layout));
-    }
-    gtk_widget_path_iter_add_class(path, -1, purpose_class);
-
     gtk_widget_path_append_type(path, button_type());
     renderer->button_context = gtk_style_context_new ();
     gtk_style_context_set_path(renderer->button_context, path);

eek/eek-renderer.h

@@ -39,8 +39,6 @@ typedef struct EekRenderer
     GtkStyleContext *button_context; // TODO: maybe move a copy to each button
     /// Style class for rendering the view and button CSS.
     gchar *extra_style; // owned
-    // Theme name change signal handler id
-    gulong theme_name_id;
 
     // Mutable state
     gint scale_factor; /* the outputs scale factor */
@@ -58,7 +56,7 @@ struct render_geometry {
 };
 
 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
-EekRenderer     *eek_renderer_new              (Layout     *keyboard,
+EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
                                                 PangoContext    *pcontext);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                 gint             scale);
@@ -68,7 +66,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, Layout *keyboard);
+                                                cairo_t         *cr, LevelKeyboard *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);
 

eek/eek-types.h

@@ -39,7 +39,7 @@ typedef struct _EekBounds EekBounds;
 
 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _ServerContextService ServerContextService;
-typedef struct _Layout Layout;
+typedef struct _LevelKeyboard LevelKeyboard;
 
 /**
  * EekPoint:
@@ -87,8 +87,7 @@ void       eek_bounds_free     (EekBounds       *bounds);
 struct transformation {
     gdouble origin_x;
     gdouble origin_y;
-    gdouble scale_x;
-    gdouble scale_y;
+    gdouble scale;
 };
 
 G_END_DECLS

eek/layersurface.c

@@ -1,17 +1,11 @@
 /*
- * Copyright (C) 2018-2023 Purism SPC
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
+ * Copyright (C) 2018 Purism SPC
+ * SPDX-License-Identifier: GPL-3.0+
  * 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 an updated version of this notice.
-
-Up-to-date with Phosh revision 953894a2.
+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.
 
 */
 
@@ -22,16 +16,6 @@ Up-to-date with Phosh revision 953894a2.
 
 #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,
@@ -59,83 +43,73 @@ enum {
 };
 static guint signals [N_SIGNALS];
 
+
 typedef struct {
-  struct wl_surface            *wl_surface;
+  struct wl_surface *wl_surface;
   struct zwlr_layer_surface_v1 *layer_surface;
 
   /* Properties */
-  guint                         anchor;
-  guint                         layer;
-  gboolean                      kbd_interactivity;
-  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;
+  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;
+  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,
-                         struct zwlr_layer_surface_v1 *surface,
-                         uint32_t                      serial,
-                         uint32_t                      width,
-                         uint32_t                      height)
+static void layer_surface_configure(void                         *data,
+                                    struct zwlr_layer_surface_v1 *surface,
+                                    uint32_t                      serial,
+                                    uint32_t                      width,
+                                    uint32_t                      height)
 {
   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);
   gtk_window_resize (GTK_WINDOW (self), width, height);
-  zwlr_layer_surface_v1_ack_configure (surface, serial);
+  zwlr_layer_surface_v1_ack_configure(surface, serial);
 
   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 %s (%p) (%dx%d)", priv->namespace, self, width, height);
-  if (changed) {
-    g_signal_emit (self, signals[CONFIGURED], 0);
-  }
+  g_debug("Configured %p", self);
+  g_signal_emit (self, signals[CONFIGURED], 0);
 }
 
 
-static void
-layer_surface_closed (void                         *data,
-                      struct zwlr_layer_surface_v1 *surface)
+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);
+  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,
+    .configure = layer_surface_configure,
+    .closed = layer_surface_closed,
 };
 
-
 static void
 phosh_layer_surface_set_property (GObject      *object,
                                   guint         property_id,
@@ -144,7 +118,7 @@ phosh_layer_surface_set_property (GObject      *object,
 {
   PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
   PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
-  int width, height;
+  gint width, height;
 
   switch (property_id) {
   case PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL:
@@ -157,7 +131,7 @@ phosh_layer_surface_set_property (GObject      *object,
     priv->anchor = g_value_get_uint (value);
     break;
   case PHOSH_LAYER_SURFACE_PROP_LAYER:
-    phosh_layer_surface_set_layer (self, g_value_get_uint (value));
+    priv->layer = 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));
@@ -195,11 +169,11 @@ phosh_layer_surface_set_property (GObject      *object,
     break;
   case PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH:
     width = g_value_get_uint (value);
-    phosh_layer_surface_set_size (self, width, priv->height);
+    phosh_layer_surface_set_size(self, width, priv->height);
     break;
   case PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT:
     height = g_value_get_uint (value);
-    phosh_layer_surface_set_size (self, priv->width, height);
+    phosh_layer_surface_set_size(self, priv->width, height);
     break;
   case PHOSH_LAYER_SURFACE_PROP_NAMESPACE:
     g_free (priv->namespace);
@@ -275,16 +249,14 @@ phosh_layer_surface_get_property (GObject    *object,
 
 
 static void
-phosh_layer_surface_realize (GtkWidget *widget)
+on_phosh_layer_surface_realized (PhoshLayerSurface *self, gpointer unused)
 {
-  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);
+  priv = phosh_layer_surface_get_instance_private (self);
 
   gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
   gdk_wayland_window_set_use_custom_surface (gdk_window);
@@ -295,63 +267,77 @@ phosh_layer_surface_realize (GtkWidget *widget)
 
 
 static void
-phosh_layer_surface_map (GtkWidget *widget)
+on_phosh_layer_surface_mapped (PhoshLayerSurface *self, gpointer unused)
 {
-  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);
+      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, namespace: %s", priv->wl_surface, priv->namespace);
+  g_debug ("Mapped %p", priv->wl_surface);
 
-  priv->layer_surface = zwlr_layer_shell_v1_get_layer_surface (priv->layer_shell,
-                                                               priv->wl_surface,
-                                                               priv->wl_output,
-                                                               priv->layer,
-                                                               priv->namespace);
-  zwlr_layer_surface_v1_set_exclusive_zone (priv->layer_surface, priv->exclusive_zone);
-  zwlr_layer_surface_v1_set_size (priv->layer_surface, priv->width, priv->height);
-  zwlr_layer_surface_v1_set_anchor (priv->layer_surface, priv->anchor);
-  zwlr_layer_surface_v1_set_margin (priv->layer_surface,
-                                    priv->margin_top,
-                                    priv->margin_right,
-                                    priv->margin_bottom,
-                                    priv->margin_left);
-  zwlr_layer_surface_v1_set_keyboard_interactivity (priv->layer_surface, priv->kbd_interactivity);
-  zwlr_layer_surface_v1_add_listener (priv->layer_surface,
-                                      &layer_surface_listener,
-                                      self);
-  wl_surface_commit (priv->wl_surface);
+  priv->layer_surface = zwlr_layer_shell_v1_get_layer_surface(priv->layer_shell,
+                                                              priv->wl_surface,
+                                                              priv->wl_output,
+                                                              priv->layer,
+                                                              priv->namespace);
+  zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, priv->exclusive_zone);
+  zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
+  zwlr_layer_surface_v1_set_anchor(priv->layer_surface, priv->anchor);
+  zwlr_layer_surface_v1_set_margin(priv->layer_surface,
+                                   priv->margin_top,
+                                   priv->margin_right,
+                                   priv->margin_bottom,
+                                   priv->margin_left);
+  zwlr_layer_surface_v1_set_keyboard_interactivity(priv->layer_surface, priv->kbd_interactivity);
+  zwlr_layer_surface_v1_add_listener(priv->layer_surface,
+                                     &layer_surface_listener,
+                                     self);
+  wl_surface_commit(priv->wl_surface);
 
   /* Process all pending events, otherwise we end up sending ack configure
    * to a not yet configured surface */
   wl_display_roundtrip (gdk_wayland_display_get_wl_display (gdk_display_get_default ()));
 }
 
-
 static void
-phosh_layer_surface_unmap (GtkWidget *widget)
+on_phosh_layer_surface_unmapped (PhoshLayerSurface *self, gpointer unused)
 {
-  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);
 
-  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
+  priv = phosh_layer_surface_get_instance_private (self);
+  if (priv->layer_surface) {
+    zwlr_layer_surface_v1_destroy(priv->layer_surface);
+    priv->layer_surface = NULL;
+  }
   priv->wl_surface = NULL;
+}
 
-  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->unmap (widget);
+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);
 }
 
 
@@ -361,7 +347,10 @@ phosh_layer_surface_dispose (GObject *object)
   PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
   PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
 
-  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
+  if (priv->layer_surface) {
+    zwlr_layer_surface_v1_destroy(priv->layer_surface);
+    priv->layer_surface = NULL;
+  }
   g_clear_pointer (&priv->namespace, g_free);
 
   G_OBJECT_CLASS (phosh_layer_surface_parent_class)->dispose (object);
@@ -372,29 +361,26 @@ 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_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_CONSTRUCT_ONLY | 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_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   props[PHOSH_LAYER_SURFACE_PROP_ANCHOR] =
     g_param_spec_uint (
@@ -404,7 +390,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
       0,
       G_MAXUINT,
       0,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   props[PHOSH_LAYER_SURFACE_PROP_LAYER] =
     g_param_spec_uint (
@@ -414,7 +400,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
       0,
       G_MAXUINT,
       0,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY] =
     g_param_spec_boolean (
@@ -521,13 +507,13 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
       "Namespace",
       "Namespace of the layer surface",
       "",
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_CONSTRUCT_ONLY | 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.
@@ -554,20 +540,17 @@ phosh_layer_surface_new (gpointer layer_shell,
 {
   return g_object_new (PHOSH_TYPE_LAYER_SURFACE,
                        "layer-shell", layer_shell,
-                       "wl-output", wl_output,
-                       NULL);
+                       "wl-output", wl_output);
 }
 
-
 /**
  * phosh_layer_surface_get_surface:
- * @self: The #PhoshLayerSurface
  *
  * Get the layer layer surface or #NULL if the window
  * is not yet realized.
  */
 struct zwlr_layer_surface_v1 *
-phosh_layer_surface_get_layer_surface (PhoshLayerSurface *self)
+phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self)
 {
   PhoshLayerSurfacePrivate *priv;
 
@@ -579,13 +562,12 @@ 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.
  */
 struct wl_surface *
-phosh_layer_surface_get_wl_surface (PhoshLayerSurface *self)
+phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self)
 {
   PhoshLayerSurfacePrivate *priv;
 
@@ -594,20 +576,16 @@ 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, int width, int height)
+phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
 {
   PhoshLayerSurfacePrivate *priv;
-  int old_width, old_height;
+  gint old_width, old_height;
 
   g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
   priv = phosh_layer_surface_get_instance_private (self);
@@ -628,7 +606,7 @@ phosh_layer_surface_set_size (PhoshLayerSurface *self, int width, int height)
   }
 
   if (gtk_widget_get_mapped (GTK_WIDGET (self))) {
-    zwlr_layer_surface_v1_set_size (priv->layer_surface, priv->width, priv->height);
+    zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
   }
 
   if (priv->height != old_height) {
@@ -640,22 +618,16 @@ phosh_layer_surface_set_size (PhoshLayerSurface *self, int width, int 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, int top, int right, int bottom, int left)
+phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, gint bottom, gint left)
 {
   PhoshLayerSurfacePrivate *priv;
-  int old_top, old_bottom, old_left, old_right;
+  gint 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);
@@ -675,7 +647,7 @@ phosh_layer_surface_set_margins (PhoshLayerSurface *self, int top, int right, in
   priv->margin_bottom = bottom;
 
   if (priv->layer_surface) {
-    zwlr_layer_surface_v1_set_margin (priv->layer_surface, top, right, bottom, left);
+    zwlr_layer_surface_v1_set_margin(priv->layer_surface, top, right, bottom, left);
   }
 
   if (old_top != top) {
@@ -692,19 +664,16 @@ phosh_layer_surface_set_margins (PhoshLayerSurface *self, int top, int right, in
   }
 }
 
-
 /**
  * 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, int zone)
+phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
 {
   PhoshLayerSurfacePrivate *priv;
-  int old_zone;
+  gint old_zone;
 
   g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
   priv = phosh_layer_surface_get_instance_private (self);
@@ -718,17 +687,14 @@ phosh_layer_surface_set_exclusive_zone (PhoshLayerSurface *self, int zone)
   priv->exclusive_zone = zone;
 
   if (priv->layer_surface) {
-    zwlr_layer_surface_v1_set_exclusive_zone (priv->layer_surface, zone);
+    zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, zone);
   }
 
   g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
 }
 
-
 /**
  * phosh_layer_surface_set_keyboard_interactivity:
- * @self: The #PhoshLayerSurface
- * @interactivity: %TRUE if the #PhoshLayerSurface should receive keyboard input.
  *
  * Set keyboard ineractivity a layer surface.
  */
@@ -743,7 +709,6 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
   if (priv->kbd_interactivity == interactivity) {
     return;
   }
-
   priv->kbd_interactivity = interactivity;
 
   if (priv->layer_surface) {
@@ -753,39 +718,8 @@ 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.
  */
@@ -801,53 +735,3 @@ 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;
-}

eek/layersurface.h

@@ -1,17 +1,22 @@
 /*
  * Copyright (C) 2018 Purism SPC
  *
- * SPDX-License-Identifier: GPL-3.0-or-later
+ * 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.
+
+*/
+
 #pragma once
 
 #include <gtk/gtk.h>
 /* 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)
@@ -19,7 +24,6 @@ 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
 {
@@ -35,26 +39,15 @@ 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,
-                                                               int width,
-                                                               int height);
+                                                               gint width,
+                                                               gint height);
 void                              phosh_layer_surface_set_margins(PhoshLayerSurface *self,
-                                                                  int top,
-                                                                  int right,
-                                                                  int bottom,
-                                                                  int left);
+                                                                  gint top,
+                                                                  gint right,
+                                                                  gint bottom,
+                                                                  gint left);
 void                              phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self,
-                                                                         int zone);
+                                                                         gint 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

eekboard/eekboard-context-service.c

@@ -55,15 +55,15 @@ static guint signals[LAST_SIGNAL] = { 0, };
  */
 struct _EekboardContextService {
     GObject parent;
-    struct squeek_state_manager *state_manager; // shared reference
+    struct squeek_layout_state *layout; // Unowned
 
-    Layout *keyboard; // currently used keyboard
+    LevelKeyboard *keyboard; // currently used keyboard
     GSettings *settings; // Owned reference
 
-    /// Needed for keymap changes after keyboard updates.
-    // TODO: can the main loop access submission to change the key maps instead?
-    // This should probably land together with passing buttons through state,
-    // to avoid race conditions between setting buttons and key maps.
+    // Maybe TODO: it's used only for fetching layout type.
+    // Maybe let UI push the type to this structure?
+    ServerContextService *ui; // unowned reference
+    /// Needed for keymap changes after keyboard updates
     struct submission *submission; // unowned
 };
 
@@ -126,10 +126,27 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
     g_variant_unref(inputs);
 }
 
-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);
+void
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state, uint32_t timestamp) {
+    gchar *layout_name = state->layout_name;
+    gchar *overlay_name = state->overlay_name;
+
+    // try to get the best keyboard layout
+    if (layout_name == NULL) {
+        layout_name = "us";
+    }
+
+    // overlay is "Normal" for most layouts, we will only look for "terminal" in rust code.
+    // for now just avoid passing a null pointer
+    if (overlay_name == NULL) {
+        overlay_name = "";    // fallback to Normal
+    }
+    
+    // generic part follows
+    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement, state->purpose, overlay_name);
+    LevelKeyboard *keyboard = level_keyboard_new(layout);
     // set as current
-    Layout *previous_keyboard = context->keyboard;
+    LevelKeyboard *previous_keyboard = context->keyboard;
     context->keyboard = keyboard;
     // Update the keymap if necessary.
     // TODO: Update submission on change event
@@ -142,7 +159,7 @@ void eekboard_context_service_set_layout(EekboardContextService *context, char *
 
     // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
     if (previous_keyboard) {
-        layout_free(previous_keyboard);
+        level_keyboard_free(previous_keyboard);
     }
 }
 
@@ -152,7 +169,17 @@ static void eekboard_context_service_update_settings_layout(EekboardContextServi
     settings_get_layout(context->settings,
                         &keyboard_type, &keyboard_layout);
 
-    squeek_state_send_layout_set(context->state_manager, keyboard_layout, keyboard_type, gdk_event_get_time(NULL));
+    if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
+        g_free(context->layout->overlay_name);
+        context->layout->overlay_name = NULL;
+        if (keyboard_layout) {
+            g_free(context->layout->layout_name);
+            context->layout->layout_name = g_strdup(keyboard_layout);
+        }
+        // This must actually update the UI.
+        uint32_t time = gdk_event_get_time(NULL);
+        eekboard_context_service_use_layout(context, context->layout, time);
+    }
 }
 
 static gboolean
@@ -190,7 +217,7 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
      * Emitted when @context is destroyed.
      */
     signals[DESTROYED] =
-        g_signal_new ("destroyed",
+        g_signal_new (I_("destroyed"),
                       G_TYPE_FROM_CLASS(gobject_class),
                       G_SIGNAL_RUN_LAST,
                       0,
@@ -264,24 +291,56 @@ eekboard_context_service_destroy (EekboardContextService *context)
  * Get keyboard currently active in @context.
  * Returns: (transfer none): an #EekKeyboard
  */
-Layout *
+LevelKeyboard *
 eekboard_context_service_get_keyboard (EekboardContextService *context)
 {
     return context->keyboard;
 }
 
-EekboardContextService *eekboard_context_service_new(struct squeek_state_manager *state_manager)
+void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
+                                               uint32_t hint, uint32_t purpose)
+{
+    if (context->layout->hint != hint || context->layout->purpose != purpose) {
+        context->layout->hint = hint;
+        context->layout->purpose = purpose;
+        uint32_t time = gdk_event_get_time(NULL);
+        eekboard_context_service_use_layout(context, context->layout, time);
+    }
+}
+
+void
+eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
+    if (g_strcmp0(context->layout->overlay_name, name)) {
+        g_free(context->layout->overlay_name);
+        context->layout->overlay_name = g_strdup(name);
+        uint32_t time = gdk_event_get_time(NULL);
+        eekboard_context_service_use_layout(context, context->layout, time);
+    }
+}
+
+const char*
+eekboard_context_service_get_overlay(EekboardContextService *context) {
+    return context->layout->overlay_name;
+}
+
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
 {
     EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
-    context->state_manager = state_manager;
+    context->layout = state;
     eekboard_context_service_update_settings_layout(context);
+    uint32_t time = gdk_event_get_time(NULL);
+    eekboard_context_service_use_layout(context, context->layout, time);
     return context;
 }
 
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
     context->submission = submission;
-    if (context->submission && context->keyboard) {
+    if (context->submission) {
         uint32_t time = gdk_event_get_time(NULL);
         submission_use_layout(context->submission, context->keyboard->layout, time);
     }
 }
+
+void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
+    context->ui = ui;
+}

eekboard/eekboard-context-service.h

@@ -24,7 +24,6 @@
 
 #include "src/submission.h"
 #include "src/layout.h"
-#include "src/main.h"
 
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
@@ -38,13 +37,19 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD, CONTEXT_SERVICE, GObject)
 
-EekboardContextService *eekboard_context_service_new(struct squeek_state_manager *state_manager);
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
+void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 void          eekboard_context_service_destroy (EekboardContextService *context);
-Layout *eekboard_context_service_get_keyboard(EekboardContextService *context);
+LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
 
 void eekboard_context_service_set_keymap(EekboardContextService *context,
-                                         const Layout *keyboard);
+                                         const LevelKeyboard *keyboard);
 
+void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
+                                               uint32_t hint,
+                                               uint32_t purpose);
+void
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout, uint32_t timestamp);
 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */

examples/find_orphan_layouts.rs

@@ -1,53 +0,0 @@
-/*! 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"),
-        _ => {},
-    }
-}

meson.build

@@ -1,7 +1,7 @@
 project(
     'squeekboard',
     'c', 'rust',
-    version: '1.22.0',
+    version: '1.14.0',
     license: 'GPLv3',
     meson_version: '>=0.51.0',
     default_options: [
@@ -36,6 +36,8 @@ add_project_arguments(
 
 i18n = import('i18n')
 
+conf_data = configuration_data()
+
 if get_option('buildtype').startswith('debug')
     add_project_arguments('-DDEBUG=1', language : 'c')
 endif
@@ -61,7 +63,6 @@ endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
-localedir = join_paths(prefix, get_option('localedir'))
 desktopdir = join_paths(datadir, 'applications')
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
@@ -71,10 +72,6 @@ else
 endif
 dbusdir = join_paths(depdatadir, 'dbus-1/interfaces')
 
-conf_data = configuration_data()
-conf_data.set_quoted('GETTEXT_PACKAGE', 'squeekboard')
-conf_data.set_quoted('LOCALEDIR', localedir)
-
 summary = [
         '',
         '------------------',
@@ -96,48 +93,27 @@ cargo_toml_base = configure_file(
     configuration: path_data,
 )
 
-cargo_patch = []
 
-if get_option('newer') == true
-    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
-    cargo_deps = files('Cargo.deps')
-    cargo_lock = []
-    if get_option('online') == true
-        cargo_patch = [files('Cargo.deps.online')]
-        if get_option('reset_lock') == true
-            cargo_lock = files('Cargo.lock')
-        endif
-    endif
+cargo_deps = files('Cargo.deps')
+
+if get_option('legacy') == true
+    cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5,rustc_less_1_36']
+    cargo_deps = files('Cargo.deps.legacy')
 endif
-
+    
 cat = find_program('cat')
 cargo_toml = custom_target(
     'Cargo.toml',
     output: 'Cargo.toml',
-    command: [cat, cargo_toml_base, cargo_deps] + cargo_patch,
+    command: [cat, cargo_toml_base, cargo_deps],
     capture: true,
 )
 
-cargo_deps = [cargo_toml]
-if get_option('online') == true and get_option('reset_lock') == true
-    cargo_lock = custom_target(
-        'Cargo.lock',
-        output: 'Cargo.lock',
-        command: [cat, cargo_lock],
-        capture: true,
-    )
-    cargo_deps += [cargo_lock]
-endif
-
 dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
 cargo_build = find_program('cargo_build.py')
 
 subdir('data')
-subdir('po')
 subdir('protocols')
 subdir('src')
 subdir('tools')

meson_options.txt

@@ -7,21 +7,9 @@ option('tests',
        type: 'boolean', value: true,
        description: 'Whether to compile unit tests')
 
-option('find_orphans',
+option('legacy',
        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')
-
-option('online',
-       type: 'boolean', value: true,
-       description: 'Pull packages from the internet while building, as opposed to a local regstry.')
-       
-option('reset_lock',
-       type: 'boolean', value: false,
-       description: 'Resets Cargo.lock to the one found in the source repo. Does not affect builds with online == false.')
+       description: 'Build with Deban Buster versions of dependencies')
 
 option('strict',
        type: 'boolean', value: true,

po/LINGUAS

@@ -1,31 +0,0 @@
-ca
-cs
-de
-el
-es
-eu
-fa
-fi
-fr
-fur
-gl
-he
-hi
-hr
-hu
-it
-ka
-ko
-nl
-oc
-pl
-pt
-pt_BR
-ro
-ru
-sl
-sr
-tr
-uk
-sv
-zh_CN

po/POTFILES.in

@@ -1,2 +0,0 @@
-data/popover.ui
-data/sm.puri.Squeekboard.desktop.in.in

po/ca.po

@@ -1,45 +0,0 @@
-# Catalan translation for squeekboard.
-# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# maite <maite.guix@gmail.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-01-11 14:31+0000\n"
-"PO-Revision-Date: 2022-01-20 10:53+0100\n"
-"Last-Translator: maite guix <maite.guix@me.com>\n"
-"Language-Team: Catalan <gnome@llistes.softcatala.org>\n"
-"Language: ca\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 "Terminal"
-
-#: data/popover.ui:18
-msgid "Keyboard Settings"
-msgstr "Configuració del teclat"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:3
-msgid "Squeekboard"
-msgstr "Teclat virtual"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:4
-msgid "On Screen Keyboard"
-msgstr "Teclat en pantalla"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:5
-msgid "An on screen virtual keyboard"
-msgstr "Un teclat virtual en pantalla"

po/cs.po

@@ -1,46 +0,0 @@
-# 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"

po/de.po

@@ -1,47 +0,0 @@
-# German translations for squeekboard package.
-# 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: 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=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.1.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 "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"

po/el.po

@@ -1,46 +0,0 @@
-# Greek translation for squeekboard.
-# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# Efstathios Iosifidis <eiosifidis@gnome.org>, 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-07-11 06:54+0000\n"
-"PO-Revision-Date: 2022-07-11 23:11+0300\n"
-"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
-"Language-Team: Greek <gnome-el-list@gnome.org>\n"
-"Language: el\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: Poedit 3.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 "Τερματικό"
-
-#: 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 "Εικονικό πληκτρολόγιο οθόνης"

po/es.po

@@ -1,47 +0,0 @@
-# Spanish translation for squeekboard.
-# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Pablo Correa Gómez <ablocorrea@hotmail.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-03-20 13:14+0000\n"
-"PO-Revision-Date: 2022-03-22 21:33+0100\n"
-"Last-Translator: Pablo Correa Gómez <ablocorrea@hotmail.com>\n"
-"Language-Team: Spanish; Castilian <gnome-es-list@gnome.org>\n"
-"Language: es\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 3.36.0\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 "Terminal"
-
-#: data/popover.ui:18
-msgid "Keyboard Settings"
-msgstr "Ajustes de teclado"
-
-#: 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 "Teclado en pantala"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:5
-msgid "An on screen virtual keyboard"
-msgstr "Un teclado virtual en pantalla"

po/eu.po

@@ -1,42 +0,0 @@
-# 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"

po/fa.po

@@ -1,45 +0,0 @@
-# Persian translation for squeekboard.
-# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# Danial Behzadi <dani.behzi@ubuntu.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: 2021-12-26 15:15+0000\n"
-"PO-Revision-Date: 2022-01-11 18:01+0330\n"
-"Language-Team: Persian <fa@li.org>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
-"X-Generator: Poedit 3.0\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 "یک صفحهٔ کلید لمسی مجازی"

po/fi.po

@@ -1,46 +0,0 @@
-# Finnish translation for squeekboard.
-# Copyright (C) 2021 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2021.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: squeekboard master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
-"issues\n"
-"POT-Creation-Date: 2021-12-25 13:55+0000\n"
-"PO-Revision-Date: 2021-12-26 17:15+0200\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
-"Language-Team: Finnish <lokalisointi-lista@googlegroups.com>\n"
-"Language: fi\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: 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 "Pääte"
-
-#: data/popover.ui:18
-msgid "Keyboard Settings"
-msgstr "Näppäimistön asetukset"
-
-#: 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 "Näyttönäppäimistö"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:5
-msgid "An on screen virtual keyboard"
-msgstr "Virtuaalinen näyttönäppäimistö"

po/fr.po

@@ -1,47 +0,0 @@
-# French translation for squeekboard.
-# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
-# This file is distributed under the same license as the squeekboard package.
-# FULL NAME <EMAIL@ADDRESS>, 2022.
-# Éloi Rivard <eloi.rivard@nubla.fr>, 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-04-28 15:05+0000\n"
-"PO-Revision-Date: 2022-05-25 16:34+0200\n"
-"Last-Translator: Éloi Rivard <eloi.rivard@nubla.fr>\n"
-"Language-Team: French <gnomefr@traduc.org>\n"
-"Language: fr\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 40.0\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 "Terminal"
-
-#: data/popover.ui:18
-msgid "Keyboard Settings"
-msgstr "Paramètres du clavier"
-
-#: 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 "Clavier virtuel"
-
-#: data/sm.puri.Squeekboard.desktop.in.in:5
-msgid "An on screen virtual keyboard"
-msgstr "Un clavier virtuel affiché à l’écran"