Document changes and release 1.9.3

Merge branch 'terminal' into 'master'
Terminal layout: another approach See merge request Librem5/squeekboard!368
2020-08-05 16:17:44 +02:00 · 2020-07-20 09:48:36 +00:00 · 2020-07-20 09:47:19 +00:00 · 2020-07-20 09:47:19 +00:00 · 2020-07-18 05:43:15 +02:00 · 2020-07-18 03:26:03 +02:00
60 changed files with 1937 additions and 875 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: debian:buster
+image: debian:bullseye
 stages:
  - build
@ -11,7 +11,7 @@ stages:
 before_script:
  - apt-get -y update
  - apt-get -y install wget ca-certificates gnupg
-  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - 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
@ -27,7 +27,8 @@ build_docs:
      - ./doc/build.sh _build
 build_meson:
-  <<: *tags
+  tags:
    - librem5
  stage: build
  artifacts:
    paths:
@ -52,15 +53,66 @@ build_deb:
        - debuild -i -us -uc -b
        - cp ../*.deb .
-build_deb:arm64:
+build_deb:amber:
    image: pureos/amber
    tags:
-        - librem5:arm64
+        - librem5
    allow_failure: true
    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:
    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: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
@ -77,10 +129,21 @@ test_lintian:
        - lintian *.deb
 test:
-  <<: *tags
+  tags:
    - librem5
  stage: test
  needs:
    - build_meson
  script:
    - apt-get -y build-dep .
    - ninja -C _build test
 check_release:
  <<: *tags
  stage: test
  only:
    refs:
      - master
  script:
    - apt-get -y install git python3
    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
--- a/Cargo.deps
+++ b/Cargo.deps
@ -0,0 +1,22 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
 regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
 [dependencies.cairo-rs]
 version = "0.7.*"
 [dependencies.gdk]
 version = "0.11.*"
 [dependencies.gio]
 version = "0.7.*"
 features = ["v2_44"]
 [dependencies.glib]
 version = "0.8.*"
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.7.*"
 features = ["v3_22"]
--- a/Cargo.deps.legacy
+++ b/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"]
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,66 +1,69 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
-name = "aho-corasick"
+name = "atk"
-version = "0.7.8"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "atk-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "bitflags"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cairo-rs"
-version = "0.5.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cairo-sys-rs"
-version = "0.7.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cc"
-version = "1.0.50"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "clap"
-version = "2.32.0"
+version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -76,159 +79,161 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "gdk"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-pixbuf"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gdk-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gio"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gio-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "glib"
-version = "0.6.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "glib-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gobject-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gtk"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "gtk-sys"
-version = "0.7.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -239,12 +244,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.66"
+version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "linked-hash-map"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@ -252,42 +257,37 @@ name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
 version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pango"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pango-sys"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "1.0.8"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -306,105 +306,93 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "regex"
-version = "1.1.9"
+version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "regex-syntax"
-version = "0.6.14"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rs"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_yaml"
-version = "0.8.11"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "syn"
-version = "1.0.14"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "textwrap"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
@ -415,11 +403,6 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "utf8-ranges"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi"
 version = "0.3.8"
@ -444,63 +427,60 @@ name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "yaml-rust"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [metadata]
-"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
+"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
-"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
+"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
+"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
-"checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
+"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
-"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
 "checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 "checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
-"checksum gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc52c7244046df9d959df87289f1fc5cca23f9f850bab0c967963e2ecb83a96"
+"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
-"checksum gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
+"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
-"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
+"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
-"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
+"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
-"checksum gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29a44b051990573448edc80b1995237f8b97b5734d2aec05105b9242aa10af11"
+"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
-"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
+"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
-"checksum glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a333edf5b9f1411c246ef14e7881b087255f04c56dbef48c64a0cb039b4b340"
+"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
-"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
+"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
-"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
+"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
-"checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
+"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
-"checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
+"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 "checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
+"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
-"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
+"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
-"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
+"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
-"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
-"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
+"checksum yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@ -2,46 +2,39 @@
 name = "rs"
 version = "0.1.0"
-[dependencies]
+[lib]
-bitflags = "1.0.*"
+name = "rs"
-clap = { version = "2.32.*", default-features = false }
+path = "@path@/src/lib.rs"
-maplit = "1.0.*"
+crate-type = ["staticlib", "rlib"]
 regex = "1.1.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
-[dependencies.cairo-rs]
+# Cargo can't do autodiscovery if Cargo.toml is not in the root.
-version = "0.5.*"
+[[bin]]
 name = "test_layout"
 path = "@path@/src/bin/test_layout.rs"
 [[example]]
 name = "test_layout"
 path = "@path@/examples/test_layout.rs"
 [features]
 gio_v0_5 = []
 gtk_v0_5 = []
 # Dependencies which don't change based on build flags
 [dependencies.cairo-sys-rs]
 version = ""
 [dependencies.gdk]
 version = ""
 [dependencies.gio]
 version = ""
 features = ["v2_44"]
 [dependencies.glib]
 version = ""
 features = ["v2_44"]
 [dependencies.glib-sys]
 version = ""
 features = ["v2_44"]
 [dependencies.gtk]
 version = "0.5.*"
 features = ["v3_22"]
 [dependencies.gtk-sys]
 version = ""
 features = ["v3_22"]
-
+[dependencies]
-[lib]
+maplit = "1.0.*"
-name = "rs"
+serde = { version = "1.0.*", features = ["derive"] }
-path = "src/lib.rs"
+serde_yaml = "0.8.*"
-crate-type = ["staticlib", "rlib"]
+xkbcommon = { version = "0.4.*", features = ["wayland"] }
 # Here is inserted the Cargo.deps file
--- a/README.md
+++ b/README.md
@ -56,4 +56,4 @@ $ src/squeekboard
 Developing
 ----------
-See `HACKING.md`
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
--- a/cargo.sh
+++ b/cargo.sh
@ -13,5 +13,10 @@ CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
 cd "$SOURCE_DIR"
-cargo "$@"
+
 # the 'run" command takes arguments at the end,
 # so --manifest-path must not be last
 CMD="$1"
 shift
 cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@ -0,0 +1,78 @@
 ---
 outlines:
    default: { width: 35.33, height: 52 }
    altline: { width: 52.67, height: 52 }
    wide: { width: 62, height: 52 }
    spaceline: { width: 142, height: 52 }
    special: { width: 44, height: 52 }
 views:
    base:
        - "q w e r t y u i o p"
        - "a s d f g h j k l ç"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences         space     , Return"
    upper:
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L Ç"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space     period Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "à À á Á ã Ã â Â é É"
        - "show_symbols   ê Ê í Í ó Ó ô Ô"
        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
    symbols:
        - "@ # $ % - + ÷ × = ≠"
        - "( ) § & < > / * { }"
        - "show_numbers_from_symbols     º \" ' colon ; ! ?  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: "1ã"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "1ã"
    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: ":"
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -0,0 +1,98 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
    wide: { width: 62, height: 52 }
    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }
 views:
    base:
        - "q w e r t y u i o p å"
        - "a s d f g h j k l ø æ"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences         space        .    Return"
    upper:
        - "Q W E R T Y U I O P Å"
        - "A S D F G H J K L Ø Æ"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences         space        .    Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' : ; ! ?  BackSpace"
        - "show_letters preferences         space        .    Return"
    symbols:
        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
        outline: "altline"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    ".":
        outline: altline
    space:
        outline: spaceline
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    U00B7:
        text: "·"
    squareroot:
        text: "√"
    Greek_pi:
        text: "π"
    division:
        text: "÷"
    multiply:
        text: "×"
    paragraph:
        text: "¶"
    Greek_tau:
        text: "τ"
    copyright:
        text: "©"
    U00AE:
        text: "®"
    U00A3:
        text: "£"
    EuroSign:
        text: "€"
    U00A5:
        text: "¥"
    asciicircum:
        text: "^"
    degree:
        text: "°"
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -0,0 +1,89 @@
 ---
 outlines:
    default:   { width: 35.33, height: 52 }
    altline:   { width: 52.67, height: 52 }
    wide:      { width: 59,    height: 52 }
    spaceline: { width: 140,   height: 52 }
    special:   { width: 44,    height: 52 }
 views:
    base:
        - "a z e r t y u i o p"
        - "q s d f g h j k l m"
        - "Shift_L   w x c v b n .   BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    upper:
        - "A Z E R T Y U I O P"
        - "Q S D F G H J K L M"
        - "Shift_L   W X C V B N ,  BackSpace"
        - "show_numbers preferences         space        show_eschars Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
    eschars:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
    show_eschars:
        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "âÂ"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    "\"":
        keysym: "quotedbl"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -13,22 +13,22 @@ views:
        - "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        , period Return"
+        - "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        ? period Return"
+        - "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        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
    eschars:
        - "á é í ó ú Á É Í Ó Ú"
        - "à è ì ò « » ù ! { }"
@ -76,12 +76,10 @@ buttons:
            set_view: "eschars"
        outline: "altline"
        label: "àè"
    period:
        outline: "default"
        label: "."
    space:
        outline: "spaceline"
        label: " "
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
--- a/data/keyboards/ru.yaml
+++ b/data/keyboards/ru.yaml
@ -0,0 +1,94 @@
 ---
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 32, height: 52 }
    wide: { width: 57, height: 52 }
    narrow: { width: 26, height: 52 }
    spaceline: { width: 107, height: 52 }
    fill: { width: 159, height: 52 }
    special: { width: 42, height: 52 }
 views:
    base:
        - "й ц у к е н г ш щ з х"
        - "ф ы в а п р о л д ж э"
        - "Shift_L  я ч с м и т ь б ю  BackSpace"
        - "show_numbers preferences    ё  space  ъ  period Return"
    upper:
        - "Й Ц У К Е Н Г Ш Щ З Х"
        - "Ф Ы В А П Р О Л Д Ж Э"
        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ё  space  Ъ  comma Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space_fill   period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space_fill   period Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: show_prefs
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "wide"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "wide"
        label: "*/="
    period:
        outline: "special"
        text: "."
    comma:
        outline: "special"
        text: ","
    space:
        outline: "spaceline"
        text: " "
    space_fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    colon:
        text: ":"
    ё:
        outline: "narrow"
    Ё:
        outline: "narrow"
    ъ:
        outline: "narrow"
    Ъ:
        outline: "narrow"
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -2,9 +2,10 @@
 outlines:
    default: { width: 32, height: 52 }
    altline: { width: 48.39024, height: 52 }
-    wide: { width: 62, height: 52 }
+    wide: { width: 64,  height: 52 }
-    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 142, height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    special: { width: 44, height: 52 }
 views:
    base:
@ -25,7 +26,7 @@ views:
    symbols:
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
        - "show_letters preferences         space        .    Return"
 buttons:
@ -37,22 +38,27 @@ buttons:
        outline: "altline"
        icon: "key-shift"
    BackSpace:
-        outline: "altline"
+        outline: altline
        icon: "edit-clear-symbolic"
        action: erase
    preferences:
        action: "show_prefs"
-        outline: "altline"
+        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        outline: "wide"
        action:
            set_view: "numbers"
-        outline: "altline"
+        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: altline
        label: "123"
    show_letters:
        outline: "wide"
        action:
            set_view: "base"
        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
@ -60,7 +66,7 @@ buttons:
        outline: "altline"
        label: "*/="
    ".":
-        outline: altline
+        outline: "special"
    space:
        outline: spaceline
        text: " "
@ -156,4 +162,3 @@ buttons:
        text: "["
    bracketright:
        text: "]"
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -1,38 +1,44 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
+    default: { width: 35.33, height: 46 }
-    action:  { width: 59,    height: 52 }
+    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 52 }
+    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 52 }
+    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 52 }
+    spaceline: { width: 140, height: 46 }
-    special: { width: 44, height: 52 }
+    special: { width: 44, height: 46 }
    small: { width: 59, height: 22 }
 views:
    base:
        - "Ctrl Alt ↑ ↓ ← →"
        - "q w e r t y u i o p"
        - "a s d f g h j k l"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    upper:
        - "Ctrl Alt PgUp PgDn Home End"
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
        - "* # $ / & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "Ctrl Alt ↑ ↓ ← →"
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° @ { }"
        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "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 Del PgUp ↑ PgDn"
+        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Home End ← ↓ →"
+        - "show_letters Menu Break Left Down Right"
 buttons:
    Shift_L:
@ -132,28 +138,67 @@ buttons:
    Del:
        outline: "action"
        keysym: "Delete"
-    Home:
+    Insert:
        outline: "action"
        keysym: "Insert"
    Menu:
        outline: "action"
        keysym: "Menu"
    Pause:
        outline: "action"
        keysym: "Pause"
    Menu:
        outline: "action"
        keysym: "Menu"
    Break:
        outline: "action"
        keysym: "Break"
    Home:
        outline: "small"
        keysym: "Home"
    End:
-        outline: "action"
+        outline: "small"
        keysym: "End"
    PgUp:
-        outline: "action"
+        outline: "small"
        keysym: "Page_Up"
    PgDn:
-        outline: "action"
+        outline: "small"
        keysym: "Page_Down"
    "↑":
-        outline: "action"
+        outline: "small"
        keysym: "Up"
    "↓":
-        outline: "action"
+        outline: "small"
        keysym: "Down"
    "←":
-        outline: "action"
+        outline: "small"
        keysym: "Left"
    "→":
        outline: "small"
        keysym: "Right"
    Up:
        label: "↑"
        outline: "action"
        keysym: "Up"
    Left:
        label: "←"
        outline: "action"
        keysym: "Left"
    Down:
        label: "↓"
        outline: "action"
        keysym: "Down"
    Right:
        label: "→"
        outline: "action"
        keysym: "Right"
    Ctrl:
        modifier: "Control"
        outline: "small"
        label: "Ctrl"
    Alt:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
--- a/data/langs/ru-RU.txt
+++ b/data/langs/ru-RU.txt
@ -0,0 +1,11 @@
 de Немецкий
 es Испанский
 fi Финский
 gr Греческий
 it Итальянский
 no Норвежский
 pl Польский
 ru Русский
 se Шведский
 terminal Терминал
 us Английский (США)
--- a/data/meson.build
+++ b/data/meson.build
@ -7,13 +7,20 @@ squeekboard_resources = gnome.compile_resources(
   c_name: 'squeekboard',
 )
 desktopconf = configuration_data()
 desktopconf.set('bindir', bindir)
 desktop_file = 'sm.puri.Squeekboard.desktop'
 i18n.merge_file('desktop',
-    input: desktop_file + '.in',
+    input: configure_file(
      input: desktop_file + '.in.in',
      output: desktop_file + '.in',
      configuration: desktopconf
    ),
    output: desktop_file,
    po_dir: '../po',
    install: true,
-    install_dir: join_paths(datadir, 'applications'),
+    install_dir: desktopdir,
    type: 'desktop'
 )
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -2,7 +2,7 @@
 Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
-Exec=squeekboard
+Exec=@bindir@/squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -40,6 +40,10 @@ sq_button.action {
    font-size: 0.75em;
 }
 sq_button.small {
    font-size: 0.5em;
 }
 #Return {
    background: #1c71d8;
    border-color: #1a5fb4;
--- a/data/style.css
+++ b/data/style.css
@ -43,6 +43,10 @@ sq_button.action {
    font-size: 0.75em;
 }
 sq_button.small {
    font-size: 0.5em;
 }
 #Return {
    background: @theme_selected_bg_color; /* #1c71d8; */
    border-color: @borders; /*#1a5fb4;*/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,107 @@
 squeekboard (1.9.3) amber-phone; urgency=medium
  [ Björn Tantau ]
  * Show more useful keys at the same time.
  * Add Ctrl and Alt modifier keys.
  * Add missing Ê key.
  * Make f-keys slightly wider.
  * Add Menu key.
  [ Guido Günther ]
  * d/rules: Only remove Cargo.lock if it exists
  * eek: Drop libcanberra usage
  * debian: Build-depend on libfeedback
  * eek-gtk-keyboard: Trigger event feedback on button press (Closes: #166)
  [ Dorota Czaplejewicz ]
  * build: Add missing gio-unix dependency
  * build: Make compatible with Debian Bullseye
  * debian: Add amber to legacy distro list
  * ci: Add amber job
  * debian: Require lsb-release
  * size: Hardcode size to work around screen rotation
  * ci: Re-add x64 Buster build
  * italian: Fix space and period
  [ Sebastian Krzyszkowiak ]
  * Revert "Merge branch 'btantau-master-patch-76686' into 'master'"
  * Terminal layout: another approach
  [ Luís Fernando Stürmer da Rosa ]
  * Brazilian Portuguese Keyboard Layout.
 -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Wed, 05 Aug 2020 16:16:08 +0200
 squeekboard (1.9.2) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * keyboard: Remove unused code
  * gsettings: Don't crash when unavailable
  * dbus: Don't crash if can't make a connection
  * gsettings: Don't crash on switching when unavailable
  * layout: Split out choice to a struct on its own
  * renderer: Simplify by dropping gobjectness
  * levelkeyboard: Rearrange to make future conversion easier
  * layout: Minor generalizations
  * Remove unused code
  * sizing: Create a standalone UI shape manager
  * sizing: Ignore scaling factor for layout selection
  * CI: Fix typo
  * Update rust deps for release
  [ Andreas Rönnquist ]
  * Swedish keyboard, wide button switching between numbers, symbols and base
  * More fixes of button sizes
  * Folder is doc, not docs
  [ uzanto ]
  * Add new file
  * Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing
  [ Arnaud Ferraris ]
  * keyboards: fr: fix keyboard layout
  * keyboards: fr: make sure the layout fits the screen
  * resources: include French keyboard layout
  * keyboards: fr: improve consistency with other layouts
  * keyboards: fr: improve diacritics layout
  * tests: add french layout
  [ Vlad ]
  * Fresh Russian layout
  [ Jordi Masip ]
  * Removed unused dependency 'libcroco'
  [ Florian Klink ]
  * sm.puri.Squeekboard.desktop: make path to Exec= absolute
  [ Ole Guldberg ]
  * Danish keyboard layout
  * Danish keyboard layout
  * add test for danish layout
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 01 Jun 2020 09:39:12 +0000
 squeekboard (1.9.1) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
  * layout: Improve press handling
  * settings: Handle empty settings
  * Variant: Use proper pointer conversion between C and Rust
  * meta: Add doap file
  * modifiers: Support Control and Alt
  * CI: Test that any bump to changelog has a corresponding tag
  * docs: Add the guiding principle
  * hacking: Move into docs/
  [ &t ]
  * Fix minor comment typos
  [ Dorota Czaplejewicz ]
  * cargo: Bump package versions before release
 -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sun, 08 Mar 2020 10:04:29 +0000
 squeekboard (1.9.0) amber-phone; urgency=medium
  [ Dorota Czaplejewicz ]
--- a/debian/check_release.py
+++ b/debian/check_release.py
@ -0,0 +1,10 @@
 #!/usr/bin/env python3
 """Checks tag before release.
 Feed it the first changelog line, and then all available tags.
 """
 import re, sys
 tag = "v" + re.findall("\\((.*)\\)", input())[0]
 if tag not in map(str.strip, sys.stdin.readlines()):
    raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
--- a/debian/control
+++ b/debian/control
@ -11,7 +11,7 @@ Build-Depends:
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
- libcroco3-dev,
+ libfeedback-dev,
 librust-bitflags-1-dev (>= 1.0),
 librust-clap-2+default-dev (>= 2.32),
 librust-gio+v2-44-dev,
@ -25,6 +25,7 @@ Build-Depends:
 librust-serde-yaml-0.8-dev (>= 0.8),
 librust-xkbcommon-0.4+wayland-dev (>= 0.4),
 libwayland-dev (>= 1.16),
 lsb-release,
 rustc,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
--- a/debian/rules
+++ b/debian/rules
@ -3,13 +3,20 @@
 export CARGO_HOME = $(CURDIR)/debian/cargo
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 distrel := $(shell lsb_release --codename --short)
 ifneq (,$(filter $(distrel),buster amber))
 	legacy = true
 else
 	legacy = false
 endif
 %:
 	dh $@ --builddirectory=_build --buildsystem=meson
 # The Debian version of linked-hash-map doesn't provide any hash,
 # causing Cargo to refuse to build with a crates.io copy
-build-arch:
+override_dh_auto_configure:
-	rm Cargo.lock
+	[ ! -f Cargo.lock ] || rm Cargo.lock
-	dh $@ --builddirectory=_build --buildsystem=meson
+	dh_auto_configure -- -Dlegacy=$(legacy)
 override_dh_autoreconf:
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -3,10 +3,42 @@ Hacking
 This document describes the standards for modifying and maintaining the *squeekboard* project.
 Principles
 ----------
 The project was built upon some guiding principles, which should be respected primarily by the maintainers, but also by contributors to avoid needlessly rejected changes.
 The overarching principle of *squeekboard* is to empower users.
 Software is primarily meant to solve problems of its users. Often in the quest to make software better, a hard distinction is made between the developer, who becomes the creator, and the user, who takes the role of the consumer, without direct influence on the software they use.
 This project aims to give users the power to make the software work for them by blurring the lines between users and developers.
 Nonwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance:
 - to use the software,
 - to modify its resources,
 - to change its behaviour,
 - to contribute upstream.
 To give an idea of what it means in practice, those are some examples of what has been important for *squeekboard* so far:
 - being quick and useable,
 - allowing local overrides of resources and config,
 - storing resources and config as editable, standard files,
 - having complete, up to date documentation of interfaces,
 - having an easy process of sending contributions,
 - adapting to to user's settings and constrains without overriding them,
 - avoiding compiling whenever possible,
 - making it easy to build,
 - having code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/),
 - having an easy process of testing and accepting contributions.
 You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefitting the user compared to those benefitting regular contributors.
 Sending patches
 ---------------
-By submitting a change to this project, you agree to license it under the [GPL license version 3](./COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](./dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
 Development environment
 -----------------------
@ -24,8 +56,7 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```
-For an explicit list of dependencies check the `Build-Depends` entry in the
+For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
 [`debian/control`](./debian/control) file.
 Testing
 -------
@ -144,10 +175,11 @@ 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.
-`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
+`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 build_dir
 ninja build src/Cargo.toml
 sh /source_path/cargo.sh update
 ninja test
 ```
--- a/doc/index.md
+++ b/doc/index.md
@ -5,17 +5,23 @@ Contents
 --------
 * [Tutorial](tutorial.md)
 * [Contributing](hacking.md)
 Introduction
 ------------
-Squeekboard is the on-screen keyboard for the Librem 5 phone. For more information, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
 Layouts
 -------
-Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](/tutorial.md) explains the process in detail.
+Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
 Layouts are created using a text-based format, based on YAML.
 TODO: Provide a description of the format.
 Contributions
 -------------
 Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -31,7 +31,7 @@ So at least I will try to start writing a short how-to here and edit this post a
 **Running squeekboard**
 * Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at https://source.puri.sm/Librem5/squeekboard/blob/master/HACKING.md#testing
+* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image ](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
  `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -25,10 +25,6 @@
 #include "config.h"
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
 #include <math.h>
 #include <string.h>
@ -41,25 +37,22 @@
 #include "src/layout.h"
 #include "src/submission.h"
-enum {
+#define LIBFEEDBACK_USE_UNSTABLE_API
-    PROP_0,
+#include <libfeedback.h>
    PROP_LAST
 };
-/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
+#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
   GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif
 typedef struct _EekGtkKeyboardPrivate
 {
-    EekRenderer *renderer;
+    EekRenderer *renderer; // owned, nullable
    EekboardContextService *eekboard_context; // unowned reference
    struct submission *submission; // unowned reference
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
+
    struct squeek_layout_state *layout; // unowned
    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
    GdkEventSequence *sequence; // unowned reference
    LfbEvent *event;
 } EekGtkKeyboardPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
@ -88,31 +81,58 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);
    if (!priv->keyboard) {
        return FALSE;
    }
    if (!priv->renderer) {
        PangoContext *pcontext = gtk_widget_get_pango_context (self);
-        priv->renderer = eek_renderer_new (priv->keyboard, pcontext);
+        priv->renderer = eek_renderer_new (
                    priv->keyboard,
                    pcontext);
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation.width,
                                          allocation.height);
        eek_renderer_set_scale_factor (priv->renderer,
                                       gtk_widget_get_scale_factor (self));
    }
-    eek_renderer_render_keyboard (priv->renderer, cr);
+    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
    return FALSE;
 }
 // Units of pixel size
 static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 1080) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
    EekGtkKeyboardPrivate *priv =
        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    uint32_t scale = (uint32_t)gtk_widget_get_scale_factor(self);
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type(
                (uint32_t)(allocation->width - allocation->x) * scale,
                (uint32_t)(allocation->height - allocation->y) * scale);
    if (priv->layout->arrangement != new_type) {
        priv->layout->arrangement = new_type;
        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout);
    }
    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
                                          priv->keyboard->layout,
                                          allocation->width,
                                          allocation->height);
@ -120,11 +140,26 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
        size_allocate (self, allocation);
 }
 static void
 on_event_triggered (LfbEvent      *event,
                    GAsyncResult  *res,
                    gpointer      unused)
 {
    g_autoptr (GError) err = NULL;
    if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
        g_warning ("Failed to trigger feedback for '%s': %s",
                   lfb_event_get_event (event), err->message);
    }
 }
 static void depress(EekGtkKeyboard *self,
                    gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
        return;
    }
    squeek_layout_depress(priv->keyboard->layout,
                          priv->submission,
                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
@ -134,7 +169,10 @@ static void drag(EekGtkKeyboard *self,
                 gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    squeek_layout_drag(priv->keyboard->layout,
+    if (!priv->keyboard) {
        return;
    }
    squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                       priv->submission,
                       x, y, eek_renderer_get_transformation(priv->renderer), time,
                       priv->eekboard_context, self);
@ -143,8 +181,10 @@ static void drag(EekGtkKeyboard *self,
 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    if (!priv->keyboard) {
-    squeek_layout_release(priv->keyboard->layout,
+        return;
    }
    squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
                          priv->submission,
                          eek_renderer_get_transformation(priv->renderer), time,
                          priv->eekboard_context, self);
@ -264,7 +304,7 @@ eek_gtk_keyboard_dispose (GObject *object)
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    if (priv->renderer) {
-        g_object_unref (priv->renderer);
+        eek_renderer_free(priv->renderer);
        priv->renderer = NULL;
        priv->renderer = NULL;
    }
@ -277,6 +317,11 @@ eek_gtk_keyboard_dispose (GObject *object)
        priv->keyboard = NULL;
    }
    if (priv->event) {
        g_clear_object (&priv->event);
        lfb_uninit ();
    }
    G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }
@ -308,29 +353,76 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    (void)self;
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    g_autoptr(GError) err = NULL;
    if (lfb_init(SQUEEKBOARD_APP_ID, &err))
        priv->event = lfb_event_new ("button-pressed");
    else
        g_warning ("Failed to init libfeedback: %s", err->message);
 }
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    EekGtkKeyboard *self) {
    (void)spec;
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
    priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
    if (priv->renderer) {
        eek_renderer_free(priv->renderer);
    }
    priv->renderer = NULL;
    gtk_widget_queue_draw(GTK_WIDGET(self));
 }
 /**
 * eek_gtk_keyboard_new:
 * @keyboard: an #EekKeyboard
 *
 * Create a new #GtkWidget displaying @keyboard.
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice,
+eek_gtk_keyboard_new (EekboardContextService *eekservice,
-                      struct submission *submission)
+                      struct submission *submission,
                      struct squeek_layout_state *layout)
 {
    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
    priv->keyboard = keyboard;
    priv->eekboard_context = eekservice;
    priv->submission = submission;
    priv->layout = layout;
    priv->renderer = NULL;
    g_signal_connect (eekservice,
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
                      ret);
    on_notify_keyboard(G_OBJECT(eekservice), NULL, ret);
    /* TODO: this is how a compound keyboard
     * made out of a layout and a suggestion bar could start.
     * GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
    GtkEntry *fill = GTK_ENTRY(gtk_entry_new());
    gtk_box_pack_start(box, GTK_WIDGET(fill), FALSE, FALSE, 0);
    gtk_box_pack_start(box, GTK_WIDGET(ret), TRUE, TRUE, 0);
    return GTK_WIDGET(box);*/
    return GTK_WIDGET(ret);
 }
-EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
+/**
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+ * eek_gtk_keyboard_emit_feedback:
-    return priv->renderer;
+ *
 * Emit button press haptic feedback via libfeedack.
 */
 void
 eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
 {
    EekGtkKeyboardPrivate *priv;
    g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
    priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    if (priv->event) {
        lfb_event_trigger_feedback_async (priv->event,
                                          NULL,
                                          (GAsyncReadyCallback)on_event_triggered,
                                          NULL);
    }
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -31,7 +31,7 @@
 #include "eek/eek-types.h"
 struct submission;
-typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
+struct squeek_layout_state;
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@ -48,7 +48,8 @@ struct _EekGtkKeyboardClass
 };
 GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
-GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard, EekboardContextService *eekservice, struct submission *submission);
+GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
 void       eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self);
 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -38,10 +38,8 @@ void level_keyboard_free(LevelKeyboard *self) {
 }
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
+level_keyboard_new (struct squeek_layout *layout)
                    enum squeek_arrangement_kind t)
 {
    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
    if (!keyboard) {
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -47,8 +47,7 @@ gchar *             eek_keyboard_get_keymap
                                     (LevelKeyboard *keyboard);
 LevelKeyboard*
-level_keyboard_new (const gchar            *keyboard_type,
+level_keyboard_new (struct squeek_layout *layout);
                    enum squeek_arrangement_kind t);
 void level_keyboard_free(LevelKeyboard *self);
 G_END_DECLS
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -28,27 +28,6 @@
 #include "eek-renderer.h"
 #include "src/style.h"
 enum {
    PROP_0,
    PROP_PCONTEXT,
    PROP_LAST
 };
 typedef struct _EekRendererPrivate
 {
    LevelKeyboard *keyboard; // unowned
    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    gdouble allocation_width;
    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    struct transformation widget_to_layout;
 } EekRendererPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
 /* eek-keyboard-drawing.c */
 static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
@ -138,9 +117,7 @@ eek_render_button (EekRenderer *self,
               gboolean     pressed,
               gboolean     locked)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    GtkStyleContext *ctx = self->button_context;
    GtkStyleContext *ctx = priv->button_context;
    /* Set the name of the button on the widget path, using the name obtained
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
@ -160,7 +137,7 @@ eek_render_button (EekRenderer *self,
    }
    gtk_style_context_add_class(ctx, outline_name);
-    render_button_in_context(priv->scale_factor, cr, ctx, button);
+    render_button_in_context(self->scale_factor, cr, ctx, button);
    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
@ -214,118 +191,46 @@ render_button_label (cairo_t     *cr,
    g_object_unref (layout);
 }
 // FIXME: Pass just the active modifiers instead of entire submission
 void
 eek_renderer_render_keyboard (EekRenderer *self,
-                                   cairo_t     *cr)
+                              struct submission *submission,
                                   cairo_t     *cr,
                              LevelKeyboard *keyboard)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    g_return_if_fail (self->allocation_width > 0.0);
-
+    g_return_if_fail (self->allocation_height > 0.0);
    g_return_if_fail (priv->keyboard);
    g_return_if_fail (priv->allocation_width > 0.0);
    g_return_if_fail (priv->allocation_height > 0.0);
    /* Paint the background covering the entire widget area */
-    gtk_render_background (priv->view_context,
+    gtk_render_background (self->view_context,
                           cr,
                           0, 0,
-                           priv->allocation_width, priv->allocation_height);
+                           self->allocation_width, self->allocation_height);
    cairo_save(cr);
-    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+    cairo_translate (cr, self->widget_to_layout.origin_x, self->widget_to_layout.origin_y);
-    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);
+    cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
-    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
+    squeek_draw_layout_base_view(keyboard->layout, self, cr);
-    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr);
+    squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
    cairo_restore (cr);
 }
-static void
+void
-eek_renderer_set_property (GObject      *object,
+eek_renderer_free (EekRenderer        *self)
                           guint         prop_id,
                           const GValue *value,
                           GParamSpec   *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+    if (self->pcontext) {
-            EEK_RENDERER(object));
+        g_object_unref (self->pcontext);
-
+        self->pcontext = NULL;
    switch (prop_id) {
    case PROP_PCONTEXT:
        priv->pcontext = g_value_get_object (value);
        g_object_ref (priv->pcontext);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
-}
+    g_object_unref(self->css_provider);
-
+    g_object_unref(self->view_context);
-static void
+    g_object_unref(self->button_context);
 eek_renderer_get_property (GObject    *object,
                           guint       prop_id,
                           GValue     *value,
                           GParamSpec *pspec)
 {
    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
 static void
 eek_renderer_dispose (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER (object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    if (priv->keyboard) {
        priv->keyboard = NULL;
    }
    if (priv->pcontext) {
        g_object_unref (priv->pcontext);
        priv->pcontext = NULL;
    }
    // this is where renderer-specific surfaces would be released
-    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
+    free(self);
 }
 static void
 eek_renderer_finalize (GObject *object)
 {
    EekRenderer        *self = EEK_RENDERER(object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
    g_object_unref(priv->css_provider);
    g_object_unref(priv->view_context);
    g_object_unref(priv->button_context);
    G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
 }
 static void
 eek_renderer_class_init (EekRendererClass *klass)
 {
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;
    gobject_class->set_property = eek_renderer_set_property;
    gobject_class->get_property = eek_renderer_get_property;
    gobject_class->dispose = eek_renderer_dispose;
    gobject_class->finalize = eek_renderer_finalize;
    pspec = g_param_spec_object ("pango-context",
                                 "Pango Context",
                                 "Pango Context",
                                 PANGO_TYPE_CONTEXT,
                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_PCONTEXT,
                                     pspec);
 }
 static GType new_type(char *name) {
    GTypeInfo info = {0};
    info.class_size = sizeof(GtkWidgetClass);
@ -353,81 +258,75 @@ static GType button_type() {
 }
 static void
-eek_renderer_init (EekRenderer *self)
+renderer_init (EekRenderer *self)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    self->pcontext = NULL;
-
+    self->allocation_width = 0.0;
-    priv->keyboard = NULL;
+    self->allocation_height = 0.0;
-    priv->pcontext = NULL;
+    self->scale_factor = 1;
    priv->allocation_width = 0.0;
    priv->allocation_height = 0.0;
    priv->scale_factor = 1;
    GtkIconTheme *theme = gtk_icon_theme_get_default ();
    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
-    priv->css_provider = squeek_load_style();
+    self->css_provider = squeek_load_style();
 }
 EekRenderer *
 eek_renderer_new (LevelKeyboard  *keyboard,
                  PangoContext *pcontext)
 {
-    EekRenderer *renderer = g_object_new (EEK_TYPE_RENDERER,
+    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
-                         "pango-context", pcontext,
+    renderer_init(renderer);
-                         NULL);
+    renderer->pcontext = pcontext;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    g_object_ref (renderer->pcontext);
    priv->keyboard = keyboard;
    /* Create a style context for the layout */
    GtkWidgetPath *path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    priv->view_context = gtk_style_context_new();
+    renderer->view_context = gtk_style_context_new();
-    gtk_style_context_set_path(priv->view_context, path);
+    gtk_style_context_set_path(renderer->view_context, path);
    gtk_widget_path_unref(path);
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
-        gtk_style_context_add_class(priv->view_context, "wide");
+        gtk_style_context_add_class(renderer->view_context, "wide");
    }
-    gtk_style_context_add_provider (priv->view_context,
+    gtk_style_context_add_provider (renderer->view_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    /* Create a style context for the buttons */
    path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_widget_path_iter_add_class(path, -1, "wide");
    }
    gtk_widget_path_append_type(path, button_type());
-    priv->button_context = gtk_style_context_new ();
+    renderer->button_context = gtk_style_context_new ();
-    gtk_style_context_set_path(priv->button_context, path);
+    gtk_style_context_set_path(renderer->button_context, path);
    gtk_widget_path_unref(path);
-    gtk_style_context_set_parent(priv->button_context, priv->view_context);
+    gtk_style_context_set_parent(renderer->button_context, renderer->view_context);
-    gtk_style_context_set_state (priv->button_context, GTK_STATE_FLAG_NORMAL);
+    gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
-    gtk_style_context_add_provider (priv->button_context,
+    gtk_style_context_add_provider (renderer->button_context,
-        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    return renderer;
 }
 void
 eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  struct squeek_layout *layout,
                                  gdouble      width,
                                  gdouble      height)
 {
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    renderer->allocation_width = width;
    renderer->allocation_height = height;
-    priv->allocation_width = width;
+    renderer->widget_to_layout = squeek_layout_calculate_transformation(
-    priv->allocation_height = height;
+                layout,
-
+                renderer->allocation_width, renderer->allocation_height);
    priv->widget_to_layout = squeek_layout_calculate_transformation(
                priv->keyboard->layout,
                priv->allocation_width, priv->allocation_height);
    // This is where size-dependent surfaces would be released
 }
@ -435,10 +334,7 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
 void
 eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
 {
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
+    renderer->scale_factor = scale;
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    priv->scale_factor = scale;
 }
 cairo_surface_t *
@ -467,9 +363,5 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer) {
-    struct transformation failed = {0};
+    return renderer->widget_to_layout;
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
    return priv->widget_to_layout;
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,31 +25,36 @@
 #include <pango/pangocairo.h>
 #include "eek-types.h"
 #include "src/submission.h"
-G_BEGIN_DECLS
+struct squeek_layout;
-#define EEK_TYPE_RENDERER (eek_renderer_get_type())
+/// Renders LevelKayboards
-G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+/// It cannot adjust styles at runtime.
-
+typedef struct EekRenderer
 struct _EekRendererClass
 {
-    GObjectClass parent_class;
+    PangoContext *pcontext; // owned
    GtkCssProvider *css_provider; // owned
    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
    /// Style class for rendering the view and button CSS.
    gchar *extra_style; // owned
-    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
+    // Mutable state
-                                             const gchar *icon_name,
+    /// Background extents
-                                             gint         size,
+    gdouble allocation_width;
-                                             gint         scale);
+    gdouble allocation_height;
    gint scale_factor; /* the outputs scale factor */
    /// Coords transformation
    struct transformation widget_to_layout;
 } EekRenderer;
    /*< private >*/
    /* padding */
    gpointer pdummy[23];
 };
 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
 EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
                                                PangoContext    *pcontext);
 void             eek_renderer_set_allocation_size
-                                               (EekRenderer     *renderer,
+                                               (EekRenderer     *renderer, struct squeek_layout *layout,
                                                gdouble          width,
                                                gdouble          height);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
@ -59,8 +64,10 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);
-void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
+void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct submission *submission,
-                                                cairo_t         *cr);
+                                                cairo_t         *cr, LevelKeyboard *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer);
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -47,13 +47,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 struct _EekboardContextServicePrivate {
    LevelKeyboard *keyboard; // currently used keyboard
    GHashTable *keyboard_hash; // a table of available keyboards, per layout
    char *overlay;
    GSettings *settings; // Owned reference
    uint32_t hint;
    uint32_t purpose;
    // Maybe TODO: it's used only for fetching layout type.
    // Maybe let UI push the type to this structure?
@ -99,13 +93,6 @@ eekboard_context_service_get_property (GObject    *object,
 static void
 eekboard_context_service_dispose (GObject *object)
 {
    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
    if (context->priv->keyboard_hash) {
        g_hash_table_destroy (context->priv->keyboard_hash);
        context->priv->keyboard_hash = NULL;
    }
    G_OBJECT_CLASS (eekboard_context_service_parent_class)->
        dispose (object);
 }
@ -113,46 +100,48 @@ eekboard_context_service_dispose (GObject *object)
 static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    if (!settings) {
        return;
    }
    GVariant *inputs = g_settings_get_value(settings, "sources");
-    // current layout is always first
+    if (g_variant_n_children(inputs) == 0) {
-    g_variant_get_child(inputs, 0, "(ss)", type, layout);
+        g_warning("No system layout present");
        *type = NULL;
        *layout = NULL;
    } else {
        // current layout is always first
        g_variant_get_child(inputs, 0, "(ss)", type, layout);
    }
    g_variant_unref(inputs);
 }
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state) {
-{
+    gchar *layout_name = state->overlay_name;
    g_autofree gchar *keyboard_layout = NULL;
    if (context->priv->overlay) {
        keyboard_layout = g_strdup(context->priv->overlay);
    } else {
        g_autofree gchar *keyboard_type = NULL;
        settings_get_layout(context->priv->settings,
                            &keyboard_type, &keyboard_layout);
    }
-    if (!keyboard_layout) {
+    if (layout_name == NULL) {
-        keyboard_layout = g_strdup("us");
+        layout_name = state->layout_name;
    }
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+        switch (state->purpose) {
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
            layout_name = "number";
            break;
        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
            layout_name = "terminal";
            break;
        default:
            ;
        }
-    switch (priv->purpose) {
+        if (layout_name == NULL) {
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
+            layout_name = "us";
-    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
+        }
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("number");
        break;
    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
        g_free(keyboard_layout);
        keyboard_layout = g_strdup("terminal");
        break;
    default:
        ;
    }
    // generic part follows
-    LevelKeyboard *keyboard = level_keyboard_new(keyboard_layout, t);
+    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
    LevelKeyboard *keyboard = level_keyboard_new(layout);
    // set as current
    LevelKeyboard *previous_keyboard = context->priv->keyboard;
    context->priv->keyboard = keyboard;
@ -162,6 +151,7 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
        submission_set_keyboard(context->priv->submission, keyboard);
    }
    // Update UI
    g_object_notify (G_OBJECT(context), "keyboard");
    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
@ -170,13 +160,22 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    }
 }
-static void update_layout_and_type(EekboardContextService *context) {
+static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    g_autofree gchar *keyboard_layout = NULL;
-    enum squeek_arrangement_kind layout_kind = ARRANGEMENT_KIND_BASE;
+    g_autofree gchar *keyboard_type = NULL;
-    if (priv->ui) {
+    settings_get_layout(context->priv->settings,
-        layout_kind = server_context_service_get_layout_type(priv->ui);
+                        &keyboard_type, &keyboard_layout);
    if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
        g_free(context->layout->overlay_name);
        context->layout->overlay_name = NULL;
        if (keyboard_layout) {
            g_free(context->layout->layout_name);
            context->layout->layout_name = g_strdup(keyboard_layout);
        }
        // This must actually update the UI.
        eekboard_context_service_use_layout(context, context->layout);
    }
    eekboard_context_service_update_layout(context, layout_kind);
 }
 static gboolean
@ -187,17 +186,14 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
-    g_free(context->priv->overlay);
+    eekboard_context_service_update_settings_layout(context);
    context->priv->overlay = NULL;
    update_layout_and_type(context);
    return TRUE;
 }
 static void
 eekboard_context_service_constructed (GObject *object)
 {
-    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
+    (void)object;
    update_layout_and_type(context);
 }
 static void
@ -245,23 +241,30 @@ static void
 eekboard_context_service_init (EekboardContextService *self)
 {
    self->priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(self);
-
+    const char *schema_name = "org.gnome.desktop.input-sources";
-    self->priv->keyboard_hash =
+    GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
-        g_hash_table_new_full (g_direct_hash,
+    if (ssrc) {
-                               g_direct_equal,
+        GSettingsSchema *schema = g_settings_schema_source_lookup(ssrc,
-                               NULL,
+                                                                  schema_name,
-                               (GDestroyNotify)g_object_unref);
+                                                                  TRUE);
-
+        if (schema) {
-    self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
+            // Not referencing the found schema directly,
-    gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
+            // because it's not clear how...
-                                      G_CALLBACK(settings_handle_layout_changed),
+            self->priv->settings = g_settings_new (schema_name);
-                                      self);
+            gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
-    if (conn_id == 0) {
+                                              G_CALLBACK(settings_handle_layout_changed),
-        g_warning ("Could not connect to gsettings updates, layout"
+                                              self);
-                   " changing unavailable");
+            if (conn_id == 0) {
                g_warning ("Could not connect to gsettings updates, "
                           "automatic layout changing unavailable");
            }
        } else {
            g_warning("Gsettings schema %s is not installed on the system. "
                      "Layout switching unavailable", schema_name);
        }
    } else {
        g_warning("No gsettings schemas installed. Layout switching unavailable.");
    }
    self->priv->overlay = NULL;
 }
 /**
@ -274,8 +277,6 @@ void
 eekboard_context_service_destroy (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }
@ -295,29 +296,34 @@ eekboard_context_service_get_keyboard (EekboardContextService *context)
 void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint, uint32_t purpose)
 {
-    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    if (context->layout->hint != hint || context->layout->purpose != purpose) {
-
+        context->layout->hint = hint;
-    if (priv->hint != hint || priv->purpose != purpose) {
+        context->layout->purpose = purpose;
-        priv->hint = hint;
+        eekboard_context_service_use_layout(context, context->layout);
        priv->purpose = purpose;
        update_layout_and_type(context);
    }
 }
 void
 eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
-    context->priv->overlay = g_strdup(name);
+    if (g_strcmp0(context->layout->overlay_name, name)) {
-    update_layout_and_type(context);
+        g_free(context->layout->overlay_name);
        context->layout->overlay_name = g_strdup(name);
        eekboard_context_service_use_layout(context, context->layout);
    }
 }
 const char*
 eekboard_context_service_get_overlay(EekboardContextService *context) {
-    return context->priv->overlay;
+    return context->layout->overlay_name;
 }
-EekboardContextService *eekboard_context_service_new(void)
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
 {
-    return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
+    EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
    context->layout = state;
    eekboard_context_service_update_settings_layout(context);
    eekboard_context_service_use_layout(context, context->layout);
    return context;
 }
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -57,8 +57,8 @@ typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
 */
 struct _EekboardContextService {
    GObject parent;
    EekboardContextServicePrivate *priv;
    struct squeek_layout_state *layout; // Unowned
 };
 /**
@ -72,9 +72,6 @@ struct _EekboardContextServiceClass {
    GObjectClass parent_class;
    /*< public >*/
    struct squeek_view *(*create_keyboard)    (EekboardContextService *self,
                                        const gchar            *keyboard_type);
    /* signals */
    void         (*destroyed)          (EekboardContextService *self);
@ -85,7 +82,7 @@ struct _EekboardContextServiceClass {
 GType         eekboard_context_service_get_type
                                              (void) G_GNUC_CONST;
-EekboardContextService *eekboard_context_service_new(void);
+EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 void          eekboard_context_service_destroy (EekboardContextService *context);
@ -98,6 +95,6 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint,
                                               uint32_t purpose);
 void
-eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t);
+eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout);
 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.8.0',
+    version: '1.9.3',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -42,6 +42,7 @@ endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 desktopdir = join_paths(datadir, 'applications')
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
  depdatadir = datadir
@ -60,6 +61,32 @@ summary = [
 ]
 message('\n'.join(summary))
 # Rust deps are changing, depending on compile flags. Cargo can't handle it alone.
 cargo_toml_in = files('Cargo.toml.in')
 path_data = configuration_data()
 path_data.set('path', meson.source_root())
 cargo_toml_base = configure_file(
    input: 'Cargo.toml.in',
    output: 'Cargo.toml.base',
    configuration: path_data,
 )
 cargo_deps = files('Cargo.deps')
 if get_option('legacy') == true
    cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5']
    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],
    capture: true,
 )
 dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
 cargo_build = find_program('cargo_build.sh')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -6,3 +6,7 @@ option('depdatadir',
 option('tests',
       type: 'boolean', value: true,
       description: 'Whether to compile unit tests')
 option('legacy',
       type: 'boolean', value: false,
       description: 'Build with Deban Buster versions of dependencies')
--- a/squeekboard.doap
+++ b/squeekboard.doap
@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
 <name>squeekboard</name>
 <shortdesc>A Wayland virtual keyboard</shortdesc>
 <description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
 <homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
 <bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
 <os>Linux</os>
 <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
 <maintainer>
  <foaf:Person>
     <foaf:name>Dorota Czaplejewicz</foaf:name>
     <foaf:mbox rdf:resource="mailto:dorota.czaplejewicz@puri.sm" />
  </foaf:Person>
 </maintainer>
 </Project>
--- a/src/action.rs
+++ b/src/action.rs
@ -10,8 +10,11 @@ pub struct KeySym(pub String);
 type View = String;
 /// Use to send modified keypresses
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Modifier {
    /// Control and Alt are the only modifiers
    /// which doesn't interfere with levels,
    /// so it's simple to implement as levels are deprecated in squeekboard.
    Control,
    Alt,
 }
@ -27,8 +30,8 @@ pub enum Action {
        /// When unlocked by pressing it or emitting a key
        unlock: View,
    },
-    /// Set this modifier TODO: release?
+    /// Hold this modifier for as long as the button is pressed
-    SetModifier(Modifier),
+    ApplyModifier(Modifier),
    /// Submit some text
    Submit {
        /// Text to submit with input-method.
--- a/src/data.rs
+++ b/src/data.rs
@ -240,14 +240,20 @@ type ButtonIds = String;
 #[derive(Debug, Default, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct ButtonMeta {
-    /// Special action to perform on activation. Conflicts with keysym, text.
+    // TODO: structure (action, keysym, text, modifier) as an enum
    // to detect conflicts and missing values at compile time
    /// Special action to perform on activation.
    /// Conflicts with keysym, text, modifier.
    action: Option<Action>,
    /// The name of the XKB keysym to emit on activation.
-    /// Conflicts with action, text
+    /// Conflicts with action, text, modifier.
    keysym: Option<String>,
    /// The text to submit on activation. Will be derived from ID if not present
-    /// Conflicts with action, keysym
+    /// Conflicts with action, keysym, modifier.
    text: Option<String>,
    /// The modifier to apply while the key is locked
    /// Conflicts with action, keysym, text
    modifier: Option<Modifier>,
    /// If not present, will be derived from text or the button ID
    label: Option<String>,
    /// Conflicts with label
@ -270,6 +276,20 @@ enum Action {
    Erase,
 }
 #[derive(Debug, Clone, PartialEq, Deserialize)]
 #[serde(deny_unknown_fields)]
 enum Modifier {
    Control,
    Shift,
    Lock,
    #[serde(alias="Mod1")]
    Alt,
    Mod2,
    Mod3,
    Mod4,
    Mod5,
 }
 #[derive(Debug, Clone, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct Outline {
@ -510,22 +530,27 @@ fn create_action<H: logging::Handler>(
        Action(Action),
        Text(String),
        Keysym(String),
        Modifier(Modifier),
    };
    let submission = match (
        &symbol_meta.action,
        &symbol_meta.keysym,
-        &symbol_meta.text
+        &symbol_meta.text,
        &symbol_meta.modifier,
    ) {
-        (Some(action), None, None) => SubmitData::Action(action.clone()),
+        (Some(action), None, None, None) => SubmitData::Action(action.clone()),
-        (None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
+        (None, Some(keysym), None, None) => SubmitData::Keysym(keysym.clone()),
-        (None, None, Some(text)) => SubmitData::Text(text.clone()),
+        (None, None, Some(text), None) => SubmitData::Text(text.clone()),
-        (None, None, None) => SubmitData::Text(name.into()),
+        (None, None, None, Some(modifier)) => {
            SubmitData::Modifier(modifier.clone())
        },
        (None, None, None, None) => SubmitData::Text(name.into()),
        _ => {
            warning_handler.handle(
                logging::Level::Warning,
                &format!(
-                    "Button {} has more than one of (action, keysym, text)",
+                    "Button {} has more than one of (action, keysym, text, modifier)",
                    name,
                ),
            );
@ -614,6 +639,26 @@ fn create_action<H: logging::Handler>(
                })
            }).collect(),
        },
        SubmitData::Modifier(modifier) => match modifier {
            Modifier::Control => action::Action::ApplyModifier(
                action::Modifier::Control,
            ),
            Modifier::Alt => action::Action::ApplyModifier(
                action::Modifier::Alt,
            ),
            unsupported_modifier => {
                warning_handler.handle(
                    logging::Level::Bug,
                    &format!(
                        "Modifier {:?} unsupported", unsupported_modifier,
                    ),
                );
                action::Action::Submit {
                    text: None,
                    keys: Vec::new(),
                }
            },
        },
    }
 }
@ -696,10 +741,19 @@ mod tests {
    use std::error::Error as ErrorTrait;
    use ::logging::ProblemPanic;
    const THIS_FILE: &str = file!();
    fn path_from_root(file: &'static str) -> PathBuf {
        PathBuf::from(THIS_FILE)
            .parent().unwrap()
            .parent().unwrap()
            .join(file)
    }
    #[test]
    fn test_parse_path() {
        assert_eq!(
-            Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
+            Layout::from_file(path_from_root("tests/layout.yaml")).unwrap(),
            Layout {
                margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
                views: hashmap!(
@ -711,6 +765,7 @@ mod tests {
                        keysym: None,
                        action: None,
                        text: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -725,7 +780,7 @@ mod tests {
    /// Check if the default protection works
    #[test]
    fn test_empty_views() {
-        let out = Layout::from_file(PathBuf::from("tests/layout2.yaml"));
+        let out = Layout::from_file(path_from_root("tests/layout2.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
@ -743,7 +798,7 @@ mod tests {
    #[test]
    fn test_extra_field() {
-        let out = Layout::from_file(PathBuf::from("tests/layout3.yaml"));
+        let out = Layout::from_file(path_from_root("tests/layout3.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
@ -762,7 +817,7 @@ mod tests {
    #[test]
    fn test_layout_punctuation() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key1.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
@ -777,7 +832,7 @@ mod tests {
    #[test]
    fn test_layout_unicode() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key2.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
@ -793,7 +848,7 @@ mod tests {
    /// Test multiple codepoints
    #[test]
    fn test_layout_unicode_multi() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_key3.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
@ -852,6 +907,7 @@ mod tests {
                        keysym: None,
                        text: None,
                        action: None,
                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -869,7 +925,7 @@ mod tests {
    #[test]
    fn test_layout_margins() {
-        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
+        let out = Layout::from_file(path_from_root("tests/layout_margins.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -3,9 +3,11 @@
 use cairo;
 use std::cell::RefCell;
 use ::action::Action;
 use ::keyboard;
 use ::layout::{ Button, Layout };
 use ::layout::c::{ EekGtkKeyboard, Point };
 use ::submission::Submission;
 use glib::translate::FromGlibPtrNone;
 use gtk::WidgetExt;
@ -44,13 +46,21 @@ mod c {
        layout: *mut Layout,
        renderer: EekRenderer,
        cr: *mut cairo_sys::cairo_t,
        submission: *const Submission,
    ) {
        let layout = unsafe { &mut *layout };
        let submission = unsafe { &*submission };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
        let active_modifiers = submission.get_active_modifiers();
        layout.foreach_visible_button(|offset, button| {
            let state = RefCell::borrow(&button.state).clone();
-            let locked = state.action.is_active(&layout.current_view);
+            let active_mod = match &state.action {
                Action::ApplyModifier(m) => active_modifiers.contains(m),
                _ => false,
            };
            let locked = state.action.is_active(&layout.current_view)
                | active_mod;
            if state.pressed == keyboard::PressType::Pressed || locked {
                render_button_at_position(
                    renderer, &cr,
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -23,6 +23,24 @@ pub enum PressType {
 pub type KeyCode = u32;
 bitflags!{
    /// Map to `virtual_keyboard.modifiers` modifiers values
    /// From https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Keyboard_State
    pub struct Modifiers: u8 {
        const SHIFT = 0x1;
        const LOCK = 0x2;
        const CONTROL = 0x4;
        /// Alt
        const MOD1 = 0x8;
        const MOD2 = 0x10;
        const MOD3 = 0x20;
        /// Meta
        const MOD4 = 0x40;
        /// AltGr
        const MOD5 = 0x80;
    }
 }
 /// When the submitted actions of keys need to be tracked,
 /// they need a stable, comparable ID
 #[derive(PartialEq)]
@ -31,7 +49,7 @@ pub struct KeyStateId(*const KeyState);
 #[derive(Debug, Clone)]
 pub struct KeyState {
    pub pressed: PressType,
-    /// A cache of raw keycodes derived from Action::Sumbit given a keymap
+    /// A cache of raw keycodes derived from Action::Submit given a keymap
    pub keycodes: Vec<KeyCode>,
    /// Static description of what the key does when pressed or released
    pub action: Action,
@ -46,6 +64,14 @@ impl KeyState {
        }
    }
    #[must_use]
    pub fn into_pressed(self) -> KeyState {
        KeyState {
            pressed: PressType::Pressed,
            ..self
        }
    }
    /// KeyStates instances are the unique identifiers of pressed keys,
    /// and the actions submitted with them.
    pub fn get_id(keystate: &Rc<RefCell<KeyState>>) -> KeyStateId {
--- a/src/layout.h
+++ b/src/layout.h
@ -7,13 +7,23 @@
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
 #include "src/submission.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 #include "text-input-unstable-v3-client-protocol.h"
 enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_BASE = 0,
    ARRANGEMENT_KIND_WIDE = 1,
 };
 struct squeek_layout_state {
    enum squeek_arrangement_kind arrangement;
    enum zwp_text_input_v3_content_purpose purpose;
    enum zwp_text_input_v3_content_hint hint;
    char *layout_name;
    char *overlay_name;
 };
 struct squeek_layout;
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
@ -53,6 +63,6 @@ void squeek_layout_drag(struct squeek_layout *layout,
                        struct transformation widget_to_layout,
                        uint32_t timestamp, EekboardContextService *manager,
                        EekGtkKeyboard *ui_keyboard);
-void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr, struct submission *submission);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
@ -26,10 +26,10 @@ use std::vec::Vec;
 use ::action::Action;
 use ::drawing;
-use ::keyboard::{ KeyState, PressType };
+use ::keyboard::KeyState;
 use ::logging;
 use ::manager;
-use ::submission::{ Submission, Timestamp };
+use ::submission::{ Submission, SubmitData, Timestamp };
 use ::util::find_max_double;
 // Traits
@ -52,6 +52,14 @@ pub mod c {
    #[derive(Copy, Clone)]
    pub struct EekGtkKeyboard(pub *const gtk_sys::GtkWidget);
    #[no_mangle]
    extern "C" {
        #[allow(improper_ctypes)]
        pub fn eek_gtk_keyboard_emit_feedback(
            keyboard: EekGtkKeyboard,
        );
    }
    /// Defined in eek-types.h
    #[repr(C)]
    #[derive(Clone, Debug, PartialEq)]
@ -249,7 +257,7 @@ pub mod c {
        unsafe { Box::from_raw(layout) };
    }
-    /// Entry points for more complex procedures and algoithms which span multiple modules
+    /// Entry points for more complex procedures and algorithms which span multiple modules
    pub mod procedures {
        use super::*;
@ -341,6 +349,9 @@ pub mod c {
                );
                // maybe TODO: draw on the display buffer here
                drawing::queue_redraw(ui_keyboard);
                unsafe {
                    eek_gtk_keyboard_emit_feedback(ui_keyboard);
                }
            };
        }
@ -404,6 +415,9 @@ pub mod c {
                        &state,
                    );
                    // maybe TODO: draw on the display buffer here
                    unsafe {
                        eek_gtk_keyboard_emit_feedback(ui_keyboard);
                    }
                }
            } else {
                for wrapped_key in pressed {
@ -916,9 +930,38 @@ mod seat {
                "Key {:?} was already pressed", rckey,
            );
        }
-        let mut key = rckey.borrow_mut();
+        let key: KeyState = {
-        submission.handle_press(&key, KeyState::get_id(rckey), time);
+            RefCell::borrow(rckey).clone()
-        key.pressed = PressType::Pressed;
+        };
        let action = key.action.clone();
        match action {
            Action::Submit {
                text: Some(text),
                keys: _,
            } => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Text(&text),
                &key.keycodes,
                time,
            ),
            Action::Submit {
                text: None,
                keys: _,
            } => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Keycodes,
                &key.keycodes,
                time,
            ),
            Action::Erase => submission.handle_press(
                KeyState::get_id(rckey),
                SubmitData::Erase,
                &key.keycodes,
                time,
            ),
            _ => {},
        };
        RefCell::replace(rckey, key.into_pressed());
    }
    pub fn handle_release_key(
@ -961,6 +1004,18 @@ mod seat {
                    )
                    .apply()
            },
            Action::ApplyModifier(modifier) => {
                // FIXME: key id is unneeded with stateless locks
                let key_id = KeyState::get_id(rckey);
                let gets_locked = !submission.is_modifier_active(modifier.clone());
                match gets_locked {
                    true => submission.handle_add_modifier(
                        key_id,
                        modifier, time,
                    ),
                    false => submission.handle_drop_modifier(key_id, time),
                }
            }
            // only show when UI is present
            Action::ShowPreferences => if let Some(ui) = &ui {
                // only show when layout manager is available
@ -987,10 +1042,6 @@ mod seat {
                    }
                }
            },
            Action::SetModifier(_) => log_print!(
                logging::Level::Bug,
                "Modifiers unsupported",
            ),
        };
        let pointer = ::util::Pointer(rckey.clone());
@ -1006,6 +1057,7 @@ mod test {
    use super::*;
    use std::ffi::CString;
    use ::keyboard::PressType;
    pub fn make_state() -> Rc<RefCell<::keyboard::KeyState>> {
        Rc::new(RefCell::new(::keyboard::KeyState {
--- a/src/lib.rs
+++ b/src/lib.rs
@ -35,5 +35,6 @@ mod style;
 mod submission;
 pub mod tests;
 pub mod util;
 mod ui_manager;
 mod vkeyboard;
 mod xdg;
--- a/src/meson.build
+++ b/src/meson.build
@ -36,9 +36,10 @@ cc = meson.get_compiler('c')
 deps = [
 #  dependency('glib-2.0', version: '>=2.26.0'),
  dependency('gio-2.0', version: '>=2.26.0'),
  dependency('gio-unix-2.0'),
  dependency('gnome-desktop-3.0', version: '>=3.0'),
  dependency('gtk+-3.0', version: '>=3.0'),
-  dependency('libcroco-0.6'),
+  dependency('libfeedback-0.0'),
  dependency('wayland-client', version: '>=1.14'),
  dependency('xkbcommon'),
  cc.find_library('m'),
@ -55,7 +56,8 @@ rslibs = custom_target(
    output: ['librs.a'],
    install: false,
    console: true,
-    command: [cargo_build] + cargo_build_flags + ['@OUTPUT@', '--lib']
+    command: [cargo_build] + ['@OUTPUT@', '--lib'] + cargo_build_flags,
    depends: cargo_toml,
 )
 build_rstests = custom_target(
@ -69,17 +71,17 @@ build_rstests = custom_target(
    output: ['src'],
    install: false,
    console: true,
-    command: [cargo_script, 'test', '--no-run'],
+    command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
-    depends: rslibs, # no point building tests if the code itself fails
+    depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
 )
 test(
    'rstest',
    cargo_script,
-    args: ['test'],
+    args: ['test'] + cargo_build_flags,
    # this is a whole Carg-based test suite, let it run for a while
    timeout: 900,
-    depends: build_rstests,
+    depends: [build_rstests, cargo_toml],
 )
 libsqueekboard = static_library('libsqueekboard',
--- a/src/outputs.h
+++ b/src/outputs.h
@ -4,10 +4,14 @@
 #include "wayland-client-protocol.h"
 struct squeek_outputs;
 struct squeek_output_handle {
    struct wl_output *output;
    struct squeek_outputs *outputs;
 };
 struct squeek_outputs *squeek_outputs_new();
 void squeek_outputs_free(struct squeek_outputs*);
 void squeek_outputs_register(struct squeek_outputs*, struct wl_output *output);
-struct wl_output *squeek_outputs_get_current(struct squeek_outputs*);
+struct squeek_output_handle squeek_outputs_get_current(struct squeek_outputs*);
 int32_t squeek_outputs_get_perceptual_width(struct squeek_outputs*, struct wl_output *output);
 #endif
--- a/src/outputs.rs
+++ b/src/outputs.rs
@ -17,7 +17,7 @@ pub mod c {
    // Defined in C
    #[repr(transparent)]
-    #[derive(Clone, PartialEq)]
+    #[derive(Clone, PartialEq, Copy)]
    pub struct WlOutput(*const c_void);
    #[repr(C)]
@ -105,6 +105,24 @@ pub mod c {
    type COutputs = ::util::c::Wrapped<Outputs>;
    /// A stable reference to an output.
    #[derive(Clone)]
    #[repr(C)]
    pub struct OutputHandle {
        wl_output: WlOutput,
        outputs: COutputs,
    }
    impl OutputHandle {
        // Cannot return an Output reference
        // because COutputs is too deeply wrapped
        pub fn get_state(&self) -> Option<OutputState> {
            let outputs = self.outputs.clone_ref();
            let outputs = outputs.borrow();
            find_output(&outputs, self.wl_output.clone()).map(|o| o.current.clone())
        }
    }
    // Defined in Rust
    extern fn outputs_handle_geometry(
@ -240,46 +258,15 @@ pub mod c {
    #[no_mangle]
    pub extern "C"
-    fn squeek_outputs_get_current(raw_collection: COutputs) -> WlOutput {
+    fn squeek_outputs_get_current(raw_collection: COutputs) -> OutputHandle {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
-        collection.outputs[0].output.clone()
+        OutputHandle {
-    }
+            wl_output: collection.outputs[0].output.clone(),
-
+            outputs: raw_collection.clone(),
    #[no_mangle]
    pub extern "C"
    fn squeek_outputs_get_perceptual_width(
        raw_collection: COutputs,
        wl_output: WlOutput,
    ) -> i32 {
        let collection = raw_collection.clone_ref();
        let collection = collection.borrow();
        let output_state = find_output(&collection, wl_output)
            .map(|o| &o.current);
        match output_state {
            Some(OutputState {
                current_mode: Some(super::Mode { width, height } ),
                transform: Some(transform),
                scale,
            }) => {
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => width / scale,
                    _ => height / scale,
                }
            },
            _ => {
                log_print!(
                    logging::Level::Surprise,
                    "Not enough info received on output",
                );
                0
            },
        }
    }
    // TODO: handle unregistration
    fn find_output(
@ -305,6 +292,14 @@ pub mod c {
    }
 }
 /// Generic size
 #[derive(Clone)]
 pub struct Size {
    pub width: u32,
    pub height: u32,
 }
 /// wl_output mode
 #[derive(Clone)]
 struct Mode {
    width: i32,
@ -315,10 +310,16 @@ struct Mode {
 pub struct OutputState {
    current_mode: Option<Mode>,
    transform: Option<c::Transform>,
-    scale: i32,
+    pub scale: i32,
 }
 impl OutputState {
    // More properly, this would have been a builder kind of struct,
    // with wl_output gradually adding properties to it
    // before it reached a fully initialized state,
    // when it would transform into a struct without all (some?) of the Options.
    // However, it's not clear which state is fully initialized,
    // and whether it would make things easier at all anyway.
    fn uninitialized() -> OutputState {
        OutputState {
            current_mode: None,
@ -326,6 +327,32 @@ impl OutputState {
            scale: 1,
        }
    }
    pub fn get_pixel_size(&self) -> Option<Size> {
        use self::c::Transform;
        match self {
            OutputState {
                current_mode: Some(Mode { width, height } ),
                transform: Some(transform),
                scale: _,
            } => Some(
                match transform {
                    Transform::Normal
                    | Transform::Rotated180
                    | Transform::Flipped
                    | Transform::FlippedRotated180 => Size {
                        width: *width as u32,
                        height: *height as u32,
                    },
                    _ => Size {
                        width: *height as u32,
                        height: *width as u32,
                    },
                }
            ),
            _ => None,
        }
    }
 }
 pub struct Output {
--- a/src/popover.rs
+++ b/src/popover.rs
@ -11,11 +11,15 @@ use ::logging;
 use ::manager;
 use ::resources;
 // Traits
 use gio::ActionMapExt;
 use gio::SettingsExt;
 #[cfg(feature = "gio_v0_5")]
 use gio::SimpleActionExt;
 use glib::translate::FromGlibPtrNone;
 use glib::variant::ToVariant;
 #[cfg(not(feature = "gtk_v0_5"))]
 use gtk::BuilderExtManual;
 use gtk::PopoverExt;
 use gtk::WidgetExt;
 use std::io::Write;
@ -29,6 +33,7 @@ mod variants {
    use glib::ToVariant;
    use glib::translate::FromGlibPtrFull;
    use glib::translate::FromGlibPtrNone;
    use glib::translate::ToGlibPtr;
    /// Unpacks tuple & array variants
@ -91,12 +96,7 @@ mod variants {
            unsafe {
                let ret = glib_sys::g_variant_builder_end(builder);
                glib_sys::g_variant_builder_unref(builder);
-                // HACK: This is to prevent C taking ownership
+                glib::Variant::from_glib_none(ret)
                // of "floating" Variants,
                // where Rust gets to keep a stale reference
                // and crash when trying to drop it.
                glib_sys::g_variant_ref_sink(ret);
                glib::Variant::from_glib_full(ret)
            }
        }
    }
@ -136,19 +136,40 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
    )
 }
 fn get_settings(schema_name: &str) -> Option<gio::Settings> {
    let mut error_handler = logging::Print{};
    gio::SettingsSchemaSource::get_default()
        .or_warn(
            &mut error_handler,
            logging::Problem::Surprise,
            "No gsettings schemas installed.",
        )
        .and_then(|sss| 
            sss.lookup(schema_name, true)
                .or_warn(
                    &mut error_handler,
                    logging::Problem::Surprise,
                    &format!("Gsettings schema {} not installed", schema_name),
                )
        )
        .map(|_sschema| gio::Settings::new(schema_name))
 }
 fn set_layout(kind: String, name: String) {
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    if let Some(settings) = settings {
-    let current = (kind.clone(), name.clone());
+        let inputs = settings.get_value("sources").unwrap();
-    let inputs = variants::get_tuples(inputs).into_iter()
+        let current = (kind.clone(), name.clone());
-        .filter(|t| t != &current);
+        let inputs = variants::get_tuples(inputs).into_iter()
-    let inputs = vec![(kind, name)].into_iter()
+            .filter(|t| t != &current);
-        .chain(inputs).collect();
+        let inputs = vec![(kind, name)].into_iter()
-    settings.set_value(
+            .chain(inputs).collect();
-        "sources",
+        settings.set_value(
-        &variants::ArrayPairString(inputs).to_variant(),
+            "sources",
-    );
+            &variants::ArrayPairString(inputs).to_variant(),
-    settings.apply();
+        );
        settings.apply();
    }
 }
 /// A reference to what the user wants to see
@ -288,9 +309,13 @@ pub fn show(
    let overlay_layouts = resources::get_overlays().into_iter()
        .map(|name| LayoutId::Local(name.to_string()));
-    let settings = gio::Settings::new("org.gnome.desktop.input-sources");
+    let settings = get_settings("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    let inputs = settings
-    let inputs = variants::get_tuples(inputs);
+        .map(|settings| {
            let inputs = settings.get_value("sources").unwrap();
            variants::get_tuples(inputs)
        })
        .unwrap_or_else(|| Vec::new());
    let system_layouts: Vec<LayoutId> = inputs.into_iter()
        .map(|(kind, name)| LayoutId::System { kind, name })
--- a/src/resources.rs
+++ b/src/resources.rs
@ -11,13 +11,17 @@ use std::iter::FromIterator;
 // and what a convenience layout. "_wide" is not a layout,
 // neither is "number"
 const KEYBOARDS: &[(*const str, *const str)] = &[
-    // layouts
+    // layouts: us must be left as first, as it is the,
    // fallback layout. The others should be alphabetical.
    ("us", include_str!("../data/keyboards/us.yaml")),
    ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
    ("br", include_str!("../data/keyboards/br.yaml")),
    ("de", include_str!("../data/keyboards/de.yaml")),
    ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
    ("dk", include_str!("../data/keyboards/dk.yaml")),
    ("es", include_str!("../data/keyboards/es.yaml")),
    ("fi", include_str!("../data/keyboards/fi.yaml")),
    ("fr", include_str!("../data/keyboards/fr.yaml")),
    ("gr", include_str!("../data/keyboards/gr.yaml")),
    ("it", include_str!("../data/keyboards/it.yaml")),
    ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")),
@ -26,6 +30,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("number", include_str!("../data/keyboards/number.yaml")),
    ("pl", include_str!("../data/keyboards/pl.yaml")),
    ("pl_wide", include_str!("../data/keyboards/pl_wide.yaml")),
    ("ru", include_str!("../data/keyboards/ru.yaml")),
    ("se", include_str!("../data/keyboards/se.yaml")),
    // layout+overlay
    ("terminal", include_str!("../data/keyboards/terminal.yaml")),
@ -67,6 +72,7 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
    ("es-ES", include_str!("../data/langs/es-ES.txt")),
    ("ja-JP", include_str!("../data/langs/ja-JP.txt")),
    ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
    ("ru-RU", include_str!("../data/langs/ru-RU.txt")),
 ];
 pub fn get_layout_names(lang: &str)
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -30,8 +30,6 @@
 enum {
    PROP_0,
    PROP_SIZE_CONSTRAINT_LANDSCAPE,
    PROP_SIZE_CONSTRAINT_PORTRAIT,
    PROP_VISIBLE,
    PROP_LAST
 };
@ -44,16 +42,14 @@ struct _ServerContextService {
    EekboardContextService *state; // unowned
    /// Needed for instantiating the widget
    struct submission *submission; // unowned
    struct squeek_layout_state *layout;
    struct ui_manager *manager; // unowned
    gboolean visible;
    PhoshLayerSurface *window;
    GtkWidget *widget; // nullable
    guint hiding;
    guint last_requested_height;
    enum squeek_arrangement_kind last_type;
    gdouble size_constraint_landscape[2];
    gdouble size_constraint_portrait[2];
 };
 struct _ServerContextServiceClass {
@ -75,27 +71,6 @@ on_destroy (GtkWidget *widget, gpointer user_data)
    //eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
 }
 static void
 make_widget (ServerContextService *context);
 static void
 on_notify_keyboard (GObject              *object,
                    GParamSpec           *spec,
                    ServerContextService *context)
 {
    /* Recreate the keyboard widget to keep in sync with the keymap. */
    if (context->window)
        make_widget(context);
    gboolean visible;
    g_object_get (context, "visible", &visible, NULL);
    if (visible) {
        server_context_service_hide_keyboard(context);
        server_context_service_show_keyboard(context);
    }
 }
 static void
 on_notify_map (GObject    *object,
               ServerContextService *context)
@ -124,14 +99,6 @@ calculate_height(int32_t width)
    return height;
 }
 enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
    (void)height;
    if (width < 540) {
        return ARRANGEMENT_KIND_BASE;
    }
    return ARRANGEMENT_KIND_WIDE;
 }
 static void
 on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
 {
@ -141,14 +108,13 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
                 "configured-width", &width,
                 "configured-height", &height,
                 NULL);
    // check if the change would switch types
    enum squeek_arrangement_kind new_type = get_type((uint32_t)width, (uint32_t)height);
    if (context->last_type != new_type) {
        context->last_type = new_type;
        eekboard_context_service_update_layout(context->state, context->last_type);
    }
    // When the geometry event comes after surface.configure,
    // this entire height calculation does nothing.
    // guint desired_height = squeek_uiman_get_perceptual_height(context->manager);
    // Temporarily use old method, until the size manager is complete.
    guint desired_height = calculate_height(width);
    guint configured_height = (guint)height;
    // if height was already requested once but a different one was given
    // (for the same set of surrounding properties),
@ -171,14 +137,14 @@ make_window (ServerContextService *context)
    if (context->window)
        g_error("Window already present");
-    struct wl_output *output = squeek_outputs_get_current(squeek_wayland->outputs);
+    struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs);
-    int32_t width = squeek_outputs_get_perceptual_width(squeek_wayland->outputs, output);
+    squeek_uiman_set_output(context->manager, output);
-    uint32_t height = calculate_height(width);
+    uint32_t height = squeek_uiman_get_perceptual_height(context->manager);
    context->window = g_object_new (
        PHOSH_TYPE_LAYER_SURFACE,
        "layer-shell", squeek_wayland->layer_shell,
-        "wl-output", output,
+        "wl-output", output.output,
        "height", height,
        "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
@ -224,14 +190,11 @@ make_widget (ServerContextService *context)
        gtk_widget_destroy(context->widget);
        context->widget = NULL;
    }
-
+    context->widget = eek_gtk_keyboard_new (context->state, context->submission, context->layout);
    LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state);
    context->widget = eek_gtk_keyboard_new (keyboard, context->state, context->submission);
    gtk_widget_set_has_tooltip (context->widget, TRUE);
    gtk_container_add (GTK_CONTAINER(context->window), context->widget);
-    gtk_widget_show (context->widget);
+    gtk_widget_show_all(context->widget);
 }
 static gboolean
@ -296,21 +259,8 @@ server_context_service_set_property (GObject      *object,
                                     GParamSpec   *pspec)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);
    GVariant *variant;
    switch (prop_id) {
    case PROP_SIZE_CONSTRAINT_LANDSCAPE:
        variant = g_value_get_variant (value);
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_landscape[0],
                       &context->size_constraint_landscape[1]);
        break;
    case PROP_SIZE_CONSTRAINT_PORTRAIT:
        variant = g_value_get_variant (value);
        g_variant_get (variant, "(dd)",
                       &context->size_constraint_portrait[0],
                       &context->size_constraint_portrait[1]);
        break;
    case PROP_VISIBLE:
        context->visible = g_value_get_boolean (value);
        break;
@ -359,26 +309,6 @@ server_context_service_class_init (ServerContextServiceClass *klass)
    gobject_class->get_property = server_context_service_get_property;
    gobject_class->dispose = server_context_service_dispose;
    pspec = g_param_spec_variant ("size-constraint-landscape",
                                  "Size constraint landscape",
                                  "Size constraint landscape",
                                  G_VARIANT_TYPE("(dd)"),
                                  NULL,
                                  G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_SIZE_CONSTRAINT_LANDSCAPE,
                                     pspec);
    pspec = g_param_spec_variant ("size-constraint-portrait",
                                  "Size constraint portrait",
                                  "Size constraint portrait",
                                  G_VARIANT_TYPE("(dd)"),
                                  NULL,
                                  G_PARAM_WRITABLE);
    g_object_class_install_property (gobject_class,
                                     PROP_SIZE_CONSTRAINT_PORTRAIT,
                                     pspec);
    /**
     * Flag to indicate if keyboard is visible or not.
     */
@ -398,19 +328,12 @@ server_context_service_init (ServerContextService *state) {
 }
 ServerContextService *
-server_context_service_new (EekboardContextService *state, struct submission *submission)
+server_context_service_new (EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman)
 {
    ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
    ui->submission = submission;
    ui->state = state;
-    g_signal_connect (state,
+    ui->layout = layout;
-                      "notify::keyboard",
+    ui->manager = uiman;
                      G_CALLBACK(on_notify_keyboard),
                      ui);
    return ui;
 }
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *service)
 {
    return service->last_type;
 }
--- a/src/server-context-service.h
+++ b/src/server-context-service.h
@ -20,6 +20,7 @@
 #include "src/layout.h"
 #include "src/submission.h"
 #include "ui_manager.h"
 G_BEGIN_DECLS
@ -36,7 +37,7 @@ typedef struct _ServerContextService ServerContextService;
 GType         server_context_service_get_type
                                              (void) G_GNUC_CONST;
-ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission);
+ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman);
 enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
 void server_context_service_show_keyboard (ServerContextService *context);
 void server_context_service_hide_keyboard (ServerContextService *context);
--- a/src/server-main.c
+++ b/src/server-main.c
@ -28,9 +28,11 @@
 #include "eek/eek.h"
 #include "eekboard/eekboard-context-service.h"
 #include "dbus.h"
 #include "layout.h"
 #include "outputs.h"
 #include "submission.h"
 #include "server-context-service.h"
 #include "ui_manager.h"
 #include "wayland.h"
 #include <gdk/gdkwayland.h>
@ -38,11 +40,13 @@
 /// Global application state
 struct squeekboard {
-    struct squeek_wayland wayland;
+    struct squeek_wayland wayland; // Just hooks.
-    DBusHandler *dbus_handler;
+    DBusHandler *dbus_handler; // Controls visibility of the OSK.
-    EekboardContextService *settings_context;
+    EekboardContextService *settings_context; // Gsettings hooks.
-    ServerContextService *ui_context;
+    ServerContextService *ui_context; // mess, includes the entire UI
-    struct submission *submission;
+    struct submission *submission; // Wayland text input handling.
    struct squeek_layout_state layout_choice; // Currently wanted layout.
    struct ui_manager *ui_manager; // UI shape tracker/chooser. TODO: merge with layuot choice
 };
@ -199,7 +203,9 @@ main (int argc, char **argv)
        g_warning("Wayland input method interface not available");
    }
-    instance.settings_context = eekboard_context_service_new();
+    instance.ui_manager = squeek_uiman_new();
    instance.settings_context = eekboard_context_service_new(&instance.layout_choice);
    // set up dbus
@ -222,9 +228,9 @@ main (int argc, char **argv)
        error = NULL;
        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
        if (connection == NULL) {
-            g_printerr ("Can't connect to the bus: %s\n", error->message);
+            g_printerr ("Can't connect to the bus: %s. "
                        "Visibility switching unavailable.", error->message);
            g_error_free (error);
            exit (1);
        }
        break;
    case G_BUS_TYPE_NONE:
@ -246,25 +252,28 @@ main (int argc, char **argv)
        g_assert_not_reached ();
        break;
    }
    guint owner_id = 0;
    DBusHandler *service = NULL;
    if (connection) {
        service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
-    DBusHandler *service = dbus_handler_new(connection, DBUS_SERVICE_PATH);
+        if (service == NULL) {
            g_printerr ("Can't create dbus server\n");
            exit (1);
        }
        instance.dbus_handler = service;
-    if (service == NULL) {
+        owner_id = g_bus_own_name_on_connection (connection,
-        g_printerr ("Can't create dbus server\n");
+                                                 DBUS_SERVICE_INTERFACE,
-        exit (1);
+                                                 G_BUS_NAME_OWNER_FLAGS_NONE,
-    }
+                                                 on_name_acquired,
-    instance.dbus_handler = service;
+                                                 on_name_lost,
-
+                                                 NULL,
-    guint owner_id = g_bus_own_name_on_connection (connection,
+                                                 NULL);
-                                             DBUS_SERVICE_INTERFACE,
+        if (owner_id == 0) {
-                                             G_BUS_NAME_OWNER_FLAGS_NONE,
+            g_printerr ("Can't own the name\n");
-                                             on_name_acquired,
+            exit (1);
-                                             on_name_lost,
+        }
                                             NULL,
                                             NULL);
    if (owner_id == 0) {
        g_printerr ("Can't own the name\n");
        exit (1);
    }
    instance.submission = get_submission(instance.wayland.input_method_manager,
@ -276,7 +285,9 @@ main (int argc, char **argv)
    ServerContextService *ui_context = server_context_service_new(
                instance.settings_context,
-                instance.submission);
+                instance.submission,
                &instance.layout_choice,
                instance.ui_manager);
    if (!ui_context) {
        g_error("Could not initialize GUI");
        exit(1);
@ -296,9 +307,15 @@ main (int argc, char **argv)
    g_main_loop_run (loop);
-    g_bus_unown_name (owner_id);
+    if (connection) {
-    g_object_unref (service);
+        if (service) {
-    g_object_unref (connection);
+            if (owner_id != 0) {
                g_bus_unown_name (owner_id);
            }
            g_object_unref (service);
        }
        g_object_unref (connection);
    }
    g_main_loop_unref (loop);
    squeek_wayland_deinit (&instance.wayland);
--- a/src/submission.rs
+++ b/src/submission.rs
@ -17,13 +17,18 @@
 * and those events SHOULD NOT cause any lost events.
 * */
-use ::action::Action;
+use std::collections::HashSet;
 use std::ffi::CString;
 use ::action::Modifier;
 use ::imservice;
 use ::imservice::IMService;
-use ::keyboard::{ KeyCode, KeyState, KeyStateId, PressType };
+use ::keyboard::{ KeyCode, KeyStateId, Modifiers, PressType };
-use ::logging;
+use ::util::vec_remove;
 use ::vkeyboard::VirtualKeyboard;
 // traits
 use std::iter::FromIterator;
 /// Gathers stuff defined in C or called by C
 pub mod c {
    use super::*;
@ -60,6 +65,7 @@ pub mod c {
        Box::<Submission>::into_raw(Box::new(
            Submission {
                imservice,
                modifiers_active: Vec::new(),
                virtual_keyboard: VirtualKeyboard(vk),
                pressed: Vec::new(),
            }
@ -106,50 +112,60 @@ enum SubmittedAction {
 pub struct Submission {
    imservice: Option<Box<IMService>>,
    virtual_keyboard: VirtualKeyboard,
    modifiers_active: Vec<(KeyStateId, Modifier)>,
    pressed: Vec<(KeyStateId, SubmittedAction)>,
 }
 pub enum SubmitData<'a> {
    Text(&'a CString),
    Erase,
    Keycodes,
 }
 impl Submission {
    /// Sends a submit text event if possible;
    /// otherwise sends key press and makes a note of it
    pub fn handle_press(
        &mut self,
-        key: &KeyState, key_id: KeyStateId,
+        key_id: KeyStateId,
        data: SubmitData,
        keycodes: &Vec<KeyCode>,
        time: Timestamp,
    ) {
-        match &key.action {
+        let mods_are_on = !self.modifiers_active.is_empty();
            Action::Submit { text: _, keys: _ }
                | Action::Erase
            => (),
            _ => {
                log_print!(
                    logging::Level::Bug,
                    "Submitted key with action other than Submit or Erase",
                );
                return;
            },
        };
-        let was_committed_as_text = match (&mut self.imservice, &key.action) {
+        let was_committed_as_text = match (&mut self.imservice, mods_are_on) {
-            (Some(imservice), Action::Submit { text: Some(text), keys: _ }) => {
+            (Some(imservice), false) => {
-                let submit_result = imservice.commit_string(text)
+                enum Outcome {
-                    .and_then(|_| imservice.commit());
+                    Submitted(Result<(), imservice::SubmitError>),
-                match submit_result {
+                    NotSubmitted,
-                    Ok(()) => true,
+                };
-                    Err(imservice::SubmitError::NotActive) => false,
+
                let submit_outcome = match data {
                    SubmitData::Text(text) => {
                        Outcome::Submitted(imservice.commit_string(text))
                    },
                    SubmitData::Erase => {
                        /* Delete_surrounding_text takes byte offsets,
                         * so cannot work without get_surrounding_text.
                         * This is a bug in the protocol.
                         */
                        // imservice.delete_surrounding_text(1, 0),
                        Outcome::NotSubmitted
                    },
                    SubmitData::Keycodes => Outcome::NotSubmitted,
                };
                match submit_outcome {
                    Outcome::Submitted(result) => {
                        match result.and_then(|()| imservice.commit()) {
                            Ok(()) => true,
                            Err(imservice::SubmitError::NotActive) => false,
                        }
                    },
                    Outcome::NotSubmitted => false,
                }
            },
            /* Delete_surrounding_text takes byte offsets,
             * so cannot work without get_surrounding_text.
             * This is a bug in the protocol.
            (Some(imservice), Action::Erase) => {
                let submit_result = imservice.delete_surrounding_text(1, 0)
                    .and_then(|_| imservice.commit());
                match submit_result {
                    Ok(()) => true,
                    Err(imservice::SubmitError::NotActive) => false,
                }
            }*/
            (_, _) => false,
        };
@ -157,11 +173,11 @@ impl Submission {
            true => SubmittedAction::IMService,
            false => {
                self.virtual_keyboard.switch(
-                    &key.keycodes,
+                    keycodes,
                    PressType::Pressed,
                    time,
                );
-                SubmittedAction::VirtualKeyboard(key.keycodes.clone())
+                SubmittedAction::VirtualKeyboard(keycodes.clone())
            },
        };
@ -187,4 +203,44 @@ impl Submission {
            }
        };
    }
    pub fn handle_add_modifier(
        &mut self,
        key_id: KeyStateId,
        modifier: Modifier, _time: Timestamp,
    ) {
        self.modifiers_active.push((key_id, modifier));
        self.update_modifiers();
    }
    pub fn handle_drop_modifier(
        &mut self,
        key_id: KeyStateId,
        _time: Timestamp,
    ) {
        vec_remove(&mut self.modifiers_active, |(id, _)| *id == key_id);
        self.update_modifiers();
    }
    fn update_modifiers(&mut self) {
        let raw_modifiers = self.modifiers_active.iter()
            .map(|(_id, m)| match m {
                Modifier::Control => Modifiers::CONTROL,
                Modifier::Alt => Modifiers::MOD1,
            })
            .fold(Modifiers::empty(), |m, n| m | n);
        self.virtual_keyboard.set_modifiers_state(raw_modifiers);
    }
    pub fn is_modifier_active(&self, modifier: Modifier) -> bool {
        self.modifiers_active.iter()
            .position(|(_id, m)| *m == modifier)
            .is_some()
    }
    pub fn get_active_modifiers(&self) -> HashSet<Modifier> {
        HashSet::from_iter(
            self.modifiers_active.iter().map(|(_id, m)| m.clone())
        )
    }
 }
--- a/src/ui_manager.h
+++ b/src/ui_manager.h
@ -0,0 +1,14 @@
 #ifndef UI_MANAGER__
 #define UI_MANAGER__
 #include <inttypes.h>
 #include "outputs.h"
 struct ui_manager;
 struct ui_manager *squeek_uiman_new();
 void squeek_uiman_set_output(struct ui_manager *uiman, struct squeek_output_handle output);
 uint32_t squeek_uiman_get_perceptual_height(struct ui_manager *uiman);
 #endif
--- a/src/ui_manager.rs
+++ b/src/ui_manager.rs
@ -0,0 +1,81 @@
 /* Copyright (C) 2020 Purism SPC
 * SPDX-License-Identifier: GPL-3.0+
 */
 /*! Centrally manages the shape of the UI widgets, and the choice of layout.
 * 
 * Coordinates this based on information collated from all possible sources.
 */
 use std::cmp::min;
 use ::outputs::c::OutputHandle;
 mod c {
    use super::*;
    use ::util::c::Wrapped;
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_new() -> Wrapped<Manager> {
        Wrapped::new(Manager { output: None })
    }
    /// Used to size the layer surface containing all the OSK widgets.
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_get_perceptual_height(
        uiman: Wrapped<Manager>,
    ) -> u32 {
        let uiman = uiman.clone_ref();
        let uiman = uiman.borrow();
        // TODO: what to do when there's no output?
        uiman.get_perceptual_height().unwrap_or(0)
    }
    #[no_mangle]
    pub extern "C"
    fn squeek_uiman_set_output(
        uiman: Wrapped<Manager>,
        output: OutputHandle,
    ) {
        let uiman = uiman.clone_ref();
        let mut uiman = uiman.borrow_mut();
        uiman.output = Some(output);
    }
 }
 /// Stores current state of all things influencing what the UI should look like.
 pub struct Manager {
    /// Shared output handle, current state updated whenever it's needed.
    // TODO: Stop assuming that the output never changes.
    // (There's no way for the output manager to update the ui manager.)
    // FIXME: Turn into an OutputState and apply relevant connections elsewhere.
    // Otherwise testability and predictablity is low.
    output: Option<OutputHandle>,
    //// Pixel size of the surface. Needs explicit updating.
    //surface_size: Option<Size>,
 }
 impl Manager {
    fn get_perceptual_height(&self) -> Option<u32> {
        let output_info = (&self.output).as_ref()
            .and_then(|o| o.get_state())
            .map(|os| (os.scale as u32, os.get_pixel_size()));
        match output_info {
            Some((scale, Some(px_size))) => Some({
                let height = if (px_size.width < 720) & (px_size.width > 0) {
                    px_size.width * 7 / 12 // to match 360×210
                } else if px_size.width < 1080 {
                    360 + (1080 - px_size.width) * 60 / 360 // smooth transition
                } else {
                    360
                };
                // Don't exceed half the display size
                min(height, px_size.height / 2) / scale
            }),
            Some((scale, None)) => Some(360 / scale),
            None => None,
        }
    }
 }
--- a/src/util.rs
+++ b/src/util.rs
@ -98,7 +98,8 @@ pub mod c {
            Rc::from_raw(self.0)
        }
-        /// Creates a new Rc reference to the same data
+        /// Creates a new Rc reference to the same data.
        /// Use for accessing the underlying data as a reference.
        pub fn clone_ref(&self) -> Rc<RefCell<T>> {
            // A bit dangerous: the Rc may be in use elsewhere
            let used_rc = unsafe { Rc::from_raw(self.0) };
@ -130,6 +131,7 @@ pub mod c {
    impl<T> COpaquePtr for Wrapped<T> {}
 }
 /// Clones the underlying data structure, like ToOwned.
 pub trait CloneOwned {
    type Owned;
    fn clone_owned(&self) -> Self::Owned;
@ -195,6 +197,12 @@ pub trait WarningHandler {
    fn handle(&mut self, warning: &str);
 }
 /// Removes the first matcing item
 pub fn vec_remove<T, F: FnMut(&T) -> bool>(v: &mut Vec<T>, pred: F) -> Option<T> {
    let idx = v.iter().position(pred);
    idx.map(|idx| v.remove(idx))
 }
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/src/vkeyboard.rs
+++ b/src/vkeyboard.rs
@ -1,6 +1,6 @@
 /*! Managing the events belonging to virtual-keyboard interface. */
-use ::keyboard::{ KeyCode, PressType };
+use ::keyboard::{ KeyCode, Modifiers, PressType };
 use ::layout::c::LevelKeyboard;
 use ::submission::Timestamp;
@ -26,6 +26,11 @@ pub mod c {
            virtual_keyboard: ZwpVirtualKeyboardV1,
            keyboard: LevelKeyboard,
        );
        pub fn eek_virtual_keyboard_set_modifiers(
            virtual_keyboard: ZwpVirtualKeyboardV1,
            modifiers: u32,
        );
    }
 }
@ -33,7 +38,7 @@ pub mod c {
 pub struct VirtualKeyboard(pub c::ZwpVirtualKeyboardV1);
 impl VirtualKeyboard {
-    // TODO: split out keyboard state management
+    // TODO: error out if keymap not set
    pub fn switch(
        &self,
        keycodes: &Vec<KeyCode>,
@ -68,12 +73,16 @@ impl VirtualKeyboard {
        }
    }
    pub fn set_modifiers_state(&self, modifiers: Modifiers) {
        let modifiers = modifiers.bits() as u32;
        unsafe {
            c::eek_virtual_keyboard_set_modifiers(self.0, modifiers);
        }
    }
    pub fn update_keymap(&self, keyboard: LevelKeyboard) {
        unsafe {
-            c::eek_virtual_keyboard_update_keymap(
+            c::eek_virtual_keyboard_update_keymap(self.0, keyboard);
                self.0,
                keyboard,
            );
        }
    }
 }
--- a/src/wayland.c
+++ b/src/wayland.c
@ -20,6 +20,12 @@ void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virt
        keyboard->keymap_fd, keyboard->keymap_len);
 }
 void
 eek_virtual_keyboard_set_modifiers(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, uint32_t mods_depressed) {
    zwp_virtual_keyboard_v1_modifiers(zwp_virtual_keyboard_v1,
                                      mods_depressed, 0, 0, 0);
 }
 int squeek_output_add_listener(struct wl_output *wl_output,
                                const struct wl_output_listener *listener, void *data) {
    return wl_output_add_listener(wl_output, listener, data);
--- a/tests/meson.build
+++ b/tests/meson.build
@ -49,15 +49,19 @@ endforeach
 # and the need to call it manually
 foreach layout : [
    'us', 'us_wide',
    'br',
    'de', 'de_wide',
    'dk',
    'es',
    'fi',
    'fr',
    'gr',
    'it',
    'jp+kana','jp+kana_wide',
    'no',
    'number',
    'pl', 'pl_wide',
    'ru',
    'se',
    'terminal',
@ -66,7 +70,9 @@ foreach layout : [
    test(
        'test_layout_' + layout,
        cargo_script,
-        args: ['run', '--example', 'test_layout', layout]
+        args: ['run'] + cargo_build_flags
            + [ '--example', 'test_layout', '--', layout],
        workdir: meson.build_root(),
    )
 endforeach
--- a/tools/meson.build
+++ b/tools/meson.build
@ -12,8 +12,9 @@ test_layout = custom_target('squeekboard-test-layout',
    build_always_stale: true,
    output: ['squeekboard-test-layout'],
    console: true,
-    command: [cargo_build] + cargo_build_flags
+    command: [cargo_build, '--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout']
-        + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
+        + cargo_build_flags,
    install: true,
    install_dir: bindir,
    depends: cargo_toml,
 )
Author	SHA1	Message	Date
Sebastian Krzyszkowiak	1ee58ce7a0	Document changes and release 1.9.3	2020-08-05 16:17:44 +02:00
Dorota Czaplejewicz	88821e2e82	Merge branch 'terminal' into 'master' Terminal layout: another approach See merge request Librem5/squeekboard!368	2020-07-20 09:48:36 +00:00
Dorota Czaplejewicz	81344bb9c2	Merge branch 'patch-1' into 'master' Brazilian Portuguese Keyboard Layout. See merge request Librem5/squeekboard!365	2020-07-20 09:47:19 +00:00
Luís Fernando Stürmer da Rosa	c87b61d065	Brazilian Portuguese Keyboard Layout.	2020-07-20 09:47:19 +00:00
Sebastian Krzyszkowiak	97da44f059	Terminal layout: another approach	2020-07-18 05:43:15 +02:00
Sebastian Krzyszkowiak	f5a5282219	Revert "Merge branch 'btantau-master-patch-76686' into 'master'" This reverts commit `0c8feb7687`, reversing changes made to `762e12431d`.	2020-07-18 03:26:03 +02:00
Dorota Czaplejewicz	123faecb7d	Merge branch 'italian' into 'master' italian: Fix space and period See merge request Librem5/squeekboard!364	2020-07-16 15:57:38 +00:00
Dorota Czaplejewicz	7ec3053aa4	Merge branch 'fixsize' into 'master' size: Hardcode size to work around screen rotation See merge request Librem5/squeekboard!361	2020-07-16 15:56:57 +00:00
Sebastian Krzyszkowiak	0c8feb7687	Merge branch 'btantau-master-patch-76686' into 'master' New terminal layout, showing more useful keys at the same time See merge request Librem5/squeekboard!345	2020-07-15 15:06:36 +00:00
Björn Tantau	f3f1d58fe1	Add Menu key.	2020-07-15 14:42:55 +00:00
Björn Tantau	c0c666f1b3	Make f-keys slightly wider.	2020-07-15 14:41:17 +00:00
Björn Tantau	ea22afba79	Add missing Ê key.	2020-07-15 14:41:01 +00:00
Dorota Czaplejewicz	d7c7528d3d	italian: Fix space and period	2020-07-10 15:04:43 +00:00
Dorota Czaplejewicz	93ff086e3a	ci: Re-add x64 Buster build	2020-06-28 17:38:10 +00:00
Dorota Czaplejewicz	4f72779681	size: Hardcode size to work around screen rotation Phoc sends output information after changing keyboard surface size. Squeekboard adjusts size on surface events, but not on output in this revision, making it unaware of display size at the time of adjustment, resulting in bad adjustment. This change hardcodes the proportions again to make it work at least on the Librem5.	2020-06-28 17:14:49 +00:00
Dorota Czaplejewicz	762e12431d	Merge branch 'fix_gio_unix' into 'master' build: Add missing gio-unix dependency See merge request Librem5/squeekboard!356	2020-06-26 07:13:23 +00:00
Guido Gunther	767bb1745c	Merge branch 'fix' into 'master' debian: Require lsb-release See merge request Librem5/squeekboard!359	2020-06-26 06:50:44 +00:00
Dorota Czaplejewicz	26e0473fc1	debian: Require lsb-release	2020-06-25 17:45:08 +00:00
Guido Gunther	0735d1c6c6	Merge branch 'bullseye' into 'master' build: Debian Bullseye-compatible deps See merge request Librem5/squeekboard!357	2020-06-25 17:03:28 +00:00
Dorota Czaplejewicz	67d8926913	ci: Add amber job	2020-06-25 16:17:16 +00:00
Dorota Czaplejewicz	0299527700	debian: Add amber to legacy distro list	2020-06-25 11:29:47 +00:00
Dorota Czaplejewicz	ecfc45c2de	build: Make compatible with Debian Bullseye This commit is a bit bigger than it could have: Meson changes could have gone in separately from CI and Debian. This commit looks more complicated than it should reasonably be. Alas, Cargo is a piece of work, and it doesn't let honest people just choose different versions of dependencies, leading to a cascade of misery. Several things were tried to curb the disaster: - Cargo [feature] supports choosing dependencies, but doesn't support specifying dependency versions - Cargo has a cfg() syntax in sections for choosing dependencies by build options, but it explicitly doesn't support selecting on features… - Cargo allows choosing different dependencies based on features, so perhaps dependencies with different versions could live in stub crates pulled in as needed? Nope! If a dependency doesn't exist in the repo (and that's the point here), Cargo throws up its hands. This means Cargo.toml needs to be generated based on the build type. More misery: - we lose the simplicity of just doing `cargo.sh` for simple housekeeping like deps updates. HACKING.md was updated to reflect that. Perhaps that's inevitable - build options need to be like this. - Some flaky adjustments needed in `cargo.sh` because of an additional argument that can be mistaken for an argument to the exec in `cargo run`. - Specifying a custom `Cargo.toml` means Cargo can no longer find any tests, examples, benchmarks, or binaries, because it searches relative to the directory of `Cargo.toml`, which is now the build dir. Extra care needed to not forget about them now. As soon as Cargo allows anything better for managing deps versions, the above should be undone in its favor. Good side is that a couple bugs went away: - build flags not always making it to Cargo - arm64 builds were optional while they shouldn't - test layouts in unit tests are loaded from an explicit directory now The Bullseye versions of dependencies are canonical now, Buster considered legacy.	2020-06-24 15:51:21 +00:00
Dorota Czaplejewicz	3ba6aca99d	build: Add missing gio-unix dependency	2020-06-13 08:27:33 +00:00
Guido Gunther	40b3172de8	Merge branch '1.9.2' into 'master' Release 1.9.2 See merge request Librem5/squeekboard!354	2020-06-07 15:23:02 +00:00
Dorota Czaplejewicz	1a2df96c02	Release v1.9.2 "Aristotelian physics" - Swedish - Russian - Danish - French - minor fixes	2020-06-07 14:38:23 +00:00
Dorota Czaplejewicz	d2989e8ecd	Merge branch 'lfb' into 'master' Provide haptic feedback via libfeedback Closes #166 See merge request Librem5/squeekboard!350	2020-06-04 13:31:24 +00:00
Guido Günther	ec58442724	eek-gtk-keyboard: Trigger event feedback on button press Use libfeedback to trigger feedback for the button press event. Closes: #166	2020-06-04 12:13:58 +02:00
Guido Günther	e89c9b02a0	debian: Build-depend on libfeedback Will be needed in the following commits.	2020-06-02 10:10:43 +02:00
Guido Günther	1b2725250b	eek: Drop libcanberra usage	2020-06-02 10:10:43 +02:00
Guido Günther	e285ecce93	d/rules: Only remove Cargo.lock if it exists This allows to invoke the build target twice in a row	2020-06-02 10:10:43 +02:00
Dorota Czaplejewicz	75ecf9059a	Update rust deps for release	2020-06-01 09:36:36 +00:00
Dorota Czaplejewicz	5715458d33	Merge branch 'master' into 'master' Add danish keylayout See merge request Librem5/squeekboard!353	2020-05-27 07:14:35 +00:00
Dorota Czaplejewicz	8196117269	Merge branch 'desktopfile-absolute' into 'master' sm.puri.Squeekboard.desktop: make path to Exec= absolute See merge request Librem5/squeekboard!352	2020-05-26 18:20:49 +00:00
Ole Guldberg	7fed1339ed	add test for danish layout	2020-05-26 16:37:14 +02:00
Ole Guldberg	0339d13ce4	Danish keyboard layout	2020-05-26 16:22:38 +02:00
Ole Guldberg	9f1e49da5d	Danish keyboard layout	2020-05-26 16:21:17 +02:00
Florian Klink	c1737c763f	sm.puri.Squeekboard.desktop: make path to Exec= absolute This uses the same logic from Phosh to render absolute paths in .desktop files.	2020-05-26 12:02:55 +02:00
Dorota Czaplejewicz	fe22fc2271	Merge branch 'remove-dep-libcroco' into 'master' Removed unused dependency 'libcroco' See merge request Librem5/squeekboard!351	2020-05-24 18:19:15 +00:00
Jordi Masip	f473a47eb8	Removed unused dependency 'libcroco'	2020-05-24 16:31:43 +02:00
Dorota Czaplejewicz	76bd87686a	Merge branch 'ru-layout' into 'master' Fresh Russian layout See merge request Librem5/squeekboard!347	2020-05-20 17:59:22 +00:00
Vlad	ef85823528	Fresh Russian layout	2020-05-20 17:59:22 +00:00
Dorota Czaplejewicz	54ac7511cd	Merge branch 'scaling' into 'master' Stop scaling See merge request Librem5/squeekboard!339	2020-05-13 11:01:21 +00:00
Dorota Czaplejewicz	080bbb4d4e	Merge branch 'fix_doc_reference' into 'master' Folder is doc, not docs See merge request Librem5/squeekboard!349	2020-05-08 16:44:44 +00:00
Andreas Rönnquist	7c35307011	Folder is doc, not docs	2020-05-07 16:06:44 +02:00
Dorota Czaplejewicz	cd3255b301	Merge branch 'swedish_wide_button' into 'master' Swedish keyboard, use wide button switching between numbers, symbols and base See merge request Librem5/squeekboard!344	2020-05-06 11:22:13 +00:00
Guido Gunther	f8b6b98633	Merge branch '1.9.1' into 'master' Release 1.9.1 See merge request Librem5/squeekboard!348	2020-04-29 13:04:04 +00:00
Dorota Czaplejewicz	6414b57e57	Merge branch 'french-layout' into 'master' French layout See merge request Librem5/squeekboard!346	2020-04-28 12:31:44 +00:00
Björn Tantau	46de67a4db	Add Ctrl and Alt modifier keys.	2020-04-28 08:29:41 +00:00
Arnaud Ferraris	2a20bbbf2a	tests: add french layout	2020-04-27 09:51:40 +02:00
Arnaud Ferraris	13ebf9449f	keyboards: fr: improve diacritics layout This commit changes the layout of the `eschars` view, in an attempt at making it more logical and optimized to reach more frequent symbols more easily.	2020-04-23 14:49:34 +02:00
Arnaud Ferraris	fa8449eb1e	keyboards: fr: improve consistency with other layouts In order to stay consistent with other layouts, the bottom line has been re-arranged and keys dimensions have been optimized (based on the `terminal` layout, which has similar features). Furthermore, the ç/Ç keys in the 'normal' views have been replaced with ./, so that all diacritics are on the same view. This commit also fixes the Backspace key behavior.	2020-04-23 14:48:58 +02:00
Arnaud Ferraris	0bdb5f1f33	resources: include French keyboard layout	2020-04-23 13:07:33 +02:00
Arnaud Ferraris	b631817896	keyboards: fr: make sure the layout fits the screen Due to an excessive amount of keys in the `eschars` view, one of the rows would overflow the screen. This commit removes the `Ç` key, which is already present in the `upper` view.	2020-04-21 19:39:17 +02:00
Arnaud Ferraris	09c78da7a7	keyboards: fr: fix keyboard layout A number of keys would not give the expected result, due to the lack of a `text` of `action` property. Additionally, the layout wouldn't load because of an old file format (it seems `bounds` are not supported anymore). This patch makes sure this layout can be loaded and used by squeekboard v0.1.9.	2020-04-21 19:39:07 +02:00
uzanto	7de7dc1b33	Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing	2020-04-21 19:17:27 +02:00
uzanto	323d89e4cb	Add new file	2020-04-21 19:17:27 +02:00
Björn Tantau	a5ce25055f	Show more useful keys at the same time.	2020-04-10 16:43:36 +00:00
Andreas Rönnquist	184bdaa0b6	More fixes of button sizes	2020-03-26 18:02:32 +01:00
Andreas Rönnquist	0459d33c4c	Swedish keyboard, wide button switching between numbers, symbols and base	2020-03-26 15:12:01 +01:00
Dorota Czaplejewicz	3d1a641ca3	Merge remote-tracking branch 'upstream/master' into scaling	2020-03-12 10:51:30 +00:00
Dorota Czaplejewicz	0466a520f2	Merge branch 'predictoin_ui' into 'master' Cleanups to make EekGtkKeyboard more standalone See merge request Librem5/squeekboard!336	2020-03-12 10:46:14 +00:00
Dorota Czaplejewicz	9e8aca1cbf	Merge branch 'unavailable' into 'master' Crash less when outside resources are unavailable See merge request Librem5/squeekboard!341	2020-03-11 10:55:05 +00:00
Dorota Czaplejewicz	334898c5a5	Release version 1.9.1 "Expected value" - Preview support for "Control" and "Alt" modifiers in buttons, use field "modifiers: Control" inside a button - Don't crash when gsettings has an empty list of settings - Documentation rearrangement	2020-03-08 10:06:53 +00:00
Dorota Czaplejewicz	67a5f1bb0b	cargo: Bump package versions before release	2020-03-08 10:02:54 +00:00
Dorota Czaplejewicz	eb84e52897	Merge branch 'release_check' into 'master' CI: Fix typo See merge request Librem5/squeekboard!343	2020-03-07 11:38:34 +00:00
Dorota Czaplejewicz	0f7ff1636d	CI: Fix typo	2020-03-07 11:17:25 +00:00
Dorota Czaplejewicz	8ff8e8ac48	Merge remote-tracking branch 'upstream/master' into scaling	2020-03-07 10:46:09 +00:00
Dorota Czaplejewicz	d4bb9038c5	Merge branch 'release_check' into 'master' CI: Test that any bump to changelog has a corresponding tag See merge request Librem5/squeekboard!337	2020-03-07 10:33:53 +00:00
Dorota Czaplejewicz	f3caeb8fc6	Merge branch 'docs' into 'master' Docs: describe project priorities See merge request Librem5/squeekboard!338	2020-03-07 10:33:03 +00:00
Dorota Czaplejewicz	abaaf04b87	Merge branch 'modifiers' into 'master' Add simple modifiers support See merge request Librem5/squeekboard!306	2020-03-07 10:32:33 +00:00
Dorota Czaplejewicz	2770e1769c	sizing: Ignore scaling factor for layout selection	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	3cd170acc3	sizing: Create a standalone UI shape manager The manager is used for sizing the layer surface. It promises never to exceed half the output height. The selection of the current layout is not being done here, leading to worse behaviour in 1:1 scaling. In the future, it could be used for sizing the keyboard itself and the suggestion box, as well as decide which layout to use, because layouts should have some sizing hints.	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	24f709ab13	Remove unused code	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	784f9127fa	layout: Minor generalizations	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	22daefba3a	levelkeyboard: Rearrange to make future conversion easier	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	4ff9cf087b	renderer: Simplify by dropping gobjectness	2020-03-07 10:31:39 +00:00
Dorota Czaplejewicz	61e1ab5c5a	layout: Split out choice to a struct on its own	2020-03-07 10:26:52 +00:00
Dorota Czaplejewicz	7fbc9ed56e	Merge branch 'master' into 'master' Fix minor comment typos See merge request Librem5/squeekboard!342	2020-03-04 07:18:02 +00:00
&t	67cc4f11cf	Fix minor comment typos	2020-03-04 04:53:53 +00:00
Dorota Czaplejewicz	8ac2b5a713	gsettings: Don't crash on switching when unavailable	2020-03-03 19:46:53 +00:00
Dorota Czaplejewicz	8bae8fe5bb	dbus: Don't crash if can't make a connection	2020-03-03 19:25:49 +00:00
Dorota Czaplejewicz	b3cfc8a0f3	gsettings: Don't crash when unavailable	2020-03-03 19:10:50 +00:00
Dorota Czaplejewicz	5a591127a1	Merge branch 'doap' into 'master' meta: Add doap file See merge request Librem5/squeekboard!335	2020-03-01 14:21:45 +00:00
Dorota Czaplejewicz	8f3d010349	hacking: Move into docs/	2020-02-28 14:10:44 +00:00
Dorota Czaplejewicz	7eb5c6d466	docs: Add the guiding principle	2020-02-28 13:26:09 +00:00
Dorota Czaplejewicz	9f6fe8318c	CI: Test that any bump to changelog has a corresponding tag Prevents forgetting to sign the tag, which is currently done out of band and independently of review.	2020-02-28 12:14:18 +00:00
Dorota Czaplejewicz	92e9d994fe	modifiers: Support Control and Alt Control and Alt are special in that they aren't expected to switch levels, and so don't need to change what characters are output. Use in layouts by adding `modifier: Control` or `modifier: Alt` in place of `text: "foo"`. The latching of the modifier will force the keyboard to emit raw key presses and prevent it from outputting text.	2020-02-28 11:21:07 +00:00
Dorota Czaplejewicz	c28f07fcfd	Merge branch 'fix_variant' into 'master' settings: Handle empty settings See merge request Librem5/squeekboard!333	2020-02-28 11:09:11 +00:00
Dorota Czaplejewicz	80919dbc42	Merge branch 'fix_ref' into 'master' Variant: Use proper pointer conversion between C and Rust See merge request Librem5/squeekboard!334	2020-02-28 11:08:46 +00:00
Dorota Czaplejewicz	cc369f6f81	Merge branch 'press' into 'master' layout: Improve press handling See merge request Librem5/squeekboard!330	2020-02-26 18:43:21 +00:00
Guido Gunther	99f2f286e3	Merge branch '1.9.0' into 'master' Release 1.9.0 See merge request Librem5/squeekboard!328	2020-02-24 12:55:52 +00:00
Dorota Czaplejewicz	46cbaf8e87	keyboard: Remove unused code	2020-02-23 12:15:19 +00:00
Dorota Czaplejewicz	53b4466899	meta: Add doap file	2020-02-23 10:42:07 +00:00
Dorota Czaplejewicz	c0aee5de26	Variant: Use proper pointer conversion between C and Rust	2020-02-20 12:17:50 +00:00
Dorota Czaplejewicz	404f94638f	settings: Handle empty settings	2020-02-20 12:06:47 +00:00
Dorota Czaplejewicz	cb802cfb50	layout: Improve press handling Makes it more similar to release handling, removes some redundant checks. This makes it easier to integrate modifiers in the future.	2020-02-19 15:40:39 +00:00