Added update to cursor when string is committed

Cleanups leading to Xwayland compatibility

See merge request Librem5/squeekboard!389

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: debian:buster
+image: debian:bullseye
 
 stages:
   - build
@@ -11,29 +11,110 @@ 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
-  - apt-get -y build-dep .
+
+build_docs:
+  <<: *tags
+  stage: build
+  artifacts:
+    paths:
+      - _build
+  script:
+      - apt-get -y install python3-pip python3-sphinx
+      - pip3 install recommonmark
+      - ./doc/build.sh _build
 
 build_meson:
-  <<: *tags
+  tags:
+    - librem5
   stage: build
   artifacts:
     paths:
       - _build
     expire_in: 3h
   script:
-    - meson . _build/ -Ddepdatadir=/usr/share
+    - apt-get -y build-dep .
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
     - ninja -C _build install
 
 build_deb:
-    <<: *tags
+    tags:
+        - librem5
     stage: build
     artifacts:
       paths:
         - "*.deb"
     script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:amber:
+    image: pureos/amber
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:buster:
+    image: "debian:buster"
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+
+build_deb:arm64:
+    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
         - debuild -i -us -uc -b
         - cp ../*.deb .
@@ -48,9 +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

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"]

Cargo.deps.legacy

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

Cargo.lock

@@ -1,23 +1,255 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "atk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cairo-rs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dtoa"
-version = "0.4.4"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fragile"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "gdk"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.62"
+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]]
@@ -30,13 +262,43 @@ name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (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.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.4"
+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)",
@@ -44,62 +306,98 @@ 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.4 (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.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+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.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.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.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.101"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.101 (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.101"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.9"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.5"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -129,34 +427,60 @@ name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (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 bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
+"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
+"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
+"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
+"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
+"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
+"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
+"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
+"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
+"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
+"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
+"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
+"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
+"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
+"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
+"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
+"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
+"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-"checksum yaml-rust 0.4.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"

Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "rs"
-version = "0.1.0"
-
-[dependencies]
-bitflags = "1.0.*"
-maplit = "1.0.*"
-serde = { version = "1.0.*", features = ["derive"] }
-serde_yaml = "0.8.*"
-xkbcommon = { version = "0.4.*", features = ["wayland"] }
-
-[lib]
-name = "rs"
-path = "src/lib.rs"
-crate-type = ["staticlib", "rlib"]

Cargo.toml.in

@@ -0,0 +1,40 @@
+[package]
+name = "rs"
+version = "0.1.0"
+
+[lib]
+name = "rs"
+path = "@path@/src/lib.rs"
+crate-type = ["staticlib", "rlib"]
+
+# Cargo can't do autodiscovery if Cargo.toml is not in the root.
+[[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.glib-sys]
+version = ""
+features = ["v2_44"]
+
+[dependencies.gtk-sys]
+version = ""
+features = ["v3_22"]
+
+[dependencies]
+maplit = "1.0.*"
+serde = { version = "1.0.*", features = ["derive"] }
+serde_yaml = "0.8.*"
+xkbcommon = { version = "0.4.*", features = ["wayland"] }
+# Here is inserted the Cargo.deps file

HACKING.md

@@ -1,58 +0,0 @@
-Hacking
-=======
-
-This document describes the standards for modifying and maintaining the *squeekboard* project.
-
-Testing
--------
-
-Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
-
-- the application draws correctly
-- it shows when relevant
-- it changes layouts
-- it changes levels
-
-Testing with an application:
-
-```
-python3 tests/entry.py
-```
-
-Testing visibility:
-
-```
-$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
-$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
-```
-
-Testing layouts:
-
-```
-$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'ua')]"
-$ gsettings set org.gnome.desktop.input-sources current 1
-```
-
-Maintenance
------------
-
-Squeekboard uses Rust & Cargo for some of its dependencies.
-
-Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
-
-```
-cd build_dir
-sh /source_path/cargo.sh '' test
-```
-
-### Cargo dependencies
-
-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:
-
-```
-cd build_dir
-sh /source_path/cargo.sh '' update
-ninja test
-```

README.md

@@ -30,30 +30,43 @@ Building
 
 ### Dependencies
 
-See `.gitlab-ci.yml`.
+See `.gitlab-ci.yml` or run `apt-get build-dep .`
 
 ### Build from git repo
 
-```
+```bash
 $ git clone https://source.puri.sm/Librem5/squeekboard.git
 $ cd squeekboard
-$ mkdir ../build
-$ meson ../build/
-$ cd ../build
-$ ninja test
-$ ninja install
+$ mkdir _build
+$ meson _build/
+$ cd _build
+$ ninja
 ```
 
+To run tests use `ninja test`. To install squeekboard run `ninja install`.
+
 Running
 -------
 
-```
+```bash
 $ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```
 
+Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
+
+```bash
+$ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
+```
+
+To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with:
+
+```bash
+busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+```
+
 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.

cargo.sh

@@ -11,14 +11,12 @@ SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
 
 CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
-if [ -n "${1}" ]; then
-    OUT_PATH="$(realpath "$1")"
-fi
 
 cd "$SOURCE_DIR"
-shift
-cargo "$@"
 
-if [ -n "${OUT_PATH}" ]; then
-    cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}"
-fi
+# 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 "$@"
+

cargo_build.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# This script manages Cargo builds
+# while keeping the artifact directory within the build tree
+# instead of the source tree
+
+set -e
+
+SCRIPT_PATH="$(realpath "$0")"
+SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
+
+RELEASE=""
+BINARY_DIR="debug"
+if [ "${1}" = "--release" ]; then
+    shift
+    BINARY_DIR="release"
+    RELEASE="--release"
+fi
+
+if [ "${1}" = "--rename" ]; then
+    shift
+    FILENAME="${1}"
+    shift
+fi
+OUT_PATH="$(realpath "${1}")"
+shift
+OUT_BASENAME="$(basename "${OUT_PATH}")"
+FILENAME="${FILENAME:-"${OUT_BASENAME}"}"
+
+sh "$SOURCE_DIR"/cargo.sh build $RELEASE "$@"
+
+if [ -n "${OUT_PATH}" ]; then
+    cp -a ./"${BINARY_DIR}"/"${FILENAME}" "${OUT_PATH}"
+fi

data/keyboards/be.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"

data/keyboards/be_wide.yaml

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

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: ":"

data/keyboards/de.yaml

@@ -1,46 +1,38 @@
-# German layout by Mark Müller
-# Version 2019101900
+# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 35.33, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
         - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_dechars preferences         space        , period Return"
+        - "show_numbers show_eschars preferences         space        , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_dechars preferences         space        ! ? 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_dechars preferences         space        , period Return"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_dechars preferences         space        , period Return"
-    dechars:
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters show_dechars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
     Shift_L:
@@ -53,6 +45,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -72,24 +65,18 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    show_dechars:
+    show_eschars:
         action:
             locking:
-                lock_view: "dechars"
+                lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
         label: "äÄ"
-
-    period:
-        outline: "default"
-        label: "."
     space:
         outline: "spaceline"
         label: " "
+        text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
-    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        keysym: "Return"

data/keyboards/de_wide.yaml

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

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: "°"

data/keyboards/emoji.yaml

@@ -0,0 +1,80 @@
+---
+outlines:
+    default: { width: 52, height: 52 }
+    altline: { width: 40, height: 52 }
+    narrow: { width: 22, height: 52 }
+
+views:
+    base:
+        - "😀 😁 😅 😂 😊 😇 🙃"
+        - "😍 😘 😋 😜 😎 🥳 😔"
+        - "😢 😭 😡 😱 🤔 😬 🙄"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    two:
+        - "🤩 🤨 🤓 😴 🤢 🤮 😈"
+        - "💩 🙌 👏 👍 👎 👌 👋"
+        - "💪 🖕 🙏 💋 🤦‍♀️ 🤷‍♀️ 💃"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    three:
+        - "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
+        - "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
+        - "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    four:
+        - "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
+        - "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
+        - "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    five:
+        - "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
+        - "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
+        - "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    six:
+        - "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
+        - "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
+        - "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+
+buttons:
+    1:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "1"
+    2:
+        action:
+            set_view: "two"
+        outline: "altline"
+        label: "2"
+    3:
+        action:
+            set_view: "three"
+        outline: "altline"
+        label: "3"
+    4:
+        action:
+            set_view: "four"
+        outline: "altline"
+        label: "4"
+    5:
+        action:
+            set_view: "five"
+        outline: "altline"
+        label: "5"
+    6:
+        action:
+            set_view: "six"
+        outline: "altline"
+        label: "6"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: BackSpace
+    blank:
+        outline: "narrow"
+        text: ""

data/keyboards/es.yaml

@@ -1,17 +1,10 @@
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
 
 views:
     base:
@@ -51,6 +44,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "default"
@@ -80,14 +74,14 @@ buttons:
 
     period:
         outline: "default"
-        label: "."
+        text: "."
     space:
         outline: "spaceline"
-        label: " "
+        text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
+        keysym: "Return"
     colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        text: ":"
+

data/keyboards/fi.yaml

@@ -1,39 +1,32 @@
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+    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 aring"
-        - "a s d f g h j k l oslash ae"
+        - "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"
+        - "show_numbers preferences         space        .    Return"
     upper:
-        - "Q W E R T Y U I O P Aring"
-        - "A S D F G H J K L Oslash AE"
+        - "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"
+        - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
         - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
-        - "show_letters preferences         space        period    Return"
+        - "show_letters preferences         space        .    Return"
     symbols:
         - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
         - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
         - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences         space        period    Return"
+        - "show_letters preferences         space        .    Return"
 
 buttons:
     Shift_L:
@@ -46,6 +39,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "altline"
@@ -65,113 +59,113 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    ".":
         outline: altline
-        label: "."
     space:
         outline: spaceline
-        label: " "
+        text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
+        keysym: "Return"
     aring:
-        label: "å"
+        text: "å"
     Aring:
-        label: "Å"
-    oslash:
-        label: "ø"
-    Oslash:
-        label: "Ø"
-    ae:
-        label: "æ"
-    AE:
-        label: "Æ"
+        text: "Å"
+    ouml:
+        text: "ö"
+    Ouml:
+        text: "Ö"
+    auml:
+        text: "ä"
+    Auml:
+        text: "Ä"
     asterisk:
-        label: "*"
+        text: "*"
     asciitilde:
-        label: "~"
+        text: "~"
     quoteleft:
-        label: "`"
+        text: "`"
     bar:
-        label: "|"
+        text: "|"
     U00B7:
-        label: "·"
+        text: "·"
     squareroot:
-        label: "√"
+        text: "√"
     Greek_pi:
-        label: "π"
+        text: "π"
     division:
-        label: "÷"
+        text: "÷"
     multiply:
-        label: "×"
+        text: "×"
     paragraph:
-        label: "¶"
+        text: "¶"
     Greek_tau:
-        label: "τ"
+        text: "τ"
     copyright:
-        label: "©"
+        text: "©"
     numbersign:
-        label: "#"
+        text: "#"
     U00AE:
-        label: "®"
+        text: "®"
     at:
-        label: "@"
+        text: "@"
     dollar:
-        label: "$"
+        text: "$"
     U00A3:
-        label: "£"
+        text: "£"
     percent:
-        label: "%"
+        text: "%"
     EuroSign:
-        label: "€"
+        text: "€"
     ampersand:
-        label: "&"
+        text: "&"
     U00A5:
-        label: "¥"
+        text: "¥"
     minus:
-        label: "-"
+        text: "-"
     asciicircum:
-        label: "^"
+        text: "^"
     underscore:
-        label: "_"
+        text: "_"
     degree:
-        label: "°"
+        text: "°"
     plus:
-        label: "+"
+        text: "+"
     equal:
-        label: "="
+        text: "="
     parenleft:
-        label: "("
+        text: "("
     parenright:
-        label: ")"
+        text: ")"
     braceleft:
-        label: "{"
+        text: "{"
     braceright:
-        label: "}"
+        text: "}"
     comma:
-        label: ","
+        text: ","
     backslash:
-        label: "\\"
+        text: "\\"
     slash:
-        label: "/"
+        text: "/"
     quotedbl:
-        label: "\""
+        text: "\""
     quoteright:
-        label: "'"
+        text: "'"
     less:
-        label: "<"
+        text: "<"
     greater:
-        label: ">"
+        text: ">"
     colon:
-        label: ":"
+        text: ":"
     semicolon:
-        label: ";"
+        text: ";"
     exclam:
-        label: "!"
+        text: "!"
     question:
-        label: "?"
+        text: "?"
     bracketleft:
-        label: "["
+        text: "["
     bracketright:
-        label: "]"
+        text: "]"
 

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"

data/keyboards/fr_wide.yaml

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

data/keyboards/gr.yaml

@@ -2,19 +2,12 @@
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+    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:
@@ -53,6 +46,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "altline"
@@ -86,111 +80,112 @@ buttons:
         label: "αι"
     period:
         outline: "altline"
-        label: "."
+        text: "."
     space:
         outline: spaceline
-        label: " "
+        text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
+        keysym: "Return"
     aring:
-        label: "å"
+        text: "å"
     Aring:
-        label: "Å"
+        text: "Å"
     oslash:
-        label: "ø"
+        text: "ø"
     Oslash:
-        label: "Ø"
+        text: "Ø"
     ae:
-        label: "æ"
+        text: "æ"
     AE:
-        label: "Æ"
+        text: "Æ"
     asterisk:
-        label: "*"
+        text: "*"
     asciitilde:
-        label: "~"
+        text: "~"
     quoteleft:
-        label: "`"
+        text: "`"
     bar:
-        label: "|"
+        text: "|"
     U00B7:
-        label: "·"
+        text: "·"
     squareroot:
-        label: "√"
+        text: "√"
     Greek_pi:
-        label: "π"
+        text: "π"
     division:
-        label: "÷"
+        text: "÷"
     multiply:
-        label: "×"
+        text: "×"
     paragraph:
-        label: "¶"
+        text: "¶"
     Greek_tau:
-        label: "τ"
+        text: "τ"
     copyright:
-        label: "©"
+        text: "©"
     numbersign:
-        label: "#"
+        text: "#"
     U00AE:
-        label: "®"
+        text: "®"
     at:
-        label: "@"
+        text: "@"
     dollar:
-        label: "$"
+        text: "$"
     U00A3:
-        label: "£"
+        text: "£"
     percent:
-        label: "%"
+        text: "%"
     EuroSign:
-        label: "€"
+        text: "€"
     ampersand:
-        label: "&"
+        text: "&"
     U00A5:
-        label: "¥"
+        text: "¥"
     minus:
-        label: "-"
+        text: "-"
     asciicircum:
-        label: "^"
+        text: "^"
     underscore:
-        label: "_"
+        text: "_"
     degree:
-        label: "°"
+        text: "°"
     plus:
-        label: "+"
+        text: "+"
     equal:
-        label: "="
+        text: "="
     parenleft:
-        label: "("
+        text: "("
     parenright:
-        label: ")"
+        text: ")"
     braceleft:
-        label: "{"
+        text: "{"
     braceright:
-        label: "}"
+        text: "}"
     comma:
-        label: ","
+        text: ","
     backslash:
-        label: "\\"
+        text: "\\"
     slash:
-        label: "/"
+        text: "/"
     quotedbl:
-        label: "\""
+        text: "\""
     quoteright:
-        label: "'"
+        text: "'"
     less:
-        label: "<"
+        text: "<"
     greater:
-        label: ">"
+        text: ">"
     colon:
-        label: ":"
+        text: ":"
     semicolon:
-        label: ";"
+        text: ";"
     exclam:
-        label: "!"
+        text: "!"
     question:
-        label: "?"
+        text: "?"
     bracketleft:
-        label: "["
+        text: "["
     bracketright:
-        label: "]"
+        text: "]"
 

data/keyboards/it.yaml

@@ -1,41 +1,34 @@
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , 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:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò « » ù ! { }"
@@ -53,6 +46,7 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "default"
@@ -82,15 +76,14 @@ buttons:
             set_view: "eschars"
         outline: "altline"
         label: "àè"
-    period:
-        outline: "default"
-        label: "."
     space:
         outline: "spaceline"
         label: " "
+        text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
+        keysym: "Return"
     colon:
         label: ":"
     "\"":

data/keyboards/jp+kana.yaml

@@ -1,19 +1,11 @@
-# Japanese Kana layout by Mark Müller
-# Version 2019101900
+# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    default-wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
+    default: { width: 62, height: 52 }
+    default-wide: { width: 62, height: 52 }
+    altline: { width: 62, height: 52 }
+    wide: { width: 62, height: 52 }
+    special: { width: 62, height: 52 }
 
 views:
     base: # hiragana
@@ -199,29 +191,33 @@ views:
         - "\\ ´ ` · ¶" 
 
 buttons:
-    # following 4 buttons are keysyms from libxkbcommon
+    # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
         outline: "wide"
         icon: "edit-clear-symbolic"
+        action: erase
     Return:
         outline: "wide"
         icon: "key-enter"
+        keysym: "Return"
     Left:
         outline: "wide"
         label: "←"
+        keysym: "Left"
     Right:
         outline: "wide"
         label: "→"
+        keysym: "Right"
     # special button "preferences" is handled in the code
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
-    # space button (unicode)
+    # space button using text tag for ideographic space
     space:
         outline: "default-wide"
         label: "␣"
-        keysym: "U3000"
+        text: "　"
     # switch to number view
     numbers:
         action:

data/keyboards/jp+kana_wide.yaml

@@ -0,0 +1,525 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 62, height: 42 }
+    default-wide: { width: 62, height: 42 }
+    altline: { width: 62, height: 42 }
+    wide: { width: 62, height: 42 }
+    special: { width: 62, height: 42 }
+
+views:
+    base: # hiragana
+        - "preferences _a ka sa BackSpace"
+        - "Left ta na ha Right"
+        - "カタカナ ma ya ra space"
+        - "switch2roman symbols wa punct Return"
+    _a:
+        - "preferences dummykey _a dummykey BackSpace"
+        - "あ い う え お"
+        - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
+        - "dummykey dummykey ゔ dummykey dummykey"
+    ka:
+        - "preferences dummykey ka dummykey BackSpace"
+        - "か き く け こ"
+        - "が ぎ ぐ げ ご"
+        - "ゕ dummykey dummykey ゖ dummykey"
+    sa:
+        - "preferences dummykey sa dummykey BackSpace"
+        - "さ し す せ そ"
+        - "ざ じ ず ぜ ぞ"
+    ta:
+        - "preferences dummykey ta dummykey BackSpace"
+        - "た ち つ て と"
+        - "だ ぢ づ で ど"
+        - "dummykey dummykey っ dummykey dummykey"
+    na:
+        - "preferences dummykey na dummykey BackSpace"
+        - "な に ぬ ね の"
+    ha:
+        - "preferences dummykey ha dummykey BackSpace"
+        - "は ひ ふ へ ほ"
+        - "ば び ぶ べ ぼ"
+        - "ぱ ぴ ぷ ぺ ぽ"
+    ma:
+        - "preferences dummykey ma dummykey BackSpace"
+        - "ま み む め も"
+    ya:
+        - "preferences dummykey ya dummykey BackSpace"
+        - "や dummykey ゆ dummykey よ"
+        - "ゃ dummykey ゅ dummykey ょ"
+    ra:
+        - "preferences dummykey ra dummykey BackSpace"
+        - "ら り る れ ろ"
+    wa:
+        - "preferences dummykey wa dummykey BackSpace"
+        - "わ ゐ dummykey ゑ を"
+        - "ゎ dummykey ん dummykey dummykey"
+    symbols:
+        - "preferences dummykey symbols dummykey BackSpace"
+        - "「 」 （ ） §"
+        - "【 】 ＜ ＞ ＝"
+        - "＋ ＊ ＆ ％ ＄ "
+    punct:
+        - "preferences dummykey punct dummykey BackSpace"
+        - "。 、 ？ ！ ー"
+
+        - "： ； ・ 〜 …"
+        - "♪ ” ’ ゙ ゚"
+        
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+
+#      g       z       d       b       p      n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ 
+
+    カタカナ: # katakana
+        - "preferences _A KA SA BackSpace"
+        - "Left TA NA HA Right"
+        - "ひらがな MA YA RA space"
+        - "switch2roman SYMBOLS WA PUNCT Return"
+    _A:
+        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
+        - "ア イ ウ エ オ"
+        - "ァ ィ ゥ ェ ォ"
+        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
+    KA:
+        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
+        - "カ キ ク ケ コ"
+        - "ガ ギ グ ゲ ゴ"
+        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
+    SA:
+        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
+        - "サ シ ス セ ソ"
+        - "ザ ジ ズ ゼ ゾ"
+        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
+    TA:
+        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
+        - "タ チ ツ テ ト"
+        - "ダ ヂ ヅ デ ド"
+        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
+    NA: 
+        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
+        - "ナ ニ ヌ ネ ノ"
+        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
+    HA:
+        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
+        - "ハ ヒ フ ヘ ホ"
+        - "バ ビ ブ ベ ボ"
+        - "パ ピ プ ペ ポ"
+    MA:
+        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
+        - "マ ミ ム メ モ"
+        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
+    YA:
+        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
+        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
+        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+    RA:
+        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "ラ リ ル レ ロ"
+        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
+    WA:
+        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
+        - "ワ ヰ DUMMYKEY ヱ ヲ"
+        - "ヮ ヸ ン ヹ ヺ"
+    # numbers view
+    numbers:
+        - "preferences 1 2 3 BackSpace"
+        - "Left 4 5 6 Right"
+        - "roman 7 8 9 space"
+        - "switch2kana * 0 # Return"
+    # Roman alphabet view
+    roman:
+        - "preferences RSYM1 ABC DEF BackSpace"
+        - "Left GHI JKL MNO Right"
+        - "ひらがな PQRS TUV WXYZ space"
+        - "switch2num RSYM2 RSYM3 RSYM4 Return"
+    RSYM1:
+        - "preferences dummykey RSYM1 dummykey BackSpace"
+        - "@ # $ § :"
+        - "| € ¥ £ 1"
+    ABC:
+        - "preferences dummykey ABC dummykey BackSpace"
+        - "A B C Ä ç"
+        - "a b c ä 2"
+    DEF:
+        - "preferences dummykey DEF dummykey BackSpace"
+        - "D E F dummykey"
+        - "d e f 3"
+    GHI:
+        - "preferences dummykey GHI dummykey BackSpace"
+        - "G H I dummykey"
+        - "g h i 4"
+    JKL:
+        - "preferences dummykey JKL dummykey BackSpace"
+        - "J K L dummykey"
+        - "j k l 5"
+    MNO:
+        - "preferences dummykey MNO dummykey BackSpace"
+        - "M N O Ö dummykey"
+        - "m n o ö 6"
+    PQRS:
+        - "preferences dummykey PQRS dummykey BackSpace"
+        - "P Q R S ß"
+        - "p q r s 7"
+    TUV:
+        - "preferences dummykey TUV dummykey BackSpace"
+        - "T U V Ü dummykey"
+        - "t u v ü 8"
+    WXYZ:
+        - "preferences dummykey WXYZ dummykey BackSpace"
+        - "W X Y Z dummykey"
+        - "w x y z 9"
+    RSYM2:
+        - "preferences dummykey RSYM2 dummykey BackSpace"
+        - "( ) ' \" ~"
+        - "[ ] { } _"
+    RSYM3:
+        - "preferences dummykey RSYM3 dummykey BackSpace"
+        - "+ - * / ="
+        - "< > ^ ° 0"
+    RSYM4:
+        - "preferences dummykey RSYM4 dummykey BackSpace"
+        - ", . ? ! ;"
+        - "\\ ´ ` · ¶" 
+
+buttons:
+    # following 4 buttons use the corresponding xkb name as keysym
+    BackSpace:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: erase
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    Left:
+        outline: "wide"
+        label: "←"
+        keysym: "Left"
+    Right:
+        outline: "wide"
+        label: "→"
+        keysym: "Right"
+    # special button "preferences" is handled in the code
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    # space button using text tag for ideographic space
+    space:
+        outline: "default-wide"
+        label: "␣"
+        text: "　"
+    # switch to number view
+    numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    # switch to latin characters
+    roman:
+        action:
+            set_view: "roman"
+        outline: "wide"
+        label: "ᴀʙᴄ"
+    # toggle button with 3 different states
+    switch2roman: # switch from kana to latin characters view
+        action:
+            set_view: "roman"
+        outline: "wide"
+        label: "あᴀ₁"
+    switch2num: # switch from latin characters to numbers view
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "ぁA₁"
+    switch2kana: # switch from numbers to hiragana view
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ぁᴀ1"
+    # Buttons for katakana and symbols
+    ひらがな:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "あさ"
+    _a:
+        action:
+            locking:
+                lock_view: "_a"
+                unlock_view: "base"
+        outline: "altline"
+        label: "あ"
+    ka:
+        action:
+            locking:
+                lock_view: "ka"
+                unlock_view: "base"
+        outline: "altline"
+        label: "か"
+    sa:
+        action:
+            locking:
+                lock_view: "sa"
+                unlock_view: "base"
+        outline: "altline"
+        label: "さ"
+    ta:
+        action:
+            locking:
+                lock_view: "ta"
+                unlock_view: "base"
+        outline: "altline"
+        label: "た"
+    na:
+        action:
+            locking:
+                lock_view: "na"
+                unlock_view: "base"
+        outline: "altline"
+        label: "な"
+    ha:
+        action:
+            locking:
+                lock_view: "ha"
+                unlock_view: "base"
+        outline: "altline"
+        label: "は"
+    ma:
+        action:
+            locking:
+                lock_view: "ma"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ま"
+    ya:
+        action:
+            locking:
+                lock_view: "ya"
+                unlock_view: "base"
+        outline: "altline"
+        label: "や"
+    ra:
+        action:
+            locking:
+                lock_view: "ra"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ら"
+    wa:
+        action:
+            locking:
+                lock_view: "wa"
+                unlock_view: "base"
+        outline: "altline"
+        label: "わ"
+    dummykey:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: ""
+    # buttons available on different views like symbols and punct should go
+    # back to their corresponding view
+    symbols:
+        action:
+            locking:
+                lock_view: "symbols"
+                unlock_view: "base"
+        outline: "altline"
+        label: "（）"
+    punct:
+        action:
+            locking:
+                lock_view: "punct"
+                unlock_view: "base"
+        outline: "altline"
+        label: "。"
+    # Buttons for katakana and symbols
+    カタカナ:
+        action:
+            set_view: "カタカナ"
+        outline: "wide"
+        label: "アサ"
+    _A:
+        action:
+            locking:
+                lock_view: "_A"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ア"
+    KA:
+        action:
+            locking:
+                lock_view: "KA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "カ"
+    SA:
+        action:
+            locking:
+                lock_view: "SA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "サ"
+    TA:
+        action:
+            locking:
+                lock_view: "TA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "タ"
+    NA:
+        action:
+            locking:
+                lock_view: "NA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ナ"
+    HA:
+        action:
+            locking:
+                lock_view: "HA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ハ"
+    MA:
+        action:
+            locking:
+                lock_view: "MA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "マ"
+    YA:
+        action:
+            locking:
+                lock_view: "YA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ヤ"
+    RA:
+        action:
+            locking:
+                lock_view: "RA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ラ"
+    WA:
+        action:
+            locking:
+                lock_view: "WA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ワ"
+    DUMMYKEY:
+        action:
+            set_view: "カタカナ"
+        outline: "altline"
+        label: ""
+    SYMBOLS:
+        action:
+            locking:
+                lock_view: "symbols"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "（）"
+    PUNCT:
+        action:
+            locking:
+                lock_view: "punct"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "。"
+    # Buttons for Latin charachters
+    RSYM1:
+        action:
+            locking:
+                lock_view: "RSYM1"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "@#"
+    ABC:
+        action:
+            locking:
+                lock_view: "ABC"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴀʙᴄ"
+    DEF:
+        action:
+            locking:
+                lock_view: "DEF"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴅᴇꜰ"
+    GHI:
+        action:
+            locking:
+                lock_view: "GHI"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ɢʜɪ"
+    JKL:
+        action:
+            locking:
+                lock_view: "JKL"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴊᴋʟ"
+    MNO:
+        action:
+            locking:
+                lock_view: "MNO"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴍɴᴏ"
+    PQRS:
+        action:
+            locking:
+                lock_view: "PQRS"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴘǫʀs"
+    TUV:
+        action:
+            locking:
+                lock_view: "TUV"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴛᴜᴠ"
+    WXYZ:
+        action:
+            locking:
+                lock_view: "WXYZ"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴡxʏᴢ"
+    RSYM2:
+        action:
+            locking:
+                lock_view: "RSYM2"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "()"
+    RSYM3:
+        action:
+            locking:
+                lock_view: "RSYM3"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "+-"
+    RSYM4:
+        action:
+            locking:
+                lock_view: "RSYM4"
+                unlock_view: "roman"
+        outline: "altline"
+        label: ",.?"

data/keyboards/no.yaml

@@ -0,0 +1,99 @@
+---
+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: "°"
+

data/keyboards/number.yaml

@@ -1,15 +1,9 @@
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
+    default: { width: 37.46341, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 120.5853, height: 52 }
 
 views:
     base:
@@ -22,22 +16,24 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: erase
     space:
         outline: spaceline
-        label: " "
+        text: " "
     Return:
         outline: outline7
         icon: "key-enter"
+        keysym: "Return"
     asterisk:
-        label: "*"
+        text: "*"
     numbersign:
-        label: "#"
+        text: "#"
     minus:
-        label: "-"
+        text: "-"
     plus:
-        label: "+"
+        text: "+"
     parenleft:
-        label: "("
+        text: "("
     parenright:
-        label: ")"
+        text: ")"
 

data/keyboards/pl.yaml

@@ -0,0 +1,110 @@
+---
+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:
+        - "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_accents Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        show_upper_accents Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period Return"
+    accents:
+        - "q w ę r t y u i ó p"
+        - "ą ś d f g h j k ł"
+        - "accents_show_upper   ż ź ć v b ń m  BackSpace"
+        - "show_numbers preferences         space        show_accents Return"
+    upper_accents:
+        - "Q W Ę R T Y U I Ó P"
+        - "Ą Ś D F G H J K Ł"
+        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
+        - "show_numbers preferences         space        show_upper_accents Return"
+
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    accents_show_upper:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "accents"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    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_accents:
+        action:
+            locking:
+                lock_view: "accents"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ąę"
+    show_upper_accents:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "upper"
+        outline: "altline"
+        label: "ĄĘ"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"

data/keyboards/pl_wide.yaml

@@ -0,0 +1,102 @@
+---
+outlines:
+    default: { width: 54, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 100, height: 42 }
+    spaceline: { width: 206, height: 42 }
+    special: { width: 54, height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        show_accents Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        show_upper_accents Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period Return"
+    accents:
+        - "q w ę r t y u i ó p"
+        - "ą ś d f g h j k ł"
+        - "Shift_L   ż ź ć v b ń m  BackSpace"
+        - "show_numbers preferences         space        show_accents Return"
+    upper_accents:
+        - "Q W Ę R T Y U I Ó P"
+        - "Ą Ś D F G H J K Ł"
+        - "Shift_L   Ż Ź Ć V B Ń M  BackSpace"
+        - "show_numbers preferences         space        show_upper_accents Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    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_accents:
+        action:
+            locking:
+                lock_view: "accents"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ąę"
+    show_upper_accents:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "upper"
+        outline: "altline"
+        label: "ĄĘ"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"

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"

data/keyboards/se.yaml

@@ -0,0 +1,164 @@
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 64,  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        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: altline
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        outline: "wide"
+        action:
+            set_view: "numbers"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: altline
+        label: "123"
+    show_letters:
+        outline: "wide"
+        action:
+            set_view: "base"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    comma:
+        text: ","
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"

data/keyboards/symbols/ar.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">١</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">٢</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">٣</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">٤</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">٥</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">٦</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">٧</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">٨</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">٩</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">٠</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ض</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ص</text>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ث</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ق</text>
-    <text category="letter">ٌ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ف</text>
-    <text category="letter">لإ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">غ</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ع</text>
-    <text category="letter">`</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ه</text>
-    <text category="letter">÷</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">خ</text>
-    <text category="letter">×</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ح</text>
-    <text category="letter">؛</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ج</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">د</text>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ش</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ٍ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ي</text>
-    <text category="letter">]</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ب</text>
-    <text category="letter">[</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ل</text>
-    <text category="letter">لأ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ا</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ت</text>
-    <text category="letter">ـ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ن</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">م</text>
-    <text category="letter">/</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ك</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ئ</text>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ء</text>
-    <text category="letter">ْ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ؤ</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ر</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">لا</text>
-    <text category="letter">لآ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ى</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ة</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">و</text>
-    <text category="letter">,</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ز</text>
-    <text category="letter">.</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ظ</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>

data/keyboards/symbols/as-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">১</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">২</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">৩</text>
-    <text category="letter">্ৰ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">৪</text>
-    <text category="letter">ৰ্</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">৫</text>
-    <text category="letter">জ্ঞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">৬</text>
-    <text category="letter">ত্ৰ</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">৭</text>
-    <text category="letter">ক্ষ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">৮</text>
-    <text category="letter">শ্ৰ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">৯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">০</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ঃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ৃ</text>
-    <text category="letter">ঋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ৌ</text>
-    <text category="letter">ঔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ৈ</text>
-    <text category="letter">ঐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">া</text>
-    <text category="letter">আ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ী</text>
-    <text category="letter">ঈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ূ</text>
-    <text category="letter">ঊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ব</text>
-    <text category="letter">ভ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">হ</text>
-    <text category="letter">ঙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">গ</text>
-    <text category="letter">ঘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">দ</text>
-    <text category="letter">ধ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">জ</text>
-    <text category="letter">ঝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ড</text>
-    <text category="letter">ঢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">়</text>
-    <text category="letter">ঞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">য</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ো</text>
-    <text category="letter">ও</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ে</text>
-    <text category="letter">এ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">্</text>
-    <text category="letter">অ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ি</text>
-    <text category="letter">ই</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ু</text>
-    <text category="letter">উ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">প</text>
-    <text category="letter">ফ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ৰ</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ক</text>
-    <text category="letter">খ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ত</text>
-    <text category="letter">থ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">চ</text>
-    <text category="letter">ছ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ঠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ৎ</text>
-    <text category="letter">৺</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ং</text>
-    <text category="letter">ঁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ম</text>
-    <text category="letter">ণ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ন</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ৱ</text>
-    <text category="letter">B</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ল</text>
-    <text category="letter">N</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">স</text>
-    <text category="letter">শ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ষ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">য়</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/be.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ё</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ў</text>
-    <text category="letter">Ў</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">&apos;</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>

data/keyboards/symbols/bn-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">১</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">২</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">৩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">৪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">৫</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">৬</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">৭</text>
-    <text category="letter">&amp;</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">৮</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">৯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">০</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ঃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ৃ</text>
-    <text category="letter">ঋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ৌ</text>
-    <text category="letter">ঔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ৈ</text>
-    <text category="letter">ঐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">া</text>
-    <text category="letter">আ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ী</text>
-    <text category="letter">ঈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ূ</text>
-    <text category="letter">ঊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ব</text>
-    <text category="letter">ভ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">হ</text>
-    <text category="letter">ঙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">গ</text>
-    <text category="letter">ঘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">দ</text>
-    <text category="letter">ধ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">জ</text>
-    <text category="letter">ঝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ড</text>
-    <text category="letter">ঢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">়</text>
-    <text category="letter">ঞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ো</text>
-    <text category="letter">ও</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ে</text>
-    <text category="letter">এ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">্</text>
-    <text category="letter">অ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ি</text>
-    <text category="letter">ই</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ু</text>
-    <text category="letter">উ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">প</text>
-    <text category="letter">ফ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">র</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ক</text>
-    <text category="letter">খ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ত</text>
-    <text category="letter">থ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">চ</text>
-    <text category="letter">ছ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ঠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">z</text>
-    <text category="letter">Z</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ং</text>
-    <text category="letter">ঁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ম</text>
-    <text category="letter">ণ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ন</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ব</text>
-    <text category="letter">B</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ল</text>
-    <text category="letter">N</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">স</text>
-    <text category="letter">শ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ষ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">য়</text>
-    <text category="letter">য</text>
-  </key>
-</symbols>

data/keyboards/symbols/fa.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">۱</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">۲</text>
-    <text category="letter">٬</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">۳</text>
-    <text category="letter">٫</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">۴</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">۵</text>
-    <text category="letter">٪</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">۶</text>
-    <text category="letter">×</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">۷</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">۸</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">۹</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">۰</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ض</text>
-    <text category="letter">ْ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ص</text>
-    <text category="letter">ٌ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ث</text>
-    <text category="letter">ٍ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ق</text>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ف</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">غ</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ع</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ه</text>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">خ</text>
-    <text category="letter">]</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ح</text>
-    <text category="letter">[</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ج</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">چ</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ش</text>
-    <text category="letter">ؤ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ئ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ی</text>
-    <text category="letter">ي</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ب</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ل</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ا</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ت</text>
-    <text category="letter">ة</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ن</text>
-    <text category="letter">»</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">م</text>
-    <text category="letter">«</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ک</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">؛</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ظ</text>
-    <text category="letter">ك</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ط</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ز</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ر</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ذ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">د</text>
-    <text name="N" category="letter"></text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">پ</text>
-    <text category="letter">ء</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">و</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="46">period</keysym>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="47">slash</keysym>
-    <text category="letter">؟</text>
-  </key>
-</symbols>

data/keyboards/symbols/gu-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">૧</text>
-    <text category="letter">ઍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">૨</text>
-    <text category="letter">ૅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">૩</text>
-    <text category="letter">ૠ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">૪</text>
-    <text category="letter">ૄ</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">૫</text>
-    <text category="letter">જ્ઞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">૬</text>
-    <text category="letter">ત્ર</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">૭</text>
-    <text category="letter">ક્ષ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">૮</text>
-    <text category="letter">શ્ર</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">૯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">૦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ઃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ૃ</text>
-    <text category="letter">ઋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ૌ</text>
-    <text category="letter">ઔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ૈ</text>
-    <text category="letter">ઐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ા</text>
-    <text category="letter">આ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ી</text>
-    <text category="letter">ઈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ૂ</text>
-    <text category="letter">ઊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">બ</text>
-    <text category="letter">ભ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">હ</text>
-    <text category="letter">ઙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ગ</text>
-    <text category="letter">ઘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">દ</text>
-    <text category="letter">ધ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">જ</text>
-    <text category="letter">ઝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ડ</text>
-    <text category="letter">ઢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">઼</text>
-    <text category="letter">ઞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ૉ</text>
-    <text category="letter">ઑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ો</text>
-    <text category="letter">ઓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ે</text>
-    <text category="letter">એ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">્</text>
-    <text category="letter">અ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">િ</text>
-    <text category="letter">ઇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ુ</text>
-    <text category="letter">ઉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">પ</text>
-    <text category="letter">ફ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ર</text>
-    <text category="letter">ઽ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ક</text>
-    <text category="letter">ખ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ત</text>
-    <text category="letter">થ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ચ</text>
-    <text category="letter">છ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ઠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">૱</text>
-    <text category="letter">ૐ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ં</text>
-    <text category="letter">ઁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">મ</text>
-    <text category="letter">ણ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ન</text>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">વ</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">લ</text>
-    <text category="letter">ળ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">સ</text>
-    <text category="letter">શ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ષ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ય</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>

data/keyboards/symbols/he.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">/</text>
-    <keysym keyval="81">Q</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">&apos;</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ק</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ר</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">א</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ט</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ו</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ן</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ם</text>
-    <keysym keyval="79">O</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">פ</text>
-    <keysym keyval="80">P</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">]</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">[</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ש</text>
-    <keysym keyval="65">A</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ד</text>
-    <keysym keyval="83">S</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ג</text>
-    <keysym keyval="68">D</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">כ</text>
-    <keysym keyval="70">F</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ע</text>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">י</text>
-    <keysym keyval="72">H</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ח</text>
-    <keysym keyval="74">J</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ל</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ך</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ף</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ז</text>
-    <keysym keyval="90">Z</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ס</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ב</text>
-    <keysym keyval="67">C</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ה</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">נ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">מ</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">צ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ת</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ץ</text>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/hi-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>

data/keyboards/symbols/ja-kana.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="1246">゛</keysym>
-    <keysym keyval="1247">゜</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="1223">ぬ</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="1228">ふ</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="1201">あ</keysym>
-    <keysym keyval="1191">ぁ</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="1203">う</keysym>
-    <keysym keyval="1193">ぅ</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="1204">え</keysym>
-    <keysym keyval="1194">ぇ</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="1205">お</keysym>
-    <keysym keyval="1195">ぉ</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="1236">や</keysym>
-    <keysym keyval="1196">ゃ</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="1237">ゆ</keysym>
-    <keysym keyval="1197">ゅ</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="1238">よ</keysym>
-    <keysym keyval="1198">ょ</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="1244">わ</keysym>
-    <keysym keyval="1190">を</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="1230">ほ</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="1229">へ</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <keysym keyval="1216">た</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <keysym keyval="1219">て</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <keysym keyval="1202">い</keysym>
-    <keysym keyval="1192">ぃ</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <keysym keyval="1213">す</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <keysym keyval="1206">か</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <keysym keyval="1245">ん</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <keysym keyval="1221">な</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <keysym keyval="1222">に</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <keysym keyval="1239">ら</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <keysym keyval="1214">せ</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="1233">む</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="1243">ろ</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <keysym keyval="1217">ち</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <keysym keyval="1220">と</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <keysym keyval="1212">し</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <keysym keyval="1226">は</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="1207">き</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <keysym keyval="1208">く</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <keysym keyval="1231">ま</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <keysym keyval="1225">の</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <keysym keyval="1240">り</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <keysym keyval="1242">れ</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="1209">け</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <keysym keyval="1218">つ</keysym>
-    <keysym keyval="1199">っ</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <keysym keyval="1211">さ</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <keysym keyval="1215">そ</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <keysym keyval="1227">ひ</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <keysym keyval="1210">こ</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <keysym keyval="1232">み</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <keysym keyval="1235">も</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <keysym keyval="1224">ね</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="1241">る</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="1234">め</keysym>
-  </key>
-</symbols>
-

data/keyboards/symbols/kk.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">&quot;</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">ә</text>
-    <text category="letter">Ә</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">ӊ</text>
-    <text category="letter">Ӊ</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">ғ</text>
-    <text category="letter">Ғ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">,</text>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">.</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">ү</text>
-    <text category="letter">Ү</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">ұ</text>
-    <text category="letter">Ұ</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">қ</text>
-    <text category="letter">Қ</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">ө</text>
-    <text category="letter">Ө</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">һ</text>
-    <text category="letter">Һ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ъ</text>
-    <text category="letter">Ъ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">№</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/kn-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ಒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">೧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">೨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">೩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">೪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">೫</text>
-    <text category="letter">ಜ್ಞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">೬</text>
-    <text category="letter">ತ್ರ</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">೭</text>
-    <text category="letter">ಕ್ಷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">೮</text>
-    <text category="letter">ಶ್ರ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">೯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">೦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ಃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ೃ</text>
-    <text category="letter">ಋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ೌ</text>
-    <text category="letter">ಔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ೈ</text>
-    <text category="letter">ಐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ಾ</text>
-    <text category="letter">ಆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ೀ</text>
-    <text category="letter">ಈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ೂ</text>
-    <text category="letter">ಊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ಬ</text>
-    <text category="letter">ಭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ಹ</text>
-    <text category="letter">ಙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ಗ</text>
-    <text category="letter">ಘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ದ</text>
-    <text category="letter">ಧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ಜ</text>
-    <text category="letter">ಝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ಡ</text>
-    <text category="letter">ಢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">]</text>
-    <text category="letter">ಞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">‍</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ೋ</text>
-    <text category="letter">ಓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ೇ</text>
-    <text category="letter">ಏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">್</text>
-    <text category="letter">ಅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ಿ</text>
-    <text category="letter">ಇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ು</text>
-    <text category="letter">ಉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ಪ</text>
-    <text category="letter">ಫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ರ</text>
-    <text category="letter">ಱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ಕ</text>
-    <text category="letter">ಖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ತ</text>
-    <text category="letter">ಥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ಚ</text>
-    <text category="letter">ಛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ಠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ೆ</text>
-    <text category="letter">ಎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ಂ</text>
-    <text name="X" category="letter"></text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ಮ</text>
-    <text category="letter">ಣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ನ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ವ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ಲ</text>
-    <text category="letter">ಳ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ಸ</text>
-    <text category="letter">ಶ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ಷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">ಾ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ಯ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/ks-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ॿ</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ॻ</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ॼ</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ॾ</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="103">g</keysym>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>

data/keyboards/symbols/ks.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">۱</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">۲</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">۳</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">۴</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">۵</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">۶</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">۷</text>
-    <text category="letter">&amp;</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">۸</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">۹</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">۰</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ق</text>
-    <text category="letter">ﷺ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">و</text>
-    <text category="letter">ؤ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ع</text>
-    <text category="letter">ئ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ر</text>
-    <text category="letter">ڑ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ت</text>
-    <text category="letter">ٹ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ے</text>
-    <text category="letter">؁</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ء</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ی</text>
-    <text category="letter">ۆ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ہ</text>
-    <text category="letter">ۃ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">پ</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">]</text>
-    <text category="letter">ٰ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">[</text>
-    <text category="letter">ٰ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">؎</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ا</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ش</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">د</text>
-    <text category="letter">ڈ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ف</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">گ</text>
-    <text category="letter">غ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ھ</text>
-    <text category="letter">ح</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ج</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ک</text>
-    <text category="letter">خ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ل</text>
-    <text category="letter">ؓ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">؛</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ز</text>
-    <text category="letter">ذ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ص</text>
-    <text category="letter">ض</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">چ</text>
-    <text category="letter">ث</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ط</text>
-    <text category="letter">ظ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ب</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ن</text>
-    <text category="letter">ں</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">م</text>
-    <text category="letter">ٔ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">،</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">۔</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">/</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>

data/keyboards/symbols/mai-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>

data/keyboards/symbols/ml-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ഒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">൧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">൨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">൩</text>
-    <text category="letter">്ര</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">൪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">൫</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">൬</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">൭</text>
-    <text category="letter">ക്ഷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">൮</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">൯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">൦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ഃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ൃ</text>
-    <text category="letter">ഋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ൌ</text>
-    <text category="letter">ഔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ൈ</text>
-    <text category="letter">ഐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ാ</text>
-    <text category="letter">ആ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ീ</text>
-    <text category="letter">ഈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ൂ</text>
-    <text category="letter">ഊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ബ</text>
-    <text category="letter">ഭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ഹ</text>
-    <text category="letter">ങ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ഗ</text>
-    <text category="letter">ഘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ദ</text>
-    <text category="letter">ധ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ജ</text>
-    <text category="letter">ഝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ഡ</text>
-    <text category="letter">ഢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">‍</text>
-    <text category="letter">ഞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">‌</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ോ</text>
-    <text category="letter">ഓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">േ</text>
-    <text category="letter">ഏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">്</text>
-    <text category="letter">അ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ി</text>
-    <text category="letter">ഇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ു</text>
-    <text category="letter">ഉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">പ</text>
-    <text category="letter">ഫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ര</text>
-    <text category="letter">റ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ക</text>
-    <text category="letter">ഖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ത</text>
-    <text category="letter">ഥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ച</text>
-    <text category="letter">ഛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ഠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">െ</text>
-    <text category="letter">എ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ം</text>
-    <text category="letter">X</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">മ</text>
-    <text category="letter">ണ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ന</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">വ</text>
-    <text category="letter">ഴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ല</text>
-    <text category="letter">ള</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">സ</text>
-    <text category="letter">ശ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ഷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">യ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/mr-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>

data/keyboards/symbols/my.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">၁</text>
-    <text category="letter">ဍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">၂</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">၃</text>
-    <text category="letter">ဋ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">၄</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">၅</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">၆</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">၇</text>
-    <text category="letter">ရ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">၈</text>
-    <text category="letter">ဂ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">၉</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">၀</text>
-    <text category="letter">ဝ</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ဆ</text>
-    <text category="letter">၍</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">တ</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">န</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">မ</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">အ</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ပ</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">က</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">င</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">သ</text>
-    <text category="letter">ဥ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">စ</text>
-    <text category="letter">ဏ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ဟ</text>
-    <text category="letter">ဎ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ဉ</text>
-    <text category="letter">ဧ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">၏</text>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ေ</text>
-    <text category="letter">ဗ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">္</text>
-    <text category="letter">္</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ိ</text>
-    <text category="letter">ီ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">္</text>
-    <text category="letter">‍</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">‌</text>
-    <text category="letter">္</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">့</text>
-    <text category="letter">ံ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">္</text>
-    <text category="letter">ဲ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ု</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ူ</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">း</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ဓ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ဖ</text>
-    <text category="letter">ဇ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ထ</text>
-    <text category="letter">ဌ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ခ</text>
-    <text category="letter">ဃ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">လ</text>
-    <text category="letter">ဠ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ဘ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ည</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ာ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ယ</text>
-    <text category="letter">၍</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ဈ</text>
-    <text category="letter">ဤ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">။</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/or-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">୰</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">୧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">୨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">୩</text>
-    <text category="letter">୍ର</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">୪</text>
-    <text category="letter">ର୍</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">୫</text>
-    <text category="letter">ଜ୍ଞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">୬</text>
-    <text category="letter">ତ୍ର</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">୭</text>
-    <text category="letter">କ୍ଷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">୮</text>
-    <text category="letter">ଶ୍ର</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">୯</text>
-    <text category="letter">‍</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">୦</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ଃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ୃ</text>
-    <text category="letter">ଋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ୌ</text>
-    <text category="letter">ଔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ୈ</text>
-    <text category="letter">ଐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ା</text>
-    <text category="letter">ଆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ୀ</text>
-    <text category="letter">ଈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ୂ</text>
-    <text category="letter">ଊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ବ</text>
-    <text category="letter">ଭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ହ</text>
-    <text category="letter">ଙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ଗ</text>
-    <text category="letter">ଘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ଦ</text>
-    <text category="letter">ଧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ଜ</text>
-    <text category="letter">ଝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ଡ</text>
-    <text category="letter">ଢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">଼</text>
-    <text category="letter">ଞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ୋ</text>
-    <text category="letter">ଓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">େ</text>
-    <text category="letter">ଏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">୍</text>
-    <text category="letter">ଅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ି</text>
-    <text category="letter">ଇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ୁ</text>
-    <text category="letter">ଉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ପ</text>
-    <text category="letter">ଫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ର</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">କ</text>
-    <text category="letter">ଖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ତ</text>
-    <text category="letter">ଥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ଚ</text>
-    <text category="letter">ଛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ଠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">z</text>
-    <text category="letter">Z</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ଂ</text>
-    <text category="letter">ଁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ମ</text>
-    <text category="letter">ଣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ନ</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ୱ</text>
-    <text category="letter">ଵ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ଲ</text>
-    <text category="letter">ଳ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ସ</text>
-    <text category="letter">ଶ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ଷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ୟ</text>
-    <text category="letter">ଯ</text>
-  </key>
-</symbols>

data/keyboards/symbols/pa-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">੧</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">੨</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">੩</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">੪</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">੫</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">੬</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">੭</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">੮</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">੯</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">੦</text>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ੌ</text>
-    <text category="letter">ਔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ੈ</text>
-    <text category="letter">ਐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ਾ</text>
-    <text category="letter">ਆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ੀ</text>
-    <text category="letter">ਈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ੂ</text>
-    <text category="letter">ਊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ਬ</text>
-    <text category="letter">ਭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ਹ</text>
-    <text category="letter">ਙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ਗ</text>
-    <text category="letter">ਘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ਦ</text>
-    <text category="letter">ਧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ਜ</text>
-    <text category="letter">ਝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ਡ</text>
-    <text category="letter">ਢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">਼</text>
-    <text category="letter">ਞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ੋ</text>
-    <text category="letter">ਓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ੇ</text>
-    <text category="letter">ਏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">੍</text>
-    <text category="letter">ਅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ਿ</text>
-    <text category="letter">ਇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ੁ</text>
-    <text category="letter">ਉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ਪ</text>
-    <text category="letter">ਫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ਰ</text>
-    <text category="letter">ੜ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ਕ</text>
-    <text category="letter">ਖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ਤ</text>
-    <text category="letter">ਥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ਚ</text>
-    <text category="letter">ਛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ਠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ੰ</text>
-    <text category="letter">ੱ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ਜ਼</text>
-    <text category="letter">ਫ਼</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ਮ</text>
-    <text category="letter">ਣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ਨ</text>
-    <text category="letter">ਂ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ਵ</text>
-    <text category="letter">ਞ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ਲ</text>
-    <text category="letter">ਲ਼</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ਸ</text>
-    <text category="letter">ਸ਼</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ੳ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">ੲ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ਯ</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>

data/keyboards/symbols/ru.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ё</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ъ</text>
-    <text category="letter">Ъ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>

data/keyboards/symbols/sd-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ॿ</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ॻ</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ॼ</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ॾ</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>

data/keyboards/symbols/ta-inscript.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ஒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">1</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">2</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">3</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">4</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">5</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">6</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">7</text>
-    <text category="letter">க்ஷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">8</text>
-    <text category="letter">ஷ்ர</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">9</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">0</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ஃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ௌ</text>
-    <text category="letter">ஔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ை</text>
-    <text category="letter">ஐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ா</text>
-    <text category="letter">ஆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ீ</text>
-    <text category="letter">ஈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ூ</text>
-    <text category="letter">ஊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">y</text>
-    <text category="letter">Y</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ஹ</text>
-    <text category="letter">ங</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">i</text>
-    <text category="letter">I</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">o</text>
-    <text category="letter">O</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ஜ</text>
-    <text category="letter">P</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">[</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">]</text>
-    <text category="letter">ஞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ோ</text>
-    <text category="letter">ஓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ே</text>
-    <text category="letter">ஏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">்</text>
-    <text category="letter">அ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ி</text>
-    <text category="letter">இ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ு</text>
-    <text category="letter">உ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ப</text>
-    <text category="letter">H</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ர</text>
-    <text category="letter">ற</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">க</text>
-    <text category="letter">K</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">த</text>
-    <text category="letter">L</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ச</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ெ</text>
-    <text category="letter">எ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">x</text>
-    <text category="letter">X</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ம</text>
-    <text category="letter">ண</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ந</text>
-    <text category="letter">ன</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">வ</text>
-    <text category="letter">ழ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ல</text>
-    <text category="letter">ள</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ஸ</text>
-    <text category="letter">M</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ஷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ய</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/te-inscript.xml

@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ఒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">౧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">౨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">౩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">౪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">౫</text>
-    <text category="letter">జ్ఞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">౬</text>
-    <text category="letter">త్ర</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">౭</text>
-    <text category="letter">క్ష</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">౮</text>
-    <text category="letter">శ్ర</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">౯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">౦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ృ</text>
-    <text category="letter">ఋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ౌ</text>
-    <text category="letter">ఔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ై</text>
-    <text category="letter">ఐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ా</text>
-    <text category="letter">ఆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ీ</text>
-    <text category="letter">ఈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ూ</text>
-    <text category="letter">ఊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">బ</text>
-    <text category="letter">భ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">హ</text>
-    <text category="letter">ఙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">గ</text>
-    <text category="letter">ఘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ద</text>
-    <text category="letter">ధ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">జ</text>
-    <text category="letter">ఝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">డ</text>
-    <text category="letter">ఢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">‍</text>
-    <text category="letter">ఞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ౄ</text>
-    <text category="letter">ౠ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ో</text>
-    <text category="letter">ఓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ే</text>
-    <text category="letter">ఏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">్</text>
-    <text category="letter">అ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ి</text>
-    <text category="letter">ఇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ు</text>
-    <text category="letter">ఉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ప</text>
-    <text category="letter">ఫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ర</text>
-    <text category="letter">ఱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">క</text>
-    <text category="letter">ఖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">త</text>
-    <text category="letter">థ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">చ</text>
-    <text category="letter">ఛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ఠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ె</text>
-    <text category="letter">ఎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ం</text>
-    <text category="letter">ఁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">మ</text>
-    <text category="letter">ణ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">న</text>
-    <text category="letter">ః</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">వ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ల</text>
-    <text category="letter">ళ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">స</text>
-    <text category="letter">శ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ష</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">య</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>
-

data/keyboards/symbols/th.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="95">underscore</keysym>
-    <keysym keyval="37">percent</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="3557">Thai_lakkhangyao</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="47">slash</keysym>
-    <keysym keyval="3569">Thai_leknung</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="3570">Thai_leksong</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="3520">Thai_phosamphao</keysym>
-    <keysym keyval="3571">Thai_leksam</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="3510">Thai_thothung</keysym>
-    <keysym keyval="3572">Thai_leksi</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="3544">Thai_sarau</keysym>
-    <keysym keyval="3545">Thai_sarauu</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="3542">Thai_saraue</keysym>
-    <keysym keyval="3551">Thai_baht</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="3492">Thai_khokhwai</keysym>
-    <keysym keyval="3573">Thai_lekha</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="3509">Thai_totao</keysym>
-    <keysym keyval="3574">Thai_lekhok</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="3496">Thai_chochan</keysym>
-    <keysym keyval="3575">Thai_lekchet</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="3490">Thai_khokhai</keysym>
-    <keysym keyval="3576">Thai_lekpaet</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="3498">Thai_chochang</keysym>
-    <keysym keyval="3577">Thai_lekkao</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <keysym keyval="3558">Thai_maiyamok</keysym>
-    <keysym keyval="3568">Thai_leksun</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <keysym keyval="3556">Thai_saraaimaimalai</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <keysym keyval="3539">Thai_saraam</keysym>
-    <keysym keyval="3502">Thai_dochada</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <keysym keyval="3518">Thai_phophan</keysym>
-    <keysym keyval="3505">Thai_thonangmontho</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <keysym keyval="3536">Thai_saraa</keysym>
-    <keysym keyval="3512">Thai_thothong</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <keysym keyval="3537">Thai_maihanakat</keysym>
-    <keysym keyval="3565">Thai_nikhahit</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <keysym keyval="3541">Thai_saraii</keysym>
-    <keysym keyval="3562">Thai_maitri</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <keysym keyval="3523">Thai_rorua</keysym>
-    <keysym keyval="3507">Thai_nonen</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <keysym keyval="3513">Thai_nonu</keysym>
-    <keysym keyval="3535">Thai_paiyannoi</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <keysym keyval="3522">Thai_yoyak</keysym>
-    <keysym keyval="3501">Thai_yoying</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="3514">Thai_bobaimai</keysym>
-    <keysym keyval="3504">Thai_thothan</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="3525">Thai_loling</keysym>
-    <keysym keyval="44">comma</keysym>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="3491">Thai_khokhuat</keysym>
-    <keysym keyval="3493">Thai_khokhon</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <keysym keyval="3519">Thai_fofan</keysym>
-    <keysym keyval="3524">Thai_ru</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <keysym keyval="3531">Thai_hohip</keysym>
-    <keysym keyval="3494">Thai_khorakhang</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <keysym keyval="3489">Thai_kokai</keysym>
-    <keysym keyval="3503">Thai_topatak</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <keysym keyval="3508">Thai_dodek</keysym>
-    <keysym keyval="3554">Thai_sarao</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="3552">Thai_sarae</keysym>
-    <keysym keyval="3500">Thai_chochoe</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <keysym keyval="3561">Thai_maitho</keysym>
-    <keysym keyval="3559">Thai_maitaikhu</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <keysym keyval="3560">Thai_maiek</keysym>
-    <keysym keyval="3563">Thai_maichattawa</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <keysym keyval="3538">Thai_saraaa</keysym>
-    <keysym keyval="3529">Thai_sorusi</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <keysym keyval="3530">Thai_sosua</keysym>
-    <keysym keyval="3528">Thai_sosala</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <keysym keyval="3527">Thai_wowaen</keysym>
-    <keysym keyval="3499">Thai_soso</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="3495">Thai_ngongu</keysym>
-    <keysym keyval="46">period</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <keysym keyval="3516">Thai_phophung</keysym>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <keysym keyval="3515">Thai_popla</keysym>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <keysym keyval="3553">Thai_saraae</keysym>
-    <keysym keyval="3497">Thai_choching</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <keysym keyval="3533">Thai_oang</keysym>
-    <keysym keyval="3534">Thai_honokhuk</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <keysym keyval="3540">Thai_sarai</keysym>
-    <keysym keyval="3546">Thai_phinthu</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <keysym keyval="3543">Thai_sarauee</keysym>
-    <keysym keyval="3564">Thai_thanthakhat</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <keysym keyval="3511">Thai_thothahan</keysym>
-    <keysym keyval="63">question</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <keysym keyval="3521">Thai_moma</keysym>
-    <keysym keyval="3506">Thai_thophuthao</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="3555">Thai_saraaimaimuan</keysym>
-    <keysym keyval="3532">Thai_lochula</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="3517">Thai_fofa</keysym>
-    <keysym keyval="3526">Thai_lu</keysym>
-  </key>
-</symbols>

data/keyboards/symbols/ua.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ґ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ї</text>
-    <text category="letter">Ї</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Є</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>

data/keyboards/symbols/ug.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">—</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">چ</text>
-    <text category="letter">چ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ۋ</text>
-    <text category="letter">ۋ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ې</text>
-    <text category="letter">ې</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ر</text>
-    <text category="letter">ر</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ت</text>
-    <text category="letter">ت</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ي</text>
-    <text category="letter">ي</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ۇ</text>
-    <text category="letter">ۇ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ڭ</text>
-    <text category="letter">ڭ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">و</text>
-    <text category="letter">و</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">پ</text>
-    <text category="letter">پ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="91">bracketleft</keysym>
-    <text category="letter">«</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="93">bracketright</keysym>
-    <text category="letter">»</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ھ</text>
-    <text category="letter">ھ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">س</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">د</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ا</text>
-    <text category="letter">ف</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ە</text>
-    <text category="letter">گ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ى</text>
-    <text category="letter">خ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ق</text>
-    <text category="letter">ج</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ك</text>
-    <text category="letter">ۆ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ل</text>
-    <text category="letter">ل</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">؛</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ز</text>
-    <text category="letter">ز</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ش</text>
-    <text category="letter">ش</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">غ</text>
-    <text category="letter">غ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ۈ</text>
-    <text category="letter">ۈ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ب</text>
-    <text category="letter">ب</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ن</text>
-    <text category="letter">ن</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">م</text>
-    <text category="letter">م</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">،</text>
-    <text category="letter">‹</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="46">period</keysym>
-    <text category="letter">›</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ئ</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>

data/keyboards/symbols/zh-bopomofo.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">ㄅ</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">ㄉ</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">ˇ</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">ˋ</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">ㄓ</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">ˊ</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">˙</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">ㄚ</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">ㄞ</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">ㄢ</text>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">ㄦ</text>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ㄆ</text>
-    <keysym keyval="81">Q</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ㄊ</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ㄍ</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ㄐ</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ㄔ</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ㄗ</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ㄧ</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ㄛ</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ㄟ</text>
-    <keysym keyval="79">O</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ㄣ</text>
-    <keysym keyval="80">P</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="91">bracketleft</keysym>
-    <keysym keyval="123">braceleft</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="93">bracketright</keysym>
-    <keysym keyval="125">braceright</keysym>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ㄇ</text>
-    <keysym keyval="65">A</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ㄋ</text>
-    <keysym keyval="83">S</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ㄎ</text>
-    <keysym keyval="68">D</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ㄑ</text>
-    <keysym keyval="70">F</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ㄕ</text>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ㄘ</text>
-    <keysym keyval="72">H</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ㄨ</text>
-    <keysym keyval="74">J</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ㄜ</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ㄠ</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ㄤ</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ㄈ</text>
-    <keysym keyval="90">Z</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ㄌ</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ㄏ</text>
-    <keysym keyval="67">C</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ㄒ</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ㄖ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ㄙ</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ㄩ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ㄝ</text>
-    <keysym keyval="60">less</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ㄡ</text>
-    <keysym keyval="62">greater</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ㄥ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>

data/keyboards/terminal.yaml

@@ -0,0 +1,204 @@
+---
+outlines:
+    default: { width: 35.33, height: 46 }
+    action:  { width: 59,    height: 46 }
+    altline: { width: 52.67, height: 46 }
+    wide: { width: 59, height: 46 }
+    spaceline: { width: 140, height: 46 }
+    special: { width: 44, height: 46 }
+    small: { width: 59, height: 22 }
+
+views:
+    base:
+        - "Ctrl Alt ↑ ↓ ← →"
+        - "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 Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+

data/keyboards/terminal_wide.yaml

@@ -0,0 +1,211 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 225,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"

data/keyboards/ua.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"

data/keyboards/us.yaml

@@ -1,17 +1,10 @@
 ---
-bounds: { x: 0, y: 1, width: 360, height: 208 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 142, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    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:
@@ -46,8 +39,9 @@ buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
+        action: erase
     preferences:
-        action: "show_prefs"
+        action: show_prefs
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
@@ -72,14 +66,13 @@ buttons:
         label: "*/="
     period:
         outline: "special"
-        label: "."
+        text: "."
     space:
         outline: "spaceline"
-        label: " "
+        text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
+        keysym: "Return"
     colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        text: ":"

data/keyboards/us_wide.yaml

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

data/langs/en-US.txt

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

data/langs/es-ES.txt

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

data/langs/pl-PL.txt

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

data/langs/ru-RU.txt

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

data/meson.build

@@ -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'
 )

data/popup.ui

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

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

@@ -2,8 +2,7 @@
 Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
-Exec=squeekboard
-Icon=squeekboard
+Exec=@bindir@/squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true

data/squeekboard.gresources.xml

@@ -2,33 +2,8 @@
 <gresources>
   <gresource prefix="/sm/puri/squeekboard">
    <file compressed="true">style.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/bn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/fa.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/gu-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/he.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/hi-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ja-kana.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kk.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mai-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ml-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mr-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/my.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/or-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/pa-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ru.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/sd-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ta-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/te-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/th.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
+   <file compressed="true">style-Adwaita:dark.css</file>
+   <file compressed="true" preprocess="xml-stripblanks">popup.ui</file>
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>

data/style-Adwaita:dark.css

@@ -0,0 +1,55 @@
+sq_view {
+    background-color: rgba(0, 0, 0, 255);
+    color: #ffffff;
+    font-family: cantarell, sans-serif;
+    font-size: 25px;
+}
+
+sq_view sq_button {
+    color: #deddda;
+    background: #464448;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #5e5c64;
+    border-radius: 3px;
+    margin: 4px 2px 4px 2px;
+}
+
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
+}
+
+sq_button:active {
+    background: #747077;
+    border-color: #96949d;
+}
+
+sq_button.altline,
+sq_button.special,
+sq_button.wide {
+    background: #2b292f;
+    border-color: #3e3a44;
+}
+
+sq_button.locked {
+    background: #ffffff;
+    color: #2b292f;
+}
+
+sq_button.action {
+    font-size: 0.75em;
+}
+
+sq_button.small {
+    font-size: 0.5em;
+}
+
+#Return {
+    background: #1c71d8;
+    border-color: #1a5fb4;
+}
+
+#Return:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}

data/style.css

@@ -1,15 +1,16 @@
 sq_view {
-    background-color: rgba(0, 0, 0, 255);
-    color: #ffffff;
+    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
+    color: @theme_text_color; /*#ffffff;*/
     font-family: cantarell, sans-serif;
+    font-size: 25px;
 }
 
 sq_view sq_button {
-    color: #deddda;
-    background: #464448;
+    color: @theme_fg_color; /*#deddda;*/
+    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
     border-style: solid;
     border-width: 1px;
-    border-color: #5e5c64;
+    border-color: @borders; /* #5e5c64;*/
     border-radius: 3px;
     margin: 4px 2px 4px 2px;
 }
@@ -18,29 +19,40 @@ sq_view.wide sq_button {
     margin: 1px 1px 1px 1px;
 }
 
-sq_button:active {
-    background: #747077;
-    border-color: #96949d;
+sq_button:active,
+sq_button.altline:active,
+sq_button.special:active,
+sq_button.wide:active {
+    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
+    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
 }
 
 sq_button.altline,
 sq_button.special,
 sq_button.wide {
-    background: #2b292f;
-    border-color: #3e3a44;
+    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
+    border-color: @borders; /* #3e3a44; */
 }
 
 sq_button.locked {
-    background: #ffffff;
-    color: #2b292f;
+    background: @theme_fg_color; /*#ffffff;*/
+    color: @theme_bg_color; /*#2b292f;*/
+}
+
+sq_button.action {
+    font-size: 0.75em;
+}
+
+sq_button.small {
+    font-size: 0.5em;
 }
 
 #Return {
-    background: #1c71d8;
-    border-color: #1a5fb4;
+    background: @theme_selected_bg_color; /* #1c71d8; */
+    border-color: @borders; /*#1a5fb4;*/
 }
 
 #Return:active {
-    background: #1c71d8;
-    border-color: #3584e4;
+    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
+    border-color: @borders; /*#3584e4;*/
 }

dco.txt

@@ -0,0 +1,39 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+
+

debian/changelog

@@ -1,3 +1,316 @@
+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 ]
+  * imservice: Add commit_string method
+  * submission: Handle submitting strings
+  * input_method: Use for erasing
+  * logging: Use in merged functions
+  * translations: Remove redundant ones
+  * translations: Translate builtin layouts
+  * greek: Rename to gr which is used by gnome settings
+
+  [ Sebastian Krzyszkowiak ]
+  * layouts: Add Polish layouts
+
+  [ Dorota Czaplejewicz ]
+  * locks: Draw based on current view
+  * locking: Lock keys statelessly
+  * layouts: Better accented uppercase in PL
+  * emoji: Add more choices
+  * row: Eliminate angle
+  * layout: Center views relative to each other and the layout bounds
+  * drawing: Generalized foreach_visible_button
+  * variant: Fix double-free
+  * variant: Fix leak
+  * keyboard_layout: Fix leak
+  * layout: Improve scoping of locked variable
+  * terminal: Make */ easier to reach
+
+  [ Sebastian Krzyszkowiak ]
+  * layouts: terminal: Use altline outline for dot key
+
+  [ Dorota Czaplejewicz ]
+  * text input: Disable erasing
+  * cargo: Update deps
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 19 Feb 2020 14:32:39 +0000
+
+squeekboard (1.8.1) amber-phone; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * action: Rename Level to View
+  * keyboard: Introduce a KeyCode type wrapping u32
+  * layout: Centralize handling key releases
+  * layout: Make handling presses uniform
+  * UI: Drop indirection for show/hide functions
+  * managers: Move visible flag to UI manager
+  * dbus_service: Remove unused function
+  * dbus: Remove unneeded gobjectness
+  * dbus: Rename handler from eekboard_service
+  * context: Moved keymap setting together with its generation
+  * key-emitter: Remove unused
+  * eekboard_context_service: Drop unused enable property
+  * services: Split out layout management from EekboardContextService
+  * submission: Move away from virtual-keyboard
+  * submission: Create a new wrapper over imservice
+  * imservice: Limited scope of unsafe
+  * EekGtkKeyboard: Use a direct reference to EekboardContext
+  * submission: Take over virtual_keyboard handling
+  * keyboard: Cleanups of unused code
+  * levelkeyboard: Drop unused manager references
+  * keyboard: Gather up keymap handling, drop layout
+  * submission: Remove wildcard reexport
+  * imservice: Rename commit_state to done to match protocol
+  * ci: Clean up `..` before it's searched for artifacts
+  * dbus: Log error on dbus exit
+  * logging: Try to improve common operations
+  * imservice: Return something more resembling an Error on failure
+  * logging: Unified to remove random eprint calls
+  * press_key: Use proper logging
+  * number: Fix keysym for Return
+  * build: Strip clap of optional features
+  * layouts: Fix segfault on switching to wide
+  * font: Use font from style context
+  * font: Only pass relevant data to label renderer
+
+  [ Sebastian Krzyszkowiak ]
+  * layout: terminal: Swap positions of preferences and actions button
+  * layout: terminal: Show actions button on all views
+  * layout: terminal: Replace actions button with period on symbols view
+
+  [ Dorota Czaplejewicz ]
+  * setup: Connect ui to the state manager
+  * debian: Add missing commas
+
+  [ David Boddie ]
+  * Tidy build file and docs
+  * Use pip to install recommonmark
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Fri, 31 Jan 2020 09:59:12 +0000
+
+squeekboard (1.8.0) amber-phone; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * translations: Use gnome-desktop's xkb info database for layout names
+  * translations: Make the code cleaner
+  * overlay: Add terminal
+  * eek-layout: Remove unused
+  * pre-release: Update deps
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 14 Jan 2020 13:55:00 +0000
+
+squeekboard (1.7.0) amber-phone; urgency=medium
+
+  * New terminal layout appearing on terminal input hint
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
+
+squeekboard (1.7.0) amber-phone; urgency=medium
+
+  * New terminal layout appearing on terminal input hint
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
+
+squeekboard (1.6.0) amber-phone; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * tools: Move entry.py
+  * build: Move building of squeekboard-test-layout to tools
+  * packaging: Install entty.py as squeekboard-entry
+  * Remove unused build dependencies
+  * Remove unused header generator
+  * logging: Move all facilities to one file
+  * logging: Described the design
+  * logging: Add described log levels
+  * popover: Install emoji layout
+  * popover: Show overlays as selected
+  * Fix old Rust woes
+  * emoji: Add a passable layout
+  * Fix g_ and stdlib allocation/free mismatches
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 02 Jan 2020 12:02:50 +0000
+ 
+squeekboard (1.5.0) amber-phone; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * keycodes: Sort to eliminate runtime indeterminism
+  * switcher: Switch layout on menu item click
+  * Drop squeek_key
+  * renderer: Remove some unneeded vars
+  * renderer: Simplified outline rendering
+  * renderer: Drop row from button rendering
+  * renderer: Drop unused params
+  * renderer: Simplify surface rendering
+  * rendering: Simplify Cairo context usage, remove unneeded calls.
+  * rendering: Remove unneeded redraw after button release
+  * renderer: Remove unused locked key render function
+  * renderer: Simply cut off when painting outside bounds
+  * renderer: Render whole keyboard the same way as pressed buttons
+
+  [ Mark Müller ]
+  * layout: add German wide layout
+
+  [ Dorota Czaplejewicz ]
+  * renderer: Remove unused functions
+  * cleanup: Remove references to squeek_view
+  * cleanup: Unbox View and Row
+  * cleanup: Remove unused single frame draw
+  * positioning: Calculate sizes instead of storing, move position out of widgets
+  * positioning: Clean up unused code
+  * Fix old Rust woes
+
+  [ Mark Müller ]
+  * layout: add Japanese Kana wide layout
+
+  [ Dorota Czaplejewicz ]
+  * Entry test: Add Terminal input purpose
+  * readme: Add note about Cargo dependencies
+  * Create a library/UI module separation
+  * hacking: Add DCO and licensing requirement
+  * Fix internal .md link
+
+  [ Mark Müller ]
+  * squeekboard-test-layout: add argument parsing and some more output
+
+  [ Dorota Czaplejewicz ]
+  * Use clap in the lockfile
+  * parsing: Remove bounds which weren't used anyway
+  * layout: Respect margins
+  * CI: Build arm64 .deb
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 23 Dec 2019 11:58:57 +0000
+
+squeekboard (1.4.0) amber-phone; urgency=medium
+
+  * "text" property in layouts
+  * Adjusts to user's color scheme
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Dec 2019 19:37:01 +0000
+
+squeekboard (1.3.2) amber-phone; urgency=medium
+
+  * Make sure all key presses get accepted by the compositor
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 26 Nov 2019 15:36:27 +0000
+
+squeekboard (1.3.1) amber-phone; urgency=medium
+
+  * Update and fix layouts and languages
+  * Make tests less likely to fail
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 20 Nov 2019 22:10:48 +0000
+
+squeekboard (1.3.0) amber-phone; urgency=medium
+
+  * Language selection popup
+  * Swedish and Finnish layouts
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 16 Nov 2019 15:38:14 +0000
+
 squeekboard (1.2.2) amber-phone; urgency=medium
 
   * Landscape mode

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!")

debian/control

@@ -9,26 +9,49 @@ Build-Depends:
  ninja-build,
  pkg-config,
  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,
+ librust-glib+v2-44-dev,
+ librust-glib-sys-dev,
+ librust-gtk+v3-22-dev (>= 0.5),
+ librust-gtk-sys-dev,
  librust-maplit-1-dev (>= 1.0),
+ librust-regex-1-dev (>= 1.1),
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
  librust-xkbcommon-0.4+wayland-dev (>= 0.4),
  libwayland-dev (>= 1.16),
+ lsb-release,
  rustc,
  wayland-protocols (>= 1.14),
-# for running the tests
- xvfb,
- xauth,
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
 
 Package: squeekboard
 Architecture: linux-any
 Depends:
- ${shlibs:Depends}
- ${misc:Depends}
+# for the Adwaita-dark theme
+ gnome-themes-extra-data,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks:
+ librem5-base (<< 24),
 Description: On-screen keyboard for Wayland
  Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
+
+Package: squeekboard-devel
+Architecture: linux-any
+Depends:
+ python3,
+ python3-gi,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Resources for making Squeekboard layouts
+ Tools for creating and testing Squeekboard layouts:
+ .
+  * squeekboard-entry
+  * squeekboard-test-layout

debian/copyright

@@ -8,6 +8,83 @@ Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
            2019 Purism SPC
 License: GPL-3+
 
+Files: cargo.sh
+Copyright: 2019 Bart Ribbers <bribbers@disroot.org>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/style.css
+       data/squeekboard.gresources.xml
+       data/meson.build
+       src/meson.build
+       src/imservice.c
+Copyright: 2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: data/keyboards/de.yaml
+Copyright: 2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+
+
+Files: data/keyboards/el.yaml
+Copyright: 2019 Antonis Tsolomitis
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/keyboards/es.yaml
+Copyright: 2019 Purism SPC
+           2019 uzanto <miguejim@mailbox.org>
+License: GPL-3+
+
+Files: data/keyboards/fi.yaml
+Copyright: 2019 uzanto <miguejim@mailbox.org>
+License: GPL-3+
+
+Files: data/keyboards/it.yaml
+Copyright: 2019 Antonio Pandolfo <ant.pandolfo@gmail.com>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/keyboards/ja+kana.yaml
+Copyright: 2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+
+
+Files: data/keyboards/se.yaml
+Copyright: 2019 Andreas Rönnquist <andreas@ronnquist.net>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: eek/eek-layout.h
+       eek/eek-layout.c
+       eek/eek-element.c
+       eek/eek-gtk-keyboard.c
+       eek/eek-gtk-keyboard.h
+       eek/eek.c
+       eek/eek-xml-layout.h
+       eek/eek-xml-layout.c
+       eek/eek-renderer.h
+       eek/eek-element.h
+       eek/eek-renderer.c
+       eekboard/eekboard-service.c
+       eekboard/eekboard-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2018-2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: eek/eek-keyboard.c
+       eek/eek-types.h
+       eek/eek-types.c
+       eek/eek-keyboard.h
+       eek/eek.h
+       src/server-main.c
+       src/server-context-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+License: LGPL-2+
+
 Files: eek/layersurface.c
        src/wayland.c
        src/key-emitter.c
@@ -21,39 +98,51 @@ Files: eekboard/keymap.c
 Copyright: 2000 Red Hat, Inc.
            2019 Purism, SPC
 License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
 
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- Lesser General Public License for more details.
+Files: eekboard/eekboard-context-service.c
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism, SPC
+           2019 David Heidelberg <david@ixit.cz>
+           2019 Piotr Tworek <tworaz@tworaz.net>
+           2019 Squeekboard Contributors
+License: GPL-3+
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+Files: eekboard/eekboard-context-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+License: GPL-3+
+
+Files: po/POTFILES.skip
+       po/LINGUAS
+       po/ja.po
+       po/POTFILES.in
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+License: LGPL-2+
+Comment:
+ Only the po/ja.po file contains a license, but these are all grouped together.
 
 Files: protocols/wlr-layer-shell-unstable-v1.xml
-Copytight: Copyright © 2017 Drew DeVault
+Copyright: 2017 Drew DeVault
 License: X11
- Permission to use, copy, modify, distribute, and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and fthat both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of the copyright holders not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  The copyright holders make
- no representations about the suitability of this software for any
- purpose.  It is provided "as is" without express or implied warranty.
- .
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: src/resources.rs
+Copyright: 2019 Andreas Rönnquist <andreas@ronnquist.net>
+           2019 Mark Müller <markmueller86@gmail.com>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: src/server-context-service.c
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: tests/meson.build
+Copyright: 2019 Purism SPC
+           2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+
 
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
@@ -71,3 +160,36 @@ License: GPL-3+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+License: X11
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the copyright holders not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  The copyright holders make
+ no representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied warranty.
+ .
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

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:
-	rm Cargo.lock
-	dh $@ --builddirectory=_build --buildsystem=meson
+override_dh_auto_configure:
+	[ ! -f Cargo.lock ] || rm Cargo.lock
+	dh_auto_configure -- -Dlegacy=$(legacy)
 
 override_dh_autoreconf:

debian/squeekboard-devel.install

@@ -0,0 +1,2 @@
+usr/bin/squeekboard-test-layout /usr/bin
+usr/bin/squeekboard-entry /usr/bin

debian/squeekboard.install

@@ -0,0 +1,2 @@
+tools/squeekboard-restyled usr/bin
+usr/bin/squeekboard /usr/bin

doc/build.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Builds the documentation and places in the selected directory,
+# or the working directory.
+
+set -e
+
+SCRIPT_PATH="$(realpath "$0")"
+DOCS_DIR="$(dirname "$SCRIPT_PATH")"
+
+TARGET_DIR="${1:-./}"
+
+SPHINX=sphinx-build
+
+if [ ! -d $DOCS_DIR/_static ]; then
+    mkdir -p $DOCS_DIR/_static
+fi
+
+if ! which sphinx-build ; then
+    SPHINX=sphinx-build-3
+fi
+$SPHINX -b html "${DOCS_DIR}" "${TARGET_DIR}"

doc/conf.py

@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'squeekboard'
+copyright = 'Squeekboard contributors'
+author = 'Dorota Czaplejewicz'
+
+# The short X.Y version
+version = ''
+# The full version, including alpha/beta/rc tags
+release = ''
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'recommonmark'
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.md'
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path .
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'squeekboarddoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'squeekboard.tex', 'squeekboard Documentation',
+     'Dorota Czaplejewicz', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'squeekboard', 'squeekboard Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'squeekboard', 'squeekboard Documentation',
+     author, 'squeekboard', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+from recommonmark.transform import AutoStructify
+
+def setup(app):
+    app.add_config_value('recommonmark_config', {
+        'enable_auto_toc_tree': True,
+        'auto_toc_tree_section': 'Contents',
+    }, True)
+    app.add_transform(AutoStructify)

doc/hacking.md

@@ -0,0 +1,185 @@
+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.
+
+Notwithstanding 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 behavior,
+- 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 usable,
+- 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 benefiting the user compared to those benefiting regular contributors.
+
+Sending patches
+---------------
+
+By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+
+Development environment
+-----------------------
+
+*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html).
+
+Recent Fedora releases are likely to be tested as well.
+
+### Dependencies
+
+On a Debian based system run
+
+```sh
+sudo apt-get -y install build-essential
+sudo apt-get -y build-dep .
+```
+
+For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+
+Testing
+-------
+
+Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
+
+- the application draws correctly
+- it shows when relevant
+- it changes layouts
+- it changes views
+
+Testing with an application:
+
+```
+python3 tools/entry.py
+```
+
+Testing visibility:
+
+```
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
+```
+
+Testing layouts:
+
+Layouts can be selected using the GNOME Settings application.
+
+```
+# define all available layouts. First one is currently selected.
+$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
+```
+
+Coding
+------
+
+### Project structure
+
+Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
+
+Libraries should:
+
+- not panic due to external surprises, only due to internal inconsistencies
+- pass errors and surprises they can't handle to the callers instead
+- not silence errors and surprises
+
+User interface modules should:
+
+- try to provide safe values whenever they encounter an error
+- do the logging
+- give libraries the ability to report errors and surprises (e.g. via giving them loggers)
+
+### Style
+
+Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors:
+
+- skipping brackets `{}` after every `if()`, `else`, and similar
+
+Bad example:
+
+```
+if (foo)
+  bar();
+```
+
+Good example:
+
+```
+if (foo) {
+  bar();
+}
+```
+
+- mixing tabs and spaces in the same block of code (or config)
+
+Strongly encouraged:
+
+- don't make lines too long. If it's longer than ~80 characters, it's probably unreadable already, and the code needs to be clarified;
+- put operators in the beginning of a continuation line
+
+Bad example:
+
+```
+foobar = verylongexpression +
+    anotherverylongexpression + 
+    yetanotherexpression;
+```
+
+Good example:
+
+```
+foobar = verylongexpression
+    + anotherverylongexpression
+    + yetanotherexpression;
+```
+
+- use `///` for documentation comments in front of definitions and `/*! ... */` for documentation comments in the beginning of modules (see [Rust doc-comments](https://doc.rust-lang.org/reference/comments.html#doc-comments))
+
+If in doubt, check [PEP8](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md), the [kernel coding style](https://www.kernel.org/doc/html/v4.10/process/coding-style.html), or the [Rust style guide](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md).
+
+Maintenance
+-----------
+
+Squeekboard uses Rust & Cargo for some of its dependencies.
+
+Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positional arguments: source directory, and output artifact. So, `cargo test` becomes:
+
+```
+cd build_dir
+sh /source_path/cargo.sh test
+```
+
+### Cargo dependencies
+
+All Cargo dependencies must be selected in the version available in PureOS, and added to the file `debian/control`. Please check with https://software.pureos.net/search_pkg?term=librust .
+
+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 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
+```

doc/index.md

@@ -0,0 +1,27 @@
+Welcome to squeekboard's documentation!
+=======================================
+
+Contents
+--------
+
+* [Tutorial](tutorial.md)
+* [Contributing](hacking.md)
+
+Introduction
+------------
+
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+
+Layouts
+-------
+
+Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
+
+Layouts are created using a text-based format, based on YAML.
+
+TODO: Provide a description of the format.
+
+Contributions
+-------------
+
+Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).

doc/tutorial.md

@@ -0,0 +1,92 @@
+A guide to creating layouts
+===========================
+
+This guide is based on the original Kareema's [forum post](https://forums.puri.sm/t/translations-and-virtual-touch-keyboards-tracking-localization/7669/48).
+
+It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.
+
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+
+## Creating a new layout
+
+Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
+
+### Get one of the existing keyboard layouts
+
+* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
+* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* Take a look and try to understand them :slight_smile:
+
+
+### Creating the keyboard layout
+
+* To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
+* The correct name of the .yaml file can be found with the command 
+
+```
+gsettings get org.gnome.desktop.input-sources sources
+```
+
+The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
+So for example “de.yaml” would be the correct name for the German keyboard layout.
+
+If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
+
+### Testing the layout
+
+Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
+
+You can also use the `test_layout` tool from the -devel package to check it for errors:
+
+```
+# squeekboard_test_layout ./mylayout.yaml
+Test result: OK
+```
+
+## Contributing your changes
+
+If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project.
+
+Above all, your layout should be working, be tested, not break anything, and make sense.
+
+### Fork your own copy of squeekboard
+
+* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
+* Clone your fork locally with `git clone` and use the uri of your forked repo there
+
+### Edit your keyboard and get it merged
+
+* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html)
+* Create a branch: Name it “keyboard-layout-mylanguage” or whatever
+* Checkout your branch, edit your keyboard layout and commit your changes
+* Your layout **must** be correctly named, and in `data/keyboards/`.
+* Your layout **must** pass the `test_layout` tool with zero problems.
+* Your translation **must** be correctly named, and in `data/langs/`.
+* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
+
+### Get it merged
+
+It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard).
+
+* Push the local changes (to the branch of your fork of squeekboard)
+* Create a merge request for the branch to get your changes merged to the official squeekboard git repository
+
+If your changes pass automated tests (CI), then the merge request will be reviewed by the maintainers, and you might be asked to change a thing or two.
+
+## Compiling and running Squeekboard
+
+If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there.
+
+### Compile squeekboard
+
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
+
+### Run squeekboard
+
+* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
+* 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`
+
+Squeekboard can be installed from there as a Debian package, too (that’s what I often do). But beware - there be dragons! You could bork your system with these packages and you should probably disable this repository again after installing what you need - these packages are not meant for production systems (or so I heard :wink: )

eek/eek-0.90.pc.in

@@ -1,30 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: EEK
-Description: A Library to Create Keyboard-like UI
-URL: http://fedorahosted.org/eekboard/
-Version: @VERSION@
-Requires: gobject-2.0 gio-2.0
-Libs: -L${libdir} -leek
-Cflags: -I${includedir}/eek-@EEK_API_VERSION@

eek/eek-element.h

@@ -38,8 +38,6 @@ struct _EekElementClass
     GObjectClass parent_class;
 };
 
-GType        eek_element_get_type              (void) G_GNUC_CONST;
-
 void         eek_element_set_name              (EekElement  *element,
                                                 const gchar *name);
 

eek/eek-enumtypes.c.template

@@ -1,36 +0,0 @@
-/*** BEGIN file-header ***/
-#include "eek.h"
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType
-@enum_name@_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const G@Type@Value values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
-        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
-
-/*** END value-tail ***/

eek/eek-enumtypes.h.template

@@ -1,29 +0,0 @@
-/*** BEGIN file-header ***/
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef __EEK_ENUMTYPES_H__
-#define __EEK_ENUMTYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
-/*** END value-header ***/
-
-/*** BEGIN file-tail ***/
-G_END_DECLS
-
-#endif /* __EEK_ENUMTYPES_H__ */
-/*** END file-tail ***/

eek/eek-gtk-0.90.pc.in

@@ -1,30 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libeek-gtk
-Description: A Library to Create Keyboard-like UI (GTK Support)
-URL: http://fedorahosted.org/eekboard/
-Version: @VERSION@
-Requires: eek-@EEK_API_VERSION@ gtk+-@GTK_API_VERSION@
-Libs: -L${libdir} -leek-gtk
-Cflags: -I${includedir}/eek-@EEK_API_VERSION@

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>
 
@@ -39,32 +35,28 @@
 
 #include "eekboard/eekboard-context-service.h"
 #include "src/layout.h"
+#include "src/submission.h"
 
-enum {
-    PROP_0,
-    PROP_LAST
-};
+#define LIBFEEDBACK_USE_UNSTABLE_API
+#include <libfeedback.h>
 
-/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
-   GdkWindow as the argument */
-#ifndef GDK_DRAWABLE
-#define GDK_DRAWABLE(x) (x)
-#endif
+#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
 
 typedef struct _EekGtkKeyboardPrivate
 {
-    EekRenderer *renderer;
-    LevelKeyboard *keyboard;
+    EekRenderer *renderer; // owned, nullable
+    EekboardContextService *eekboard_context; // unowned reference
+    struct submission *submission; // unowned reference
+
+    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)
 
-static void       render_pressed_button      (GtkWidget *widget, struct button_place *place);
-static void       render_released_button     (GtkWidget *widget,
-                                              const struct squeek_button *button);
-
 static void
 eek_gtk_keyboard_real_realize (GtkWidget      *self)
 {
@@ -85,38 +77,61 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
                             cairo_t   *cr)
 {
     EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (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));
     }
 
-    // render the keyboard without any key activity (TODO: from a cached buffer)
-    eek_renderer_render_keyboard (priv->renderer, cr);
-    // render only a few remaining changes
-    squeek_layout_draw_all_changed(priv->keyboard->layout, EEK_GTK_KEYBOARD(self));
+    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
     return FALSE;
 }
 
+// Units of virtual pixels size
+static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
+    (void)height;
+    if (width < 540) {
+        return ARRANGEMENT_KIND_BASE;
+    }
+    return ARRANGEMENT_KIND_WIDE;
+}
+
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                      GtkAllocation *allocation)
 {
     EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    // check if the change would switch types
+    enum squeek_arrangement_kind new_type = get_type(
+                (uint32_t)(allocation->width - allocation->x),
+                (uint32_t)(allocation->height - allocation->y));
+    if (priv->layout->arrangement != new_type) {
+        priv->layout->arrangement = new_type;
+        uint32_t time = gdk_event_get_time(NULL);
+        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
+    }
 
     if (priv->renderer)
         eek_renderer_set_allocation_size (priv->renderer,
+                                          priv->keyboard->layout,
                                           allocation->width,
                                           allocation->height);
 
@@ -124,12 +139,28 @@ 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);
-
-    squeek_layout_depress(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+    if (!priv->keyboard) {
+        return;
+    }
+    squeek_layout_depress(priv->keyboard->layout,
+                          priv->submission,
                           x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }
 
@@ -137,15 +168,25 @@ 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, priv->keyboard->manager->virtual_keyboard,
-                       x, y, eek_renderer_get_transformation(priv->renderer), time, self);
+    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);
 }
 
 static void release(EekGtkKeyboard *self, guint32 time)
 {
     EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, time, self);
+    if (!priv->keyboard) {
+        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);
 }
 
 static gboolean
@@ -170,6 +211,18 @@ eek_gtk_keyboard_real_button_release_event (GtkWidget      *self,
     return TRUE;
 }
 
+static gboolean
+eek_gtk_keyboard_leave_event (GtkWidget      *self,
+                              GdkEventCrossing *event)
+{
+    if (event->type == GDK_LEAVE_NOTIFY) {
+        // TODO: can the event have different coords than the previous move event?
+        release(EEK_GTK_KEYBOARD(self), event->time);
+    }
+    return TRUE;
+}
+
+
 static gboolean
 eek_gtk_keyboard_real_motion_notify_event (GtkWidget      *self,
                                            GdkEventMotion *event)
@@ -217,11 +270,12 @@ static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
     EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
 
     if (priv->keyboard) {
         squeek_layout_release_all_only(
-            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            priv->keyboard->layout,
+            priv->submission,
             gdk_event_get_time(NULL));
     }
 
@@ -234,6 +288,7 @@ eek_gtk_keyboard_set_property (GObject      *object,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
+    (void)value;
     switch (prop_id) {
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -248,18 +303,24 @@ 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;
     }
 
     if (priv->keyboard) {
         squeek_layout_release_all_only(
-            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            priv->keyboard->layout,
+            priv->submission,
             gdk_event_get_time(NULL));
         priv->keyboard = NULL;
     }
 
+    if (priv->event) {
+        g_clear_object (&priv->event);
+        lfb_uninit ();
+    }
+
     G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }
 
@@ -279,6 +340,9 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
         eek_gtk_keyboard_real_button_release_event;
     widget_class->motion_notify_event =
         eek_gtk_keyboard_real_motion_notify_event;
+    widget_class->leave_notify_event =
+        eek_gtk_keyboard_leave_event;
+
     widget_class->touch_event = handle_touch_event;
 
     gobject_class->set_property = eek_gtk_keyboard_set_property;
@@ -287,128 +351,81 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
-{}
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    g_autoptr(GError) err = NULL;
+
+    if (lfb_init(SQUEEKBOARD_APP_ID, &err))
+        priv->event = lfb_event_new ("button-pressed");
+    else
+        g_warning ("Failed to init libfeedback: %s", err->message);
+
+    GtkIconTheme *theme = gtk_icon_theme_get_default ();
+
+    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
+}
+
+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)
+eek_gtk_keyboard_new (EekboardContextService *eekservice,
+                      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);
 }
 
-static void
-render_pressed_button (GtkWidget *widget,
-                       struct button_place *place)
-{
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
-    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
-/*
-    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
-*/
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
+/**
+ * eek_gtk_keyboard_emit_feedback:
+ *
+ * Emit button press haptic feedback via libfeedack.
+ */
 void
-eek_gtk_render_locked_button (EekGtkKeyboard *self, struct button_place place)
+eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv;
 
-    GdkWindow         *window  = gtk_widget_get_window (GTK_WIDGET(self));
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
+    g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
 
-    eek_renderer_render_button (priv->renderer, cr, &place, 1.0, TRUE);
-
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
-// TODO: does it really redraw the entire keyboard?
-static void
-render_released_button (GtkWidget *widget,
-                        const struct squeek_button *button)
-{
-    (void)button;
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
-    eek_renderer_render_keyboard (priv->renderer, cr);
-
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
-void
-eek_gtk_on_button_pressed (struct button_place place,
-                   EekGtkKeyboard *self)
-{
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    if (!place.row) {
-        return;
+    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);
     }
-    render_pressed_button (GTK_WIDGET(self), &place);
-    gtk_widget_queue_draw (GTK_WIDGET(self));
-
-#if HAVE_LIBCANBERRA
-    ca_gtk_play_for_widget (widget, 0,
-                            CA_PROP_EVENT_ID, "button-pressed",
-                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
-                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
-                            NULL);
-#endif
-}
-
-void
-eek_gtk_on_button_released (const struct squeek_button *button,
-                    struct squeek_view *view,
-                    EekGtkKeyboard *self)
-{
-    (void)view;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_released_button (GTK_WIDGET(self), button);
-    gtk_widget_queue_draw (GTK_WIDGET(self));
-
-#if HAVE_LIBCANBERRA
-    ca_gtk_play_for_widget (widget, 0,
-                            CA_PROP_EVENT_ID, "button-released",
-                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
-                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
-                            NULL);
-#endif
 }

eek/eek-gtk-keyboard.h

@@ -28,7 +28,10 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
+#include "eek/eek-types.h"
+
+struct submission;
+struct squeek_layout_state;
 
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@@ -44,8 +47,8 @@ struct _EekGtkKeyboardClass
     gpointer pdummy[24];
 };
 
-GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
-GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard);
+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 */

eek/eek-keyboard.c

@@ -18,47 +18,93 @@
  * 02110-1301 USA
  */
 
-/**
- * SECTION:eek-keyboard
- * @short_description: Base class of a keyboard
- * @see_also: #EekSection
- *
- * The #EekKeyboardClass class represents a keyboard, which consists
- * of one or more sections of the #EekSectionClass class.
- */
-
 #include "config.h"
-#include <glib/gprintf.h>
 
-#include "eek-enumtypes.h"
-#include "eekboard/eekboard-context-service.h"
-#include "eekboard/key-emitter.h"
-#include "keymap.h"
-#include "src/keyboard.h"
+#define _XOPEN_SOURCE 500
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/random.h> // TODO: this is Linux-specific
+#include <xkbcommon/xkbcommon.h>
 
 #include "eek-keyboard.h"
 
-void level_keyboard_deinit(LevelKeyboard *self) {
-    squeek_layout_free(self->layout);
+
+static void eek_key_map_deinit(struct keymap *self) {
+    if (self->fd < 0) {
+        g_error("Deinit called multiple times on KeyMap");
+    } else {
+        close(self->fd);
+    }
+    self->fd = -1;
+}
+
+static struct keymap eek_key_map_from_str(const char *keymap_str) {
+    struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+    if (!context) {
+        g_error("No context created");
+    }
+
+    struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
+        XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
+
+    if (!keymap)
+        g_error("Bad keymap:\n%s", keymap_str);
+
+    xkb_context_unref(context);
+
+    char *xkb_keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
+    size_t keymap_len = strlen(xkb_keymap_str) + 1;
+
+    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
+    char *r = &path[strlen(path) - 6];
+    if (getrandom(r, 6, GRND_NONBLOCK) < 0)
+        g_error("Failed to get random numbers: %s", strerror(errno));
+    for (unsigned i = 0; i < 6; i++) {
+        r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z
+        r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good...
+    }
+    int keymap_fd = shm_open(path, O_RDWR | O_CREAT | O_EXCL, 0600);
+    if (keymap_fd < 0) {
+        g_error("Failed to set up keymap fd");
+    }
+
+    shm_unlink(path);
+    if (ftruncate(keymap_fd, (off_t)keymap_len)) {
+        g_error("Failed to increase keymap fd size");
+    }
+    char *ptr = mmap(NULL, keymap_len, PROT_WRITE, MAP_SHARED,
+        keymap_fd, 0);
+    if ((void*)ptr == (void*)-1) {
+        g_error("Failed to set up mmap");
+    }
+    strncpy(ptr, xkb_keymap_str, keymap_len);
+    munmap(ptr, keymap_len);
+    free(xkb_keymap_str);
+    xkb_keymap_unref(keymap);
+    struct keymap km = {
+        .fd = keymap_fd,
+        .fd_len = keymap_len,
+    };
+    return km;
 }
 
 void level_keyboard_free(LevelKeyboard *self) {
-    level_keyboard_deinit(self);
+    eek_key_map_deinit(&self->keymap);
+    squeek_layout_free(self->layout);
     g_free(self);
 }
 
-void level_keyboard_init(LevelKeyboard *self, struct squeek_layout *layout) {
-    self->layout = layout;
-}
-
-LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout) {
+LevelKeyboard*
+level_keyboard_new (struct squeek_layout *layout)
+{
     LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
-    level_keyboard_init(keyboard, layout);
-    keyboard->manager = manager;
+    if (!keyboard) {
+        g_error("Failed to create a keyboard");
+    }
+    keyboard->layout = layout;
+    const gchar *keymap_str = squeek_layout_get_keymap(keyboard->layout);
+    keyboard->keymap = eek_key_map_from_str(keymap_str);
     return keyboard;
 }
-
-struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard)
-{
-    return squeek_layout_get_current_view(keyboard->layout);
-}

eek/eek-keyboard.h

@@ -1,17 +1,17 @@
-/* 
+/*
  * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
  * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -28,30 +28,27 @@
 #include <glib-object.h>
 #include <xkbcommon/xkbcommon.h>
 #include "eek-types.h"
-#include "eek-layout.h"
 #include "src/layout.h"
 
 G_BEGIN_DECLS
 
+/// Keymap container for Rust interoperability.
+struct keymap {
+    uint32_t fd; // keymap formatted as XKB string
+    size_t fd_len; // length of the data inside keymap_fd
+};
+
 /// Keyboard state holder
 struct _LevelKeyboard {
     struct squeek_layout *layout; // owned
-    struct xkb_keymap *keymap;
-    int keymap_fd; // keymap formatted as XKB string
-    size_t keymap_len; // length of the data inside keymap_fd
-
-    guint id; // as a key to layout choices
-
-    EekboardContextService *manager; // unowned reference
+    struct keymap keymap; // owned
 };
 typedef struct _LevelKeyboard LevelKeyboard;
 
-gchar *             eek_keyboard_get_keymap
-                                     (LevelKeyboard *keyboard);
+gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
 
-struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard);
-LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
-void level_keyboard_deinit(LevelKeyboard *self);
+LevelKeyboard*
+level_keyboard_new (struct squeek_layout *layout);
 void level_keyboard_free(LevelKeyboard *self);
 
 G_END_DECLS

eek/eek-layout.c

@@ -1,47 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-layout
- * @short_description: Base class of a layout engine
- *
- * The #EekLayout class is a base class of layout engine which
- * arranges keyboard elements.
- */
-
-#include "config.h"
-
-#include "eek-layout.h"
-#include "eek-keyboard.h"
-#include "eekboard/eekboard-context-service.h"
-#include "eek-xml-layout.h"
-
-G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
-
-static void
-eek_layout_class_init (EekLayoutClass *klass)
-{
-    klass->create_keyboard = NULL;
-}
-
-void
-eek_layout_init (EekLayout *self)
-{
-}

eek/eek-layout.h

@@ -1,60 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_LAYOUT_H
-#define EEK_LAYOUT_H 1
-
-#include <glib-object.h>
-#include "eek-types.h"
-#include "src/layout.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_LAYOUT (eek_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
-
-/**
- * EekLayoutClass:
- * @create_keyboard: virtual function for creating a keyboard
- */
-struct _EekLayoutClass
-{
-    /*< private >*/
-    GObjectClass parent_class;
-
-    /*< public >*/
-    LevelKeyboard* (* create_keyboard) (EekboardContextService *manager,
-                                      EekLayout *self,
-                                      gdouble    initial_width,
-                                      gdouble    initial_height);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType        eek_layout_get_type  (void) G_GNUC_CONST;
-
-G_END_DECLS
-#endif  /* EEK_LAYOUT_H */