Added update to cursor when string is committed

Fixed surrounding text not getting updated
Can preedit_string get removed?
2020-10-13 23:39:27 +02:00 · 2020-10-13 22:43:36 +02:00 · 2020-10-13 22:24:54 +02:00 · 2020-10-12 12:45:13 +00:00 · 2020-10-12 10:51:23 +00:00 · 2020-10-12 10:51:23 +00:00
206 changed files with 17450 additions and 11894 deletions
@@ -1,54 +1,9 @@
-*.la
-*.lo
-*.loT
-*.o
-*.so
+.zanata-cache/
+_build
+TAGS
+tags
+vgdump
+*.swp
 *~
-Makefile
-Makefile.in
-.deps
-.libs
-INSTALL
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-libkeyactor*.tar.*
-mkinstalldirs
-m4/*.m4
-gtk-doc.make
-eek/eek-special-keysym-labels.h
-eek/eek-unicode-keysym-labels.h
-eek/eek-keyname-keysym-labels.h
-eek/*.pc
-tests/eek-simple-test
-tests/eek-xkb-test
-src/eekboard
-docs/reference/eek/*.stamp
-docs/reference/eek/*.txt
-!/docs/reference/eek/eek-sections.txt
-docs/reference/eek/xml
-docs/reference/eek/html
-docs/reference/eek/eek.signals
-docs/reference/eek/eek.args
-docs/reference/eek/eek.hierarchy
-docs/reference/eek/eek.interfaces
-docs/reference/eek/eek.prerequisites
-po/*.gmo
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
-
+\#*#
+.\#*
@@ -0,0 +1,149 @@
+image: debian:bullseye
+
+stages:
+  - build
+  - test
+
+.tags: &tags
+  tags:
+    - librem5
+
+before_script:
+  - apt-get -y update
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - apt-get -y update
+
+build_docs:
+  <<: *tags
+  stage: build
+  artifacts:
+    paths:
+      - _build
+  script:
+      - apt-get -y install python3-pip python3-sphinx
+      - pip3 install recommonmark
+      - ./doc/build.sh _build
+
+build_meson:
+  tags:
+    - librem5
+  stage: build
+  artifacts:
+    paths:
+      - _build
+    expire_in: 3h
+  script:
+    - apt-get -y build-dep .
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - ninja -C _build install
+
+build_deb:
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:amber:
+    image: pureos/amber
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:buster:
+    image: "debian:buster"
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+
+build_deb:arm64:
+    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 .
+
+test_lintian:
+    <<: *tags
+    stage: test
+    dependencies:
+        - build_deb
+    script:
+        - apt-get -y install lintian
+        - lintian *.deb
+
+test:
+  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
@@ -1,6 +1,5 @@
-eekboard is written by Daiki Ueno <ueno@unixuser.org>
+squeekboard is written by Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> on behlf of Purism, SPC.
+eekboard was written by Daiki Ueno <ueno@unixuser.org>

-Cairo keyboard drawing functions are borrowed from the libgnomekbd
-library by Sergey V. Udaltsov <svu@gnome.org>.  See the comments in
-eek/eek-drawing.c for detail.
+For more details, see the debian/copyright file.

@@ -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"]
@@ -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"]
@@ -0,0 +1,486 @@
+# 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.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.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.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "memmap"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.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.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)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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.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)",
+ "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.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "xkbcommon"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[metadata]
+"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 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.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
@@ -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
@@ -1,20 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = eek src tests docs po
@@ -1,29 +0,0 @@
-eekboard - a virtual keyboard for GNOME -*- outline -*-
-
-eekboard is a virtual keyboard software package which ships with a
-standalone virtual keyboard application ("eekboard"), and a library to
-create keyboard-like UI ("libeek").
-
-* Requirements
-
-  * GLib2, GTK2, Cairo, Pango, Libxklavier...
-  * Clutter (optional)
-  * Clutter-Gtk (optional)
-
-* How to test
-
-If you build from git repo:
-
-  $ git clone git://github.com/ueno/eekboard.git
-  $ cd eekboard
-  $ ./autogen.sh --prefix=/usr --enable-gtk-doc
-
-Otherwise start from here:
-
-  $ ./configure
-  $ make
-  $ sudo make install
-  $ eekboard
-
-*NOTE* some version combination of Clutter & Clutter-Gtk does not
-cooperate well.  Try "EEKBOARD_DISABLE_CLUTTER=1 eekboard"
@@ -0,0 +1,72 @@
+*squeekboard* - a Wayland virtual keyboard
+========================================
+
+*Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.
+
+It squeaks because some Rust got inside.
+
+Features
+--------
+
+### Present
+
+- GTK3
+- Custom yaml-defined keyboards
+- DBus interface to show and hide
+- Use Wayland input method protocol to show and hide
+- Use Wayland virtual keyboard protocol
+
+### Temporarily dropped
+
+- A settings interface
+
+### TODO
+
+- Use Wayland input method protocol
+- Pick up DBus interface files from /usr/share
+
+Building
+--------
+
+### Dependencies
+
+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
+```
+
+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 [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
@@ -1,12 +0,0 @@
- packaging
-- GIR
-- .spec
-- debian
-- add more tests
-
- eekboard
-- a11y
-
- libeek
-- matchbox-keyboard layout engine
-- delay initialization of XKB and XKL layouts
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="eekboard"
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/README ) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
-REQUIRED_AUTOMAKE_VERSION=1.8
-
-. gnome-autogen.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script manages Cargo operations
+# 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")"
+
+CARGO_TARGET_DIR="$(pwd)"
+export CARGO_TARGET_DIR
+
+cd "$SOURCE_DIR"
+
+# 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 "$@"
+
@@ -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
@@ -1,106 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-AC_INIT([eekboard], [0.0.1], [ueno@unixuser.org])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_PREREQ(2.63)
-AM_INIT_AUTOMAKE
-AM_PROG_CC_C_O
-AC_CONFIG_MACRO_DIR([m4])
-LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
-
-PKG_CHECK_MODULES([GLIB2], [glib-2.0], ,
-  [AC_MSG_ERROR([GLib2 not found])])
-PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0], ,
-  [AC_MSG_ERROR([GObject2 not found])])
-PKG_CHECK_MODULES([CAIRO], [cairo], ,
-  [AC_MSG_ERROR([Cairo not found])])
-PKG_CHECK_MODULES([PANGO], [pango], ,
-  [AC_MSG_ERROR([Pango not found])])
-PKG_CHECK_MODULES([GTK2], [gtk+-2.0 gdk-2.0], ,
-  [AC_MSG_ERROR([GTK2 not found])])
-PKG_CHECK_MODULES([XKB], [x11], ,
-  [AC_MSG_ERROR([XKB support not found])])
-PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier x11], ,
-  [AC_MSG_ERROR([Libxklavier not found])])
-PKG_CHECK_MODULES([LIBFAKEKEY], [libfakekey], ,
-  [AC_MSG_ERROR([libfakekey not found])])
-
-AC_MSG_CHECKING([whether you enable eekboard])
-AC_ARG_ENABLE(eekboard,
-              AS_HELP_STRING([--enable-eekboard=no/yes],
-                             [Build standalone application "ekboard" default=yes]),,
-              enable_eekboard=yes)
-AC_MSG_RESULT($enable_eekboard)
-AM_CONDITIONAL(ENABLE_EEKBOARD, [test x$enable_eekboard = xyes])
-
-AC_MSG_CHECKING([whether you enable Clutter])
-AC_ARG_ENABLE(clutter,
-              AS_HELP_STRING([--enable-clutter=no/yes],
-                             [Enable Clutter user interface default=yes]),,
-              enable_clutter=yes)
-AC_MSG_RESULT($enable_clutter)
-
-if test x$enable_clutter = xyes; then
-  PKG_CHECK_MODULES([CLUTTER], [clutter-1.0], ,
-    [AC_MSG_ERROR([Clutter not found -- install it or add --disable-clutter])])
-  AC_DEFINE([HAVE_CLUTTER], [1], [Define if Clutter is found])
-  PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-0.90],
-    [enable_clutter_gtk=yes])
-  if test x$enable_clutter_gtk = xno; then
-    PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-0.10],
-      [enable_clutter_gtk=yes])
-  fi
-  if test x$enable_clutter_gtk = xyes; then
-    AC_DEFINE([HAVE_CLUTTER_GTK], [1], [Define if Clutter-Gtk is found])
-  fi
-fi
-AM_CONDITIONAL(HAVE_CLUTTER, [test x$enable_clutter = xyes])
-AM_CONDITIONAL(HAVE_CLUTTER_GTK, [test x$enable_clutter_gtk = xyes])
-
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-
-EEK_API_VERSION=0.1
-AC_SUBST(EEK_API_VERSION)
-
-dnl to re-generate eek/*-keysym-labels.txt
-AC_CHECK_PROGS([PYTHON], [python])
-
-dnl define GETTEXT_* variables
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
-AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR(EEKBOARD_LOCALEDIR)
-
-AC_CONFIG_HEADERS([eek/config.h])
-AC_CONFIG_FILES([Makefile
-eek/Makefile
-src/Makefile
-tests/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/eek/Makefile
-po/Makefile.in
-eek/libeek.pc
-eek/libeek-clutter.pc
-eek/libeek-gtk.pc
-eek/libeek-xkb.pc
-eek/libeek-xkl.pc])
-AC_OUTPUT
@@ -0,0 +1,20 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="sm.puri.OSK0">
+    <method name="SetVisible">
+      <arg name="visible" type="b" direction="in"/>
+      <doc:doc><doc:description>
+        Switch keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <method name="GetVisible">
+      <arg name="visible" type="b" direction="out"/>
+      <doc:doc><doc:description>
+        Get keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <property name="Visible" type="b" access="read">
+    </property>
+  </interface>
+</node>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
+             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
+             C 19,13 20,12 20,10 L 20,1 Z"
+          stroke="none" fill="black" />
+</svg>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
+          stroke="none" fill="black" />
+</svg>
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4043"
+   version="1.1"
+   viewBox="0 0 4.2333331 4.2333093"
+   height="4.2333093mm"
+   width="4.2333331mm">
+  <defs
+     id="defs4037" />
+  <metadata
+     id="metadata4040">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-86.329776,-68.097636)"
+     id="layer1">
+    <g
+       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
+       id="g842">
+      <g
+         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+         id="g836">
+        <path
+           id="path5166"
+           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
+         id="circle5168" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
+         id="path5170" />
+    </g>
+  </g>
+</svg>
@@ -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"
@@ -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"
@@ -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: ":"
@@ -0,0 +1,82 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "Q W E R T Z U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "äÄ"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
@@ -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"
@@ -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: "°"
@@ -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: ""
@@ -0,0 +1,87 @@
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? period Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ¿ period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    eschars:
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
+        - "show_letters show_eschars preferences         space        « » Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "default"
+        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: "áÁ"
+
+    period:
+        outline: "default"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+
@@ -0,0 +1,171 @@
+---
+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"
+        - "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   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: "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"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    ouml:
+        text: "ö"
+    Ouml:
+        text: "Ö"
+    auml:
+        text: "ä"
+    Auml:
+        text: "Ä"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    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: "]"
+
@@ -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"
@@ -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"
@@ -0,0 +1,191 @@
+# Greek layout created by Antonis Tsolomitis
+# University of the Aegean, Department of Mathematics, atsol@aegean.gr
+# Sep 2019
+---
+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:
+        - "; ς ε ρ τ υ θ ι ο π !"
+        - "α σ δ φ γ η ξ κ λ show_accented"
+        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
+        - "show_numbers preferences space period Return"
+    upper:
+        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ · BackSpace"
+        - "show_numbers preferences space « » Return"
+    accented:
+        - "ά έ ή ί ό ύ ώ ϊ ϋ ΐ"
+        - "ΰ Ά Έ Ή Ί Ό Ύ Ώ Ϊ show_base"
+        - "Ϋ Ϗ ϐ ϑ ϕ ϖ ϗ – — BackSpace"
+        - "show_numbers preferences space quoteleft quoteright Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
+        - "show_letters preferences space period 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"
+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: "ΑΒΓ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_accented:
+        action:
+            locking:
+                lock_view: "accented"
+                unlock_view: "base"
+        outline: "altline"
+        label: "άΐ"
+    show_base:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "αι"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    oslash:
+        text: "ø"
+    Oslash:
+        text: "Ø"
+    ae:
+        text: "æ"
+    AE:
+        text: "Æ"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    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: "]"
+
@@ -0,0 +1,90 @@
+# Italian layout created by Antonio Pandolfo
+# 03 october 2019
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
+    eschars:
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò « » ù ! { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        « » Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "default"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "àè"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"
@@ -0,0 +1,525 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    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
+        - "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: ",.?"
@@ -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: ",.?"
@@ -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: "°"
+
@@ -0,0 +1,39 @@
+---
+outlines:
+    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:
+        - "1 2 3 parenleft parenright"
+        - "4 5 6 numbersign asterisk"
+        - "7 8 9 plus minus"
+        - "BackSpace 0 space Return"
+
+buttons:
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    numbersign:
+        text: "#"
+    minus:
+        text: "-"
+    plus:
+        text: "+"
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+
@@ -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: ":"
@@ -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: ":"
@@ -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"
@@ -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: "]"
@@ -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"
+
@@ -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"
@@ -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"
@@ -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        period Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: show_prefs
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
@@ -0,0 +1,78 @@
+---
+outlines:
+    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        . 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   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
@@ -0,0 +1,2 @@
+emoji Emoji
+terminal Terminal
@@ -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
@@ -0,0 +1,2 @@
+emoji emoji
+terminal terminal
@@ -0,0 +1,11 @@
+de Немецкий
+es Испанский
+fi Финский
+gr Греческий
+it Итальянский
+no Норвежский
+pl Польский
+ru Русский
+se Шведский
+terminal Терминал
+us Английский (США)
@@ -0,0 +1,26 @@
+gnome = import('gnome')
+
+squeekboard_resources = gnome.compile_resources(
+   'squeekboard-resources',
+   'squeekboard.gresources.xml',
+
+   c_name: 'squeekboard',
+)
+
+desktopconf = configuration_data()
+desktopconf.set('bindir', bindir)
+
+desktop_file = 'sm.puri.Squeekboard.desktop'
+
+i18n.merge_file('desktop',
+    input: configure_file(
+      input: desktop_file + '.in.in',
+      output: desktop_file + '.in',
+      configuration: desktopconf
+    ),
+    output: desktop_file,
+    po_dir: '../po',
+    install: true,
+    install_dir: desktopdir,
+    type: 'desktop'
+)
@@ -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>
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Squeekboard
+GenericName=Squeekboard Virtual Keyboard
+Comment=Virtual Keyboard
+Exec=@bindir@/squeekboard
+Terminal=false
+Type=Application
+NoDisplay=true
+Categories=GTK;Utility;
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/sm/puri/squeekboard">
+   <file compressed="true">style.css</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>
+  </gresource>
+</gresources>
@@ -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;
+}
@@ -0,0 +1,58 @@
+sq_view {
+    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: @theme_fg_color; /*#deddda;*/
+    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
+    border-style: solid;
+    border-width: 1px;
+    border-color: @borders; /* #5e5c64;*/
+    border-radius: 3px;
+    margin: 4px 2px 4px 2px;
+}
+
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
+}
+
+sq_button:active,
+sq_button.altline:active,
+sq_button.special:active,
+sq_button.wide:active {
+    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
+    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
+}
+
+sq_button.altline,
+sq_button.special,
+sq_button.wide {
+    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
+    border-color: @borders; /* #3e3a44; */
+}
+
+sq_button.locked {
+    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: @theme_selected_bg_color; /* #1c71d8; */
+    border-color: @borders; /*#1a5fb4;*/
+}
+
+#Return:active {
+    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
+    border-color: @borders; /*#3584e4;*/
+}
@@ -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.
+
+
@@ -0,0 +1,12 @@
+# When modifying this file, consider instead
+# to take advantage of the method that Cargo packagers use
+# to set up all the necessary stuff automatically:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907629#30
+
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '/usr/share/cargo/registry'
+
@@ -0,0 +1,349 @@
+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
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 30 Oct 2019 12:38:39 +0000
+
+squeekboard (1.2.1) amber-phone; urgency=medium
+
+  * Use different distribution
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 08 Oct 2019 10:56:10 +0000
+
+squeekboard (1.2.0) unstable; urgency=medium
+
+  * Use Cargo-based dependencies
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 24 Sep 2019 10:42:15 +0000
+
+squeekboard (1.1.0) unstable; urgency=medium
+
+  * Use new keyboard layout format
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Sep 2019 10:12:02 +0000
+
+
+squeekboard (1.0.10) unstable; urgency=medium
+
+  * Use a shared DBus definition
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 02 Jul 2019 20:12:02 +0000
+
+squeekboard (1.0.9) unstable; urgency=medium
+
+  * Initial release.
+
+ -- David Boddie <david.boddie@puri.sm>  Tue, 25 Jun 2019 19:33:00 +0200
@@ -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!")
@@ -0,0 +1 @@
+10
@@ -0,0 +1,57 @@
+Source: squeekboard
+Section: x11
+Priority: optional
+Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
+Build-Depends:
+ cargo,
+ debhelper (>= 10),
+ meson (>=0.51.0),
+ ninja-build,
+ pkg-config,
+ libglib2.0-dev,
+ libgnome-desktop-3-dev,
+ libgtk-3-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),
+Standards-Version: 4.1.3
+Homepage: https://source.puri.sm/Librem5/squeekboard
+
+Package: squeekboard
+Architecture: linux-any
+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
@@ -0,0 +1,195 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: squeekboard
+Source: https://source.puri.sm/Librem5/squeekboard
+
+Files: *
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           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
+       meson.build
+       src/meson.build
+       po/meson.build
+Copyright: 2018-2019 Purism SPC
+License: GPL-3+
+
+Files: eekboard/keymap.c
+Copyright: 2000 Red Hat, Inc.
+           2019 Purism, SPC
+License: LGPL-2+
+
+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+
+
+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
+Copyright: 2017 Drew DeVault
+License: X11
+
+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
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ 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.
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+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
+override_dh_auto_configure:
+	[ ! -f Cargo.lock ] || rm Cargo.lock
+	dh_auto_configure -- -Dlegacy=$(legacy)
+
+override_dh_autoreconf:
@@ -0,0 +1 @@
+3.0 (native)
@@ -0,0 +1,2 @@
+usr/bin/squeekboard-test-layout /usr/bin
+usr/bin/squeekboard-entry /usr/bin
@@ -0,0 +1,2 @@
+tools/squeekboard-restyled usr/bin
+usr/bin/squeekboard /usr/bin
@@ -0,0 +1,2 @@
+# yaml-rust 0.4.3 shares some roots with libyaml, including the string which lintian checks, creating a false positive
+squeekboard binary: embedded-library usr/bin/squeekboard: libyaml
@@ -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}"
@@ -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)
@@ -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
+```
@@ -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).
@@ -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: )
@@ -1,19 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-SUBDIRS = reference
@@ -1,19 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-SUBDIRS = eek
@@ -1,135 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=eek
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../eek
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/eek/*.h
-CFILE_GLOB=$(top_srcdir)/eek/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= eek-private.h \
-	eek-drawing.h \
-	eek-clutter-key.h \
-	eek-clutter-section.h \
-	eek-clutter-key-actor.h \
-	eek-clutter-drawing-context.h \
-	config.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=eek-overview.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=eek-overview.xml
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS = $(GOBJECT2_CFLAGS)
-GTKDOC_LIBS = $(top_srcdir)/eek/libeek.la \
-	$(top_srcdir)/eek/libeek-gtk.la \
-	$(top_srcdir)/eek/libeek-xkb.la \
-	$(top_srcdir)/eek/libeek-xkl.la \
-	$(GOBJECT2_LIBS) \
-	$(XKB_LIBS)
-
-if HAVE_CLUTTER
-GTKDOC_LIBS += $(top_srcdir)/eek/libeek-clutter.la $(CLUTTER_LIBS)
-endif
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
-
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc) &&
-#TESTS = $(GTKDOC_CHECK)
-endif
-
-include $(top_srcdir)/gtk-doc.mk
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<book id="index">
-  <bookinfo>
-    <title>libeek Reference Manual</title>
-    <releaseinfo>
-      for libeek 0.0.1.
-    </releaseinfo>
-    <copyright>
-      <year>2010</year>
-      <holder>Daiki Ueno</holder>
-    </copyright>
-
-    <copyright>
-      <year>2010</year>
-      <holder>Red Hat, Inc.</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation License,
-	Version 1.3 or any later version published by the Free Software
-	Foundation; with no Invariant Sections, no Front-Cover Texts and
-	no Back-Cover Texts.  A copy of the license is included in the
-	section entitled "GNU Free Documentation License".
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <xi:include href="xml/eek-overview.xml"/>
-  <part id="apireference">
-    <title>API Manual</title>
-    <chapter>
-      <title>Base Classes, Interfaces, and Utilities</title>
-      <xi:include href="xml/eek-element.xml"/>
-      <xi:include href="xml/eek-container.xml"/>
-      <xi:include href="xml/eek-keyboard.xml"/>
-      <xi:include href="xml/eek-section.xml"/>
-      <xi:include href="xml/eek-key.xml"/>
-      <xi:include href="xml/eek-layout.xml"/>
-      <xi:include href="xml/eek-types.xml"/>
-      <xi:include href="xml/eek-keysym.xml"/>
-    </chapter>
-    <chapter>
-      <title>Clutter Keyboard</title>
-      <xi:include href="xml/eek-clutter-keyboard.xml"/>
-    </chapter>
-    <chapter>
-      <title>GTK Keyboard</title>
-      <xi:include href="xml/eek-gtk-keyboard.xml"/>
-    </chapter>
-    <chapter>
-      <title>Libxklavier Layout Engine</title>
-      <xi:include href="xml/eek-xkl-layout.xml"/>
-    </chapter>
-    <chapter>
-      <title>XKB Layout Engine</title>
-      <xi:include href="xml/eek-xkb-layout.xml"/>
-    </chapter>
-    <chapter id="object-tree">
-      <title>Object Hierarchy</title>
-      <xi:include href="xml/tree_index.sgml"/>
-    </chapter>
-    <index id="api-index-full">
-      <title>API Index</title>
-      <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-    </index>
-  </part>
-</book>
@@ -1,60 +0,0 @@
-<part id="eek-overview">
-  <title>Usage Overview</title>
-  <partintro>
-
-    <para>libeek is a library to create keyboard-like user interface.
-    Since it is designed as simple as possible, it provides only two
-    kinds of objects.  One is <emphasis>keyboard element</emphasis>
-    (derived from #EekElement) and another is <emphasis>keyboard
-    layout engine</emphasis> (which implements the #EekLayout
-    interface).</para>
-
-    <para>A keyboard element represents either a keyboard
-    (#EekKeyboard), a section (#EekSection), or a key (#EekKey).  Each
-    element implements the Builder design pattern so that it can be
-    converted into a UI widget (#ClutterActor, #GtkDrawingArea,
-    aso).</para>
-
-    <para>A layout engine arranges keyboard elements using information
-    from external configuration mechanisms (libxklavier, XKB,
-    matchbox-keyboard layouts in XML, aso)</para>
-
-    <para>Here is a sample code which creates a keyboard-like #ClutterActor using the system keyboard layout using libxklavier:</para>
-
-    <informalexample>
-      <programlisting>
-EekKeyboard *keyboard;
-EekLayout *layout;
-
-/* Create a keyboard layout using libxklavier configuration. */
-layout = eek_xkl_layout_new ();
-
-/* Create a keyboard implemented as ClutterActor. */
-keyboard = eek_clutter_keyboard_new ();
-
-/* Apply the layout to the keyboard. */
-eek_keyboard_set_layout (keyboard, layout);
-
-clutter_group_add (CLUTTER_GROUP(stage),
-                   eek_clutter_keyboard_get_actor (EEK_CLUTTER_KEYBOARD(keyboard)));
-      </programlisting>
-    </informalexample>
-
-    <para>One of the most interesting features of libeek is that UI
-    backends can be switched easily.  For example, to create a
-    keyboard-like #GtkWidget instead of #ClutterActor, all you need is
-    to replace eek_clutter_keyboard_new() with eek_gtk_keyboard_new()
-    and eek_clutter_keyboard_get_actor() with
-    eek_gtk_keyboard_get_widget().</para>
-
-    <para>There is logical represention (model) of keyboard distinct from the UI widget (view).  More precisely, a keyboard is represented as a tree of #EekElement -- #EekKeyboard contains one or more #EekSection's and #EekSection contains one or more #EekKey's.  Each element can be  event source when user events on the UI widget occurs.  For example, with the following code, when a user pushed a key widget with keycode 0x38 assigned, on_a_pressed will be called.</para>
-    <informalexample>
-      <programlisting>
-/* Find a key element in the logical keyboard. */
-EekKey *key = eek_keyboard_find_key_by_keycode (keyboard, 0x38);
-g_signal_connect (key, "pressed", on_a_pressed);
-      </programlisting>
-    </informalexample>
-    <para>In this way, application developers do not need to know the differences between the underlying UI widgets after creation.</para>
-  </partintro>
-</part>
@@ -1,243 +0,0 @@
-<SECTION>
-<FILE>eek-keyboard</FILE>
-<TITLE>EekKeyboard</TITLE>
-EekKeyboardClass
-EekKeyboardPrivate
-EekKeyboard
-eek_keyboard_set_keysym_index
-eek_keyboard_get_keysym_index
-eek_keyboard_create_section
-eek_keyboard_set_layout
-eek_keyboard_realize
-eek_keyboard_find_key_by_keycode
-<SUBSECTION Standard>
-EEK_KEYBOARD
-EEK_IS_KEYBOARD
-EEK_TYPE_KEYBOARD
-eek_keyboard_get_type
-EEK_KEYBOARD_CLASS
-EEK_IS_KEYBOARD_CLASS
-EEK_KEYBOARD_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-layout</FILE>
-<TITLE>EekLayout</TITLE>
-EekLayoutIface
-EekLayout
-eek_layout_apply
-eek_layout_get_group
-<SUBSECTION Standard>
-EEK_LAYOUT
-EEK_IS_LAYOUT
-EEK_TYPE_LAYOUT
-eek_layout_get_type
-EEK_LAYOUT_GET_IFACE
-</SECTION>
-
-<SECTION>
-<FILE>eek-gtk-keyboard</FILE>
-<TITLE>EekGtkKeyboard</TITLE>
-EekGtkKeyboard
-EekGtkKeyboardClass
-EekGtkKeyboardPrivate
-eek_gtk_keyboard_new
-eek_gtk_keyboard_get_widget
-<SUBSECTION Standard>
-EEK_GTK_KEYBOARD
-EEK_IS_GTK_KEYBOARD
-EEK_TYPE_GTK_KEYBOARD
-eek_gtk_keyboard_get_type
-EEK_GTK_KEYBOARD_CLASS
-EEK_IS_GTK_KEYBOARD_CLASS
-EEK_GTK_KEYBOARD_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-section</FILE>
-<TITLE>EekSection</TITLE>
-EekSectionClass
-EekSectionPrivate
-EekSection
-eek_section_set_angle
-eek_section_get_angle
-eek_section_get_n_rows
-eek_section_add_row
-eek_section_get_row
-eek_section_create_key
-eek_section_find_key_by_keycode
-<SUBSECTION Standard>
-EEK_SECTION
-EEK_IS_SECTION
-EEK_TYPE_SECTION
-eek_section_get_type
-EEK_SECTION_CLASS
-EEK_IS_SECTION_CLASS
-EEK_SECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-container</FILE>
-<TITLE>EekContainer</TITLE>
-EekContainerClass
-EekContainerPrivate
-EekCallback
-EekCompareFunc
-EekContainer
-eek_container_foreach_child
-eek_container_find
-eek_container_find_by_position
-<SUBSECTION Standard>
-EEK_CONTAINER
-EEK_IS_CONTAINER
-EEK_TYPE_CONTAINER
-eek_container_get_type
-EEK_CONTAINER_CLASS
-EEK_IS_CONTAINER_CLASS
-EEK_CONTAINER_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter-keyboard</FILE>
-<TITLE>EekClutterKeyboard</TITLE>
-EekClutterKeyboard
-EekClutterKeyboardClass
-EekClutterKeyboardPrivate
-eek_clutter_keyboard_new
-eek_clutter_keyboard_get_actor
-<SUBSECTION Standard>
-EEK_CLUTTER_KEYBOARD
-EEK_IS_CLUTTER_KEYBOARD
-EEK_TYPE_CLUTTER_KEYBOARD
-eek_clutter_keyboard_get_type
-EEK_CLUTTER_KEYBOARD_CLASS
-EEK_IS_CLUTTER_KEYBOARD_CLASS
-EEK_CLUTTER_KEYBOARD_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkl-layout</FILE>
-<TITLE>EekXklLayout</TITLE>
-EekXklLayout
-EekXklLayoutClass
-EekXklLayoutPrivate
-eek_xkl_layout_new
-eek_xkl_layout_set_config
-eek_xkl_layout_set_model
-eek_xkl_layout_set_layouts
-eek_xkl_layout_set_variants
-eek_xkl_layout_set_options
-eek_xkl_layout_get_model
-eek_xkl_layout_get_layouts
-eek_xkl_layout_get_variants
-eek_xkl_layout_get_options
-<SUBSECTION Standard>
-EEK_XKL_LAYOUT
-EEK_IS_XKL_LAYOUT
-EEK_TYPE_XKL_LAYOUT
-eek_xkl_layout_get_type
-EEK_XKL_LAYOUT_CLASS
-EEK_IS_XKL_LAYOUT_CLASS
-EEK_XKL_LAYOUT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkb-layout</FILE>
-<TITLE>EekXkbLayout</TITLE>
-EekXkbLayout
-EekXkbLayoutClass
-EekXkbLayoutPrivate
-eek_xkb_layout_new
-eek_xkb_layout_set_names
-eek_xkb_layout_set_keycodes
-eek_xkb_layout_set_geometry
-eek_xkb_layout_set_symbols
-eek_xkb_layout_get_keycodes
-eek_xkb_layout_get_geometry
-eek_xkb_layout_get_symbols
-<SUBSECTION Standard>
-EEK_XKB_LAYOUT
-EEK_IS_XKB_LAYOUT
-EEK_TYPE_XKB_LAYOUT
-eek_xkb_layout_get_type
-EEK_XKB_LAYOUT_CLASS
-EEK_IS_XKB_LAYOUT_CLASS
-EEK_XKB_LAYOUT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-key</FILE>
-<TITLE>EekKey</TITLE>
-EekKeyClass
-EekKeyPrivate
-EekKey
-eek_key_set_keycode
-eek_key_get_keycode
-eek_key_set_keysyms
-eek_key_get_keysyms
-eek_key_get_keysym
-eek_key_set_index
-eek_key_get_index
-eek_key_set_outline
-eek_key_get_outline
-eek_key_set_keysym_index
-eek_key_get_keysym_index
-<SUBSECTION Standard>
-EEK_KEY
-EEK_IS_KEY
-EEK_TYPE_KEY
-eek_key_get_type
-EEK_KEY_CLASS
-EEK_IS_KEY_CLASS
-EEK_KEY_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-element</FILE>
-<TITLE>EekElement</TITLE>
-EekElementClass
-EekElementPrivate
-EekElement
-eek_element_set_parent
-eek_element_get_parent
-eek_element_set_name
-eek_element_get_name
-eek_element_set_bounds
-eek_element_get_bounds
-eek_element_get_absolute_position
-<SUBSECTION Standard>
-EEK_ELEMENT
-EEK_IS_ELEMENT
-EEK_TYPE_ELEMENT
-eek_element_get_type
-EEK_ELEMENT_CLASS
-EEK_IS_ELEMENT_CLASS
-EEK_ELEMENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eek-types</FILE>
-EekOrientation
-EekKeysymMatrix
-EEK_TYPE_KEYSYM_MATRIX
-eek_keysym_matrix_get_type
-EekPoint
-EEK_TYPE_POINT
-eek_point_get_type
-EekBounds
-EEK_TYPE_BOUNDS
-eek_bounds_get_type
-eek_bounds_long_side
-EekOutline
-EEK_TYPE_OUTLINE
-eek_outline_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-keysym</FILE>
-EEK_INVALID_KEYSYM
-EEK_INVALID_KEYCODE
-EekKeysymCategory
-eek_keysym_to_string
-eek_keysym_get_category
-</SECTION>
@@ -1,147 +0,0 @@
-# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010 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
-
-lib_LTLIBRARIES = \
-	libeek.la \
-	libeek-gtk.la \
-	libeek-xkb.la \
-	libeek-xkl.la
-
-if HAVE_CLUTTER
-lib_LTLIBRARIES += libeek-clutter.la
-endif
-
-libeek_la_SOURCES = \
-	eek-layout.c \
-	eek-layout.h \
-	eek-element.c \
-	eek-element.h \
-	eek-container.c \
-	eek-container.h \
-	eek-keyboard.c \
-	eek-keyboard.h \
-	eek-section.c \
-	eek-section.h \
-	eek-key.c \
-	eek-key.h \
-	eek-types.h \
-	eek-types.c \
-	eek-keysym.h \
-	eek-keysym.c \
-	eek-special-keysym-labels.h \
-	eek-unicode-keysym-labels.h \
-	eek-keyname-keysym-labels.h
-
-libeek_la_CFLAGS = $(GOBJECT2_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS)
-libeek_la_LIBADD = $(GOBJECT2_LIBS) $(CAIRO_LIBS) $(PANGO_LIBS)
-
-if HAVE_CLUTTER
-libeek_clutter_la_SOURCES = \
-	eek-clutter-keyboard.c \
-	eek-clutter-keyboard.h \
-	eek-clutter-section.c \
-	eek-clutter-section.h \
-	eek-clutter-key.c \
-	eek-clutter-key.h \
-	eek-clutter-key-actor.c \
-	eek-clutter-key-actor.h \
-	eek-clutter-drawing-context.c \
-	eek-clutter-drawing-context.h \
-	eek-drawing.h \
-	eek-drawing.c \
-	eek-clutter.h
-
-libeek_clutter_la_CFLAGS = $(CLUTTER_CFLAGS)
-libeek_clutter_la_LIBADD = libeek.la $(CLUTTER_LIBS)
-endif
-
-libeek_gtk_la_SOURCES = \
-	eek-gtk-keyboard.c \
-	eek-gtk-keyboard.h \
-	eek-drawing.h \
-	eek-drawing.c \
-	eek-gtk.h
-
-libeek_gtk_la_CFLAGS = $(GTK2_CFLAGS)
-libeek_gtk_la_LIBADD = libeek.la $(GTK2_LIBS)
-
-libeek_xkb_la_SOURCES = \
-	eek-xkb-layout.h \
-	eek-xkb-layout.c
-
-libeek_xkb_la_CFLAGS = $(GTK2_CFLAGS) $(XKB_CFLAGS)
-libeek_xkb_la_LIBADD = libeek.la $(GTK2_LIBS) $(XKB_LIBS)
-
-libeek_xkl_la_SOURCES = \
-	eek-xkl-layout.h \
-	eek-xkl-layout.c
-
-libeek_xkl_la_CFLAGS = $(GTK2_CFLAGS) $(LIBXKLAVIER_CFLAGS)
-libeek_xkl_la_LIBADD = libeek-xkb.la $(GTK2_LIBS) $(LIBXKLAVIER_LIBS)
-
-eekdir = $(includedir)/eek-$(EEK_API_VERSION)/eek
-eek_HEADERS = \
-	$(top_srcdir)/eek/eek-element.h \
-	$(top_srcdir)/eek/eek-container.h \
-	$(top_srcdir)/eek/eek-keyboard.h \
-	$(top_srcdir)/eek/eek-section.h \
-	$(top_srcdir)/eek/eek-key.h \
-	$(top_srcdir)/eek/eek-layout.h \
-	$(top_srcdir)/eek/eek-keysym.h \
-	$(top_srcdir)/eek/eek-types.h \
-	$(top_srcdir)/eek/eek-xkb-layout.h \
-	$(top_srcdir)/eek/eek-xkl-layout.h \
-	$(top_srcdir)/eek/eek.h \
-	$(top_srcdir)/eek/eek-xkb.h \
-	$(top_srcdir)/eek/eek-xkl.h
-
-if HAVE_CLUTTER
-eek_HEADERS += \
-	$(top_srcdir)/eek/eek-clutter-keyboard.h \
-	$(top_srcdir)/eek/eek-clutter-section.h \
-	$(top_srcdir)/eek/eek-clutter-key.h \
-	$(top_srcdir)/eek/eek-clutter.h
-endif
-
-eek-keysym.c: eek-special-keysym-labels.h eek-unicode-keysym-labels.h eek-keyname-keysym-labels.h
-
-eek-special-keysym-labels.h: special-keysym-labels.txt
-	$(PYTHON) ./gen-keysym-labels.py special_keysym_labels < $< > $@
-eek-unicode-keysym-labels.h: unicode-keysym-labels.txt
-	$(PYTHON) ./gen-keysym-labels.py unicode_keysym_labels < $< > $@
-eek-keyname-keysym-labels.h: keyname-keysym-labels.txt
-	$(PYTHON) ./gen-keysym-labels.py keyname_keysym_labels < $< > $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libeek.pc \
-	libeek-clutter.pc \
-	libeek-gtk.pc \
-	libeek-xkb.pc \
-	libeek-xkl.pc
-
-DISTCLEANFILES = \
-	eek-special-keysym-labels.h \
-	eek-unicode-keysym-labels.h \
-	eek-keyname-keysym-labels.h \
-	$(pkgconfig_DATA)
-
-EXTRA_DIST = \
-	gen-keysym-labels.py \
-	special-keysym-labels.txt \
-	unicode-keysym-labels.txt \
-	keyname-keysym-labels.txt
@@ -1,138 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-
-#include <string.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-clutter-drawing-context.h"
-
-G_DEFINE_TYPE (EekClutterDrawingContext, eek_clutter_drawing_context,
-               G_TYPE_INITIALLY_UNOWNED);
-
-#define EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_DRAWING_CONTEXT, EekClutterDrawingContextPrivate))
-
-struct _EekClutterDrawingContextPrivate
-{
-    /* outline pointer -> ClutterTexture */
-    GHashTable *outline_textures;
-
-    /* keysym category -> PangoFontDescription * */
-    PangoFontDescription *category_fonts[EEK_KEYSYM_CATEGORY_LAST];
-};
-
-static void
-eek_clutter_drawing_context_dispose (GObject *object)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(object);
-    if (priv->outline_textures) {
-        g_hash_table_unref (priv->outline_textures);
-        priv->outline_textures = NULL;
-    }
-}
-
-static void
-eek_clutter_drawing_context_finalize (GObject *object)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(object);
-    gint i;
-
-    for (i = 0; i < EEK_KEYSYM_CATEGORY_LAST; i++)
-        pango_font_description_free (priv->category_fonts[i]);
-}
-
-static void
-eek_clutter_drawing_context_class_init (EekClutterDrawingContextClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekClutterDrawingContextPrivate));
-
-    gobject_class->finalize = eek_clutter_drawing_context_finalize;
-    gobject_class->dispose = eek_clutter_drawing_context_dispose;
-}
-
-static void
-eek_clutter_drawing_context_init (EekClutterDrawingContext *self)
-{
-    EekClutterDrawingContextPrivate *priv;
-
-    priv = self->priv = EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(self);
-    priv->outline_textures = g_hash_table_new (g_direct_hash, g_direct_equal);
-    memset (priv->category_fonts, 0, sizeof *priv->category_fonts);
-}
-
-void
-eek_clutter_drawing_context_set_outline_texture
- (EekClutterDrawingContext *context,
-  EekOutline               *outline,
-  ClutterActor             *texture)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(context);
-    g_return_if_fail (priv);
-    g_hash_table_insert (context->priv->outline_textures, outline, texture);
-}
-
-ClutterActor *
-eek_clutter_drawing_context_get_outline_texture
- (EekClutterDrawingContext *context,
-  EekOutline               *outline)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(context);
-    g_return_val_if_fail (priv, NULL);
-    return g_hash_table_lookup (context->priv->outline_textures, outline);
-}
-
-void
-eek_clutter_drawing_context_set_category_font
- (EekClutterDrawingContext *context,
-  EekKeysymCategory         category,
-  PangoFontDescription     *font)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(context);
-    g_return_if_fail (priv);
-    priv->category_fonts[category] = pango_font_description_copy (font);
-}
-
-PangoFontDescription *
-eek_clutter_drawing_context_get_category_font
- (EekClutterDrawingContext *context,
-  EekKeysymCategory         category)
-{
-    EekClutterDrawingContextPrivate *priv =
-        EEK_CLUTTER_DRAWING_CONTEXT_GET_PRIVATE(context);
-    g_return_val_if_fail (priv, NULL);
-    return priv->category_fonts[category];
-}
-
-EekClutterDrawingContext *
-eek_clutter_drawing_context_new (void)
-{
-    return g_object_new (EEK_TYPE_CLUTTER_DRAWING_CONTEXT, NULL);
-}
@@ -1,82 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CLUTTER_DRAWING_CONTEXT_H
-#define EEK_CLUTTER_DRAWING_CONTEXT_H 1
-
-#include <clutter/clutter.h>
-#include <pango/pango.h>
-
-#include "eek-keysym.h"
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_CLUTTER_DRAWING_CONTEXT (eek_clutter_drawing_context_get_type())
-#define EEK_CLUTTER_DRAWING_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CLUTTER_DRAWING_CONTEXT, EekClutterDrawingContext))
-#define EEK_CLUTTER_DRAWING_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CLUTTER_DRAWING_CONTEXT, EekClutterDrawingContextClass))
-#define EEK_IS_CLUTTER_DRAWING_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CLUTTER_DRAWING_CONTEXT))
-#define EEK_IS_CLUTTER_DRAWING_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CLUTTER_DRAWING_CONTEXT))
-#define EEK_CLUTTER_DRAWING_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CLUTTER_DRAWING_CONTEXT, EekClutterDrawingContextClass))
-
-typedef struct _EekClutterDrawingContext        EekClutterDrawingContext;
-typedef struct _EekClutterDrawingContextClass   EekClutterDrawingContextClass;
-typedef struct _EekClutterDrawingContextPrivate EekClutterDrawingContextPrivate;
-
-struct _EekClutterDrawingContext
-{
-    /*< private >*/
-    GInitiallyUnowned parent;
-
-    /*< private >*/
-    EekClutterDrawingContextPrivate *priv;
-};
-
-struct _EekClutterDrawingContextClass
-{
-    /*< private >*/
-    GInitiallyUnownedClass parent_class;
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType                     eek_clutter_drawing_context_get_type
-                          (void) G_GNUC_CONST;
-EekClutterDrawingContext *eek_clutter_drawing_context_new
-                          (void);
-
-void                      eek_clutter_drawing_context_set_outline_texture
-                          (EekClutterDrawingContext *context,
-                           EekOutline               *outline,
-                           ClutterActor             *texture);
-ClutterActor             *eek_clutter_drawing_context_get_outline_texture
-                          (EekClutterDrawingContext *context,
-                           EekOutline               *outline);
-
-void                      eek_clutter_drawing_context_set_category_font
-                          (EekClutterDrawingContext *context,
-                           EekKeysymCategory         category,
-                           PangoFontDescription     *fonts);
-PangoFontDescription     *eek_clutter_drawing_context_get_category_font
-                          (EekClutterDrawingContext *context,
-                           EekKeysymCategory         category);
-
-G_END_DECLS
-#endif  /* EEK_CLUTTER_DRAWING_CONTEXT_H */
@@ -1,375 +0,0 @@
-/* 
- * Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-
-#include <cogl/cogl.h>
-#include <cogl/cogl-pango.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-#include "eek-clutter-key-actor.h"
-#include "eek-keysym.h"
-#include "eek-drawing.h"
-#include "eek-section.h"
-#include "eek-keyboard.h"
-
-#define noKBDRAW_DEBUG
-
-enum {
-    PRESSED,
-    RELEASED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (EekClutterKeyActor, eek_clutter_key_actor,
-               CLUTTER_TYPE_GROUP);
-
-#define EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_KEY_ACTOR, EekClutterKeyActorPrivate))
-
-struct _EekClutterKeyActorPrivate
-{
-    EekClutterDrawingContext *context;
-    EekKey *key;
-    ClutterActor *texture;
-};
-
-static ClutterActor *get_texture          (EekClutterKeyActor *actor);
-static void          draw_key_on_layout   (EekClutterKeyActor *actor,
-                                           PangoLayout        *layout);
-static void          key_enlarge          (ClutterActor       *actor);
-static void          key_shrink           (ClutterActor       *actor);
-
-static void
-eek_clutter_key_actor_real_paint (ClutterActor *self)
-{
-    EekClutterKeyActorPrivate *priv = EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE (self);
-    PangoLayout *layout;
-    PangoRectangle logical_rect = { 0, };
-    CoglColor color;
-    ClutterGeometry geom;
-    EekBounds bounds;
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->key), &bounds);
-    clutter_actor_set_anchor_point_from_gravity (self,
-                                                 CLUTTER_GRAVITY_CENTER);
-    clutter_actor_set_position (self,
-                                bounds.x + bounds.width / 2,
-                                bounds.y + bounds.height / 2);
-
-    if (!priv->texture) {
-        priv->texture = get_texture (EEK_CLUTTER_KEY_ACTOR(self));
-        clutter_actor_set_position (priv->texture, 0, 0);
-        clutter_container_add_actor (CLUTTER_CONTAINER(self), priv->texture);
-    }
-
-    CLUTTER_ACTOR_CLASS (eek_clutter_key_actor_parent_class)->
-        paint (self);
-
-    /* Draw the label on the key. */
-    layout = clutter_actor_create_pango_layout (self, NULL);
-    draw_key_on_layout (EEK_CLUTTER_KEY_ACTOR(self), layout);
-    pango_layout_get_extents (layout, NULL, &logical_rect);
-
-    /* FIXME: Color should be configurable through a property. */
-    cogl_color_set_from_4ub (&color, 0x80, 0x00, 0x00, 0xff);
-    clutter_actor_get_allocation_geometry (self, &geom);
-    cogl_pango_render_layout
-        (layout,
-         (geom.width - logical_rect.width / PANGO_SCALE) / 2,
-         (geom.height - logical_rect.height / PANGO_SCALE) / 2,
-         &color,
-         0);
-    g_object_unref (layout);
-}
-
-/* FIXME: This is a workaround for the bug
- * http://bugzilla.openedhand.com/show_bug.cgi?id=2137 A developer
- * says this is not a right way to solve the original problem.
- */
-static void
-eek_clutter_key_actor_real_get_preferred_width (ClutterActor *self,
-                                                gfloat        for_height,
-                                                gfloat       *min_width_p,
-                                                gfloat       *natural_width_p)
-{
-    PangoLayout *layout;
-
-    /* Draw the label on the key - just to validate the glyph cache. */
-    layout = clutter_actor_create_pango_layout (self, NULL);
-    draw_key_on_layout (EEK_CLUTTER_KEY_ACTOR(self), layout);
-    cogl_pango_ensure_glyph_cache_for_layout (layout);
-    g_object_unref (layout);
-
-    CLUTTER_ACTOR_CLASS (eek_clutter_key_actor_parent_class)->
-        get_preferred_width (self, for_height, min_width_p, natural_width_p);
-}
-
-static void
-eek_clutter_key_actor_real_pressed (EekClutterKeyActor *self)
-{
-    ClutterActor *actor, *section;
-
-    actor = CLUTTER_ACTOR(self);
-
-    /* Make sure the enlarged key show up on the keys which belong
-       to other sections. */
-    section = clutter_actor_get_parent (actor);
-    clutter_actor_raise_top (section);
-    clutter_actor_raise_top (actor);
-    key_enlarge (actor);
-}
-
-static void
-eek_clutter_key_actor_real_released (EekClutterKeyActor *self)
-{
-    ClutterActor *actor, *section;
-
-    actor = CLUTTER_ACTOR(self);
-
-    /* Make sure the enlarged key show up on the keys which belong
-       to other sections. */
-    section = clutter_actor_get_parent (actor);
-    clutter_actor_raise_top (section);
-    clutter_actor_raise_top (actor);
-    key_shrink (actor);
-}
-
-static void
-eek_clutter_key_actor_dispose (GObject *object)
-{
-    EekClutterKeyActorPrivate *priv = EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(object);
-
-    if (priv->context) {
-        g_object_unref (priv->context);
-        priv->context = NULL;
-    }
-    if (priv->key) {
-        g_object_unref (priv->key);
-        priv->key = NULL;
-    }
-    G_OBJECT_CLASS (eek_clutter_key_actor_parent_class)->dispose (object);
-}
-
-static void
-eek_clutter_key_actor_class_init (EekClutterKeyActorClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekClutterKeyActorPrivate));
-
-    actor_class->paint = eek_clutter_key_actor_real_paint;
-    /* FIXME: This is a workaround for the bug
-     * http://bugzilla.openedhand.com/show_bug.cgi?id=2137 A developer
-     * says this is not a right way to solve the original problem.
-     */
-    actor_class->get_preferred_width =
-        eek_clutter_key_actor_real_get_preferred_width;
-
-    gobject_class->dispose = eek_clutter_key_actor_dispose;
-
-    /* signals */
-    klass->pressed = eek_clutter_key_actor_real_pressed;
-    klass->released = eek_clutter_key_actor_real_released;
-
-    signals[PRESSED] =
-        g_signal_new ("pressed",
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekClutterKeyActorClass, pressed),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    signals[RELEASED] =
-        g_signal_new ("released",
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekClutterKeyActorClass, released),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-}
-
-static void
-on_button_press_event (ClutterActor *actor,
-                       ClutterEvent *event,
-                       gpointer user_data)
-{
-    EekClutterKeyActorPrivate *priv =
-        EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
-
-    /* priv->key will send back PRESSED event of actor. */
-    g_signal_emit_by_name (priv->key, "pressed");
-}
-
-static void
-on_button_release_event (ClutterActor *actor,
-                         ClutterEvent *event,
-                         gpointer      user_data)
-{
-    EekClutterKeyActorPrivate *priv =
-        EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
-
-    /* priv->key will send back RELEASED event of actor. */
-    g_signal_emit_by_name (priv->key, "released");
-}
-
-static void
-eek_clutter_key_actor_init (EekClutterKeyActor *self)
-{
-    EekClutterKeyActorPrivate *priv;
-
-    priv = self->priv = EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(self);
-    priv->key = NULL;
-    priv->texture = NULL;
-    
-    clutter_actor_set_reactive (CLUTTER_ACTOR(self), TRUE);
-    g_signal_connect (self, "button-press-event",
-                      G_CALLBACK (on_button_press_event), NULL);
-    g_signal_connect (self, "button-release-event",
-                      G_CALLBACK (on_button_release_event), NULL);
-}
-
-ClutterActor *
-eek_clutter_key_actor_new (EekClutterDrawingContext *context, EekKey *key)
-{
-    EekClutterKeyActor *actor;
-
-    actor = g_object_new (EEK_TYPE_CLUTTER_KEY_ACTOR, NULL);
-    actor->priv->context = context;
-    g_object_ref_sink (actor->priv->context);
-    actor->priv->key = key;
-    g_object_ref_sink (actor->priv->key);
-    return CLUTTER_ACTOR(actor);
-}
-
-#if 0
-static void  
-on_key_animate_complete (ClutterAnimation *animation,
-                         gpointer user_data)
-{
-    ClutterActor *actor = (ClutterActor*)user_data;
-
-    /* reset after effect */
-    clutter_actor_set_opacity (actor, 0xff);
-    clutter_actor_set_scale (actor, 1.0, 1.0);
-}
-#endif
-
-static void
-key_enlarge (ClutterActor *actor)
-{
-    clutter_actor_set_scale (actor, 1.0, 1.0);
-    clutter_actor_animate (actor, CLUTTER_EASE_IN_SINE, 150,
-                           "scale-x", 1.5,
-                           "scale-y", 1.5,
-                           NULL);
-}
-
-static void
-key_shrink (ClutterActor *actor)
-{
-    clutter_actor_set_scale (actor, 1.5, 1.5);
-    clutter_actor_animate (actor, CLUTTER_EASE_OUT_SINE, 150,
-                           "scale-x", 1.0,
-                           "scale-y", 1.0,
-                           NULL);
-}
-
-
-static ClutterActor *
-create_texture_for_key (EekKey *key)
-{
-    ClutterActor *texture;
-    cairo_t *cr;
-    EekOutline *outline;
-    EekBounds bounds;
-
-    outline = eek_key_get_outline (EEK_KEY(key));
-    eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
- 
-    texture = clutter_cairo_texture_new (bounds.width, bounds.height);
-    cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE(texture));
-    eek_draw_outline (cr, outline);
-    cairo_destroy (cr);
-    return texture;
-}
-
-static ClutterActor *
-get_texture (EekClutterKeyActor *actor)
-{
-    ClutterActor *texture;
-    EekOutline *outline;
-
-    outline = eek_key_get_outline (actor->priv->key);
-    texture =
-        eek_clutter_drawing_context_get_outline_texture (actor->priv->context,
-                                                         outline);
-    if (texture == NULL) {
-        texture = create_texture_for_key (actor->priv->key);
-        eek_clutter_drawing_context_set_outline_texture (actor->priv->context,
-                                                         outline,
-                                                         texture);
-    } else
-        texture = clutter_clone_new (texture);
-    return texture;
-}
-
-static void
-draw_key_on_layout (EekClutterKeyActor *self,
-                    PangoLayout *layout)
-{
-    EekClutterKeyActorPrivate *priv = EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE (self);
-    guint keysym;
-    const gchar *label, *empty_label = "";
-    EekKeysymCategory category;
-    EekBounds bounds;
-    PangoFontDescription *font;
-
-    keysym = eek_key_get_keysym (priv->key);
-    if (keysym == EEK_INVALID_KEYSYM)
-        return;
-    category = eek_keysym_get_category (keysym);
-    if (category == EEK_KEYSYM_CATEGORY_UNKNOWN)
-        return;
-
-    font = eek_clutter_drawing_context_get_category_font (priv->context,
-                                                          category);
-    pango_layout_set_font_description (layout, font);
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->key), &bounds);
-    pango_layout_set_width (layout, PANGO_SCALE * bounds.width);
-    pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-
-    label = eek_keysym_to_string (keysym);
-    if (!label)
-        label = empty_label;
-    eek_draw_text_on_layout (layout, label);
-    if (label != empty_label)
-        g_free ((gpointer)label);
-}
@@ -1,68 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CLUTTER_KEY_ACTOR_H
-#define EEK_CLUTTER_KEY_ACTOR_H 1
-
-#include <clutter/clutter.h>
-#include "eek-clutter-drawing-context.h"
-#include "eek-key.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_CLUTTER_KEY_ACTOR (eek_clutter_key_actor_get_type())
-#define EEK_CLUTTER_KEY_ACTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CLUTTER_KEY_ACTOR, EekClutterKeyActor))
-#define EEK_CLUTTER_KEY_ACTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CLUTTER_KEY_ACTOR, EekClutterKeyActorClass))
-#define EEK_IS_CLUTTER_KEY_ACTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CLUTTER_KEY_ACTOR))
-#define EEK_IS_CLUTTER_KEY_ACTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CLUTTER_KEY_ACTOR))
-#define EEK_CLUTTER_KEY_ACTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CLUTTER_KEY_ACTOR, EekClutterKeyActorClass))
-
-typedef struct _EekClutterKeyActor        EekClutterKeyActor;
-typedef struct _EekClutterKeyActorClass   EekClutterKeyActorClass;
-typedef struct _EekClutterKeyActorPrivate EekClutterKeyActorPrivate;
-
-struct _EekClutterKeyActor
-{
-    /*< private >*/
-    ClutterGroup parent;
-
-    /*< private >*/
-    EekClutterKeyActorPrivate *priv;
-};
-
-struct _EekClutterKeyActorClass
-{
-    /*< private >*/
-    ClutterGroupClass parent_class;
-
-    /* signals */
-    void (* pressed) (EekClutterKeyActor *self);
-    void (* released) (EekClutterKeyActor *self);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType         eek_clutter_key_actor_get_type
-                                        (void) G_GNUC_CONST;
-ClutterActor *eek_clutter_key_actor_new (EekClutterDrawingContext *context,
-                                         EekKey                   *key);
-
-G_END_DECLS
-#endif  /* EEK_CLUTTER_KEY_ACTOR_H */
@@ -1,154 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-clutter-key.h"
-#include "eek-clutter-key-actor.h"
-
-G_DEFINE_TYPE (EekClutterKey, eek_clutter_key, EEK_TYPE_KEY);
-
-#define EEK_CLUTTER_KEY_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_KEY, EekClutterKeyPrivate))
-
-struct _EekClutterKeyPrivate
-{
-    EekClutterDrawingContext *context;
-    ClutterActor *actor;
-};
-
-static void
-eek_clutter_key_real_set_name (EekElement *self,
-                               const gchar *name)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_key_parent_class)->
-        set_name (self, name);
-
-    if (priv->actor)
-        clutter_actor_set_name (CLUTTER_ACTOR(priv->actor), name);
-}
-
-static void
-eek_clutter_key_real_set_bounds (EekElement *self,
-                                 EekBounds *bounds)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_key_parent_class)->
-        set_bounds (self, bounds);
-
-    if (priv->actor) {
-        clutter_actor_set_position (priv->actor, bounds->x, bounds->y);
-        clutter_actor_set_size (priv->actor, bounds->width, bounds->height);
-    }
-}
-
-static void
-eek_clutter_key_real_pressed (EekKey *key)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(key);
-
-    if (priv->actor)
-        g_signal_emit_by_name (priv->actor, "pressed");
-}
-
-static void
-eek_clutter_key_real_released (EekKey *key)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(key);
-
-    if (priv->actor)
-        g_signal_emit_by_name (priv->actor, "released");
-}
-
-static void
-eek_clutter_key_dispose (GObject *object)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(object);
-
-    if (priv->context) {
-        g_object_unref (priv->context);
-        priv->context = NULL;
-    }
-    if (priv->actor) {
-        g_object_unref (priv->actor);
-        priv->actor = NULL;
-    }
-    G_OBJECT_CLASS (eek_clutter_key_parent_class)->dispose (object);
-}
-
-static void
-eek_clutter_key_class_init (EekClutterKeyClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    EekElementClass *element_class = EEK_ELEMENT_CLASS (klass);
-    EekKeyClass *key_class = EEK_KEY_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekClutterKeyPrivate));
-
-    element_class->set_name = eek_clutter_key_real_set_name;
-    element_class->set_bounds = eek_clutter_key_real_set_bounds;
-    gobject_class->dispose = eek_clutter_key_dispose;
-
-    /* signals */
-    key_class->pressed = eek_clutter_key_real_pressed;
-    key_class->released = eek_clutter_key_real_released;
-}
-
-static void
-eek_clutter_key_init (EekClutterKey *self)
-{
-    EekClutterKeyPrivate *priv;
-    priv = self->priv = EEK_CLUTTER_KEY_GET_PRIVATE (self);
-    priv->actor = NULL;
-}
-
-ClutterActor *
-eek_clutter_key_get_actor (EekClutterKey *key)
-{
-    EekClutterKeyPrivate *priv = EEK_CLUTTER_KEY_GET_PRIVATE(key);
-
-    if (!priv->actor) {
-        g_return_val_if_fail (priv->context, NULL);
-        priv->actor = eek_clutter_key_actor_new (priv->context, EEK_KEY(key));
-        g_object_ref_sink (priv->actor);
-    }
-    return priv->actor;
-}
-
-EekKey *
-eek_clutter_key_new (EekClutterDrawingContext *context, gint column, gint row)
-{
-    EekClutterKey *key;
-
-    g_return_val_if_fail (context, NULL);
-    key = g_object_new (EEK_TYPE_CLUTTER_KEY,
-                        "column", column,
-                        "row", row,
-                        NULL);
-    key->priv->context = context;
-    g_object_ref_sink (key->priv->context);
-    return EEK_KEY(key);
-}
@@ -1,65 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CLUTTER_KEY_H
-#define EEK_CLUTTER_KEY_H 1
-
-#include <clutter/clutter.h>
-#include "eek-clutter-drawing-context.h"
-#include "eek-key.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_CLUTTER_KEY (eek_clutter_key_get_type())
-#define EEK_CLUTTER_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CLUTTER_KEY, EekClutterKey))
-#define EEK_CLUTTER_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CLUTTER_KEY, EekClutterKeyClass))
-#define EEK_IS_CLUTTER_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CLUTTER_KEY))
-#define EEK_IS_CLUTTER_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CLUTTER_KEY))
-#define EEK_CLUTTER_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CLUTTER_KEY, EekClutterKeyClass))
-
-typedef struct _EekClutterKey        EekClutterKey;
-typedef struct _EekClutterKeyClass   EekClutterKeyClass;
-typedef struct _EekClutterKeyPrivate EekClutterKeyPrivate;
-
-struct _EekClutterKey
-{
-    /*< private >*/
-    EekKey parent;
-
-    /*< private >*/
-    EekClutterKeyPrivate *priv;
-};
-
-struct _EekClutterKeyClass
-{
-    /*< private >*/
-    EekKeyClass parent_class;
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType         eek_clutter_key_get_type  (void) G_GNUC_CONST;
-EekKey *      eek_clutter_key_new       (EekClutterDrawingContext *context,
-                                         gint                      column,
-                                         gint                      row);
-ClutterActor *eek_clutter_key_get_actor (EekClutterKey            *key);
-
-G_END_DECLS
-#endif  /* EEK_CLUTTER_KEY_H */
@@ -1,316 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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-clutter-keyboard
- * @short_description: #EekKeyboard that can be converted into a #ClutterActor
- */
-#include <string.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-clutter-keyboard.h"
-#include "eek-clutter-drawing-context.h"
-#include "eek-keyboard.h"
-#include "eek-drawing.h"
-
-G_DEFINE_TYPE (EekClutterKeyboard, eek_clutter_keyboard, EEK_TYPE_KEYBOARD);
-
-#define EEK_CLUTTER_KEYBOARD_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_KEYBOARD, EekClutterKeyboardPrivate))
-
-
-struct _EekClutterKeyboardPrivate
-{
-    EekClutterDrawingContext *context;
-    ClutterActor *actor;
-
-    guint key_press_event_handler;
-    guint key_release_event_handler;
-};
-
-static void
-eek_clutter_keyboard_real_set_name (EekElement *self,
-                                    const gchar *name)
-{
-    EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_keyboard_parent_class)->
-        set_name (self, name);
-
-    if (priv->actor)
-        clutter_actor_set_name (priv->actor, name);
-}
-
-static void
-eek_clutter_keyboard_real_set_bounds (EekElement *self,
-                                     EekBounds  *bounds)
-{
-    EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_keyboard_parent_class)->
-        set_bounds (self, bounds);
-
-    if (priv->actor) {
-        clutter_actor_set_position (priv->actor, bounds->x, bounds->y);
-        clutter_actor_set_size (priv->actor, bounds->width, bounds->height);
-    }
-}
-
-static void
-key_pressed_event (EekSection  *section,
-                   EekKey      *key,
-                   EekKeyboard *keyboard)
-{
-    g_signal_emit_by_name (keyboard, "key-pressed", key);
-}
-
-static void
-key_released_event (EekSection  *section,
-                    EekKey      *key,
-                    EekKeyboard *keyboard)
-{
-    g_signal_emit_by_name (keyboard, "key-released", key);
-}
-
-static EekSection *
-eek_clutter_keyboard_real_create_section (EekKeyboard *self)
-{
-    EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
-    EekSection *section;
-    ClutterActor *actor;
-
-    if (!priv->context) {
-        priv->context = eek_clutter_drawing_context_new ();
-        g_object_ref_sink (G_OBJECT(priv->context));
-    }
-
-    section = eek_clutter_section_new (priv->context);
-    g_return_val_if_fail (section, NULL);
-
-    g_signal_connect (section, "key-pressed",
-                      G_CALLBACK(key_pressed_event), self);
-    g_signal_connect (section, "key-released",
-                      G_CALLBACK(key_released_event), self);
-
-    EEK_CONTAINER_GET_CLASS(self)->add_child (EEK_CONTAINER(self),
-                                              EEK_ELEMENT(section));
-
-    actor = eek_clutter_keyboard_get_actor (EEK_CLUTTER_KEYBOARD(self));
-    clutter_container_add_actor
-        (CLUTTER_CONTAINER(actor),
-         eek_clutter_section_get_actor (EEK_CLUTTER_SECTION(section)));
-
-    return section;
-}
-
-static void
-eek_clutter_keyboard_dispose (GObject *object)
-{
-    EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(object);
-
-    if (priv->context) {
-        g_object_unref (G_OBJECT(priv->context));
-        priv->context = NULL;
-    }
-    if (priv->actor) {
-        ClutterActor *stage;
-
-        stage = clutter_actor_get_stage (priv->actor);
-        if (stage) {
-            g_signal_handler_disconnect (stage,
-                                         priv->key_press_event_handler);
-            g_signal_handler_disconnect (stage,
-                                         priv->key_release_event_handler);
-        }
-        g_object_unref (priv->actor);
-        priv->actor = NULL;
-    }
-    G_OBJECT_CLASS (eek_clutter_keyboard_parent_class)->dispose (object);
-}
-
-static void
-eek_clutter_keyboard_class_init (EekClutterKeyboardClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    EekElementClass *element_class = EEK_ELEMENT_CLASS (klass);
-    EekKeyboardClass *keyboard_class = EEK_KEYBOARD_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekClutterKeyboardPrivate));
-
-    keyboard_class->create_section = eek_clutter_keyboard_real_create_section;
-    element_class->set_name = eek_clutter_keyboard_real_set_name;
-    element_class->set_bounds = eek_clutter_keyboard_real_set_bounds;
-    gobject_class->dispose = eek_clutter_keyboard_dispose;
-}
-
-static void
-eek_clutter_keyboard_init (EekClutterKeyboard *self)
-{
-    EekClutterKeyboardPrivate *priv;
-
-    priv = self->priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
-    priv->actor = NULL;
-}
-
-/**
- * eek_clutter_keyboard_new:
- *
- * Create a new #EekClutterKeyboard.
- */
-EekKeyboard*
-eek_clutter_keyboard_new (void)
-{
-    return g_object_new (EEK_TYPE_CLUTTER_KEYBOARD, NULL);
-}
-
-static gboolean
-on_clutter_key_press_event (ClutterActor *actor,
-                            ClutterEvent *event,
-                            gpointer      user_data)
-{
-    guint keycode;
-    EekKey *key;
-
-    keycode = clutter_event_get_key_code (event);
-    key = eek_keyboard_find_key_by_keycode (user_data, keycode);
-    if (key) {
-        g_signal_emit_by_name (key, "pressed", NULL);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static gboolean
-on_clutter_key_release_event (ClutterActor *actor,
-                              ClutterEvent *event,
-                              gpointer      user_data)
-{
-    guint keycode;
-    EekKey *key;
-
-    keycode = clutter_event_get_key_code (event);
-    key = eek_keyboard_find_key_by_keycode (user_data, keycode);
-    if (key) {
-        g_signal_emit_by_name (key, "released", NULL);
-        return TRUE;
-    }
-    return FALSE;    
-}
-
-static void
-on_clutter_stage_resize (GObject *object,
-                         GParamSpec *param_spec,
-                         gpointer user_data)
-{
-    ClutterActor *stage = CLUTTER_ACTOR(object);
-    EekClutterKeyboard *keyboard = user_data;
-    GValue value = {0};
-    gfloat width, height, scale;
-    EekBounds bounds;
-
-    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
-    g_object_get (G_OBJECT(stage), "width", &width, NULL);
-    g_object_get (G_OBJECT(stage), "height", &height, NULL);
-
-    g_value_init (&value, G_TYPE_DOUBLE);
-
-    scale = width > height ? width / bounds.width : height / bounds.height;
-
-    g_value_set_double (&value, scale);
-    g_object_set_property (G_OBJECT (stage),
-                           "scale-x",
-                           &value);
-
-    g_value_set_double (&value, scale);
-    g_object_set_property (G_OBJECT (stage),
-                           "scale-y",
-                           &value);
-}
-
-static void
-on_clutter_realize (ClutterActor *actor,
-                    gpointer      user_data)
-{
-    EekClutterKeyboard *keyboard = user_data;
-    EekClutterKeyboardPrivate *priv =
-        EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
-    ClutterActor *stage;
-
-    stage = clutter_actor_get_stage (priv->actor);
-    priv->key_press_event_handler =
-        g_signal_connect (stage, "key-press-event",
-                          G_CALLBACK (on_clutter_key_press_event), keyboard);
-    priv->key_release_event_handler =
-        g_signal_connect (stage, "key-release-event",
-                          G_CALLBACK (on_clutter_key_release_event), keyboard);
-    g_signal_connect (stage, "notify::width",
-                      G_CALLBACK (on_clutter_stage_resize), keyboard);
-    g_signal_connect (stage, "notify::height",
-                      G_CALLBACK (on_clutter_stage_resize), keyboard);
-}
-
-static void
-update_category_fonts (EekClutterKeyboard *keyboard)
-{
-    EekClutterKeyboardPrivate *priv =
-        EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
-    PangoContext *context;
-    PangoLayout *layout;
-    PangoFontDescription *fonts[EEK_KEYSYM_CATEGORY_LAST], *base_font;
-    gint i;
-
-    context = clutter_actor_get_pango_context (priv->actor);
-    layout = pango_layout_new (context);
-    base_font = pango_font_description_from_string ("Sans");
-    pango_layout_set_font_description (layout, base_font);
-    pango_font_description_free (base_font);
-    eek_get_fonts (EEK_KEYBOARD(keyboard),
-                   layout,
-                   (PangoFontDescription **)&fonts);
-    for (i = 0; i < EEK_KEYSYM_CATEGORY_LAST; i++) {
-        eek_clutter_drawing_context_set_category_font (priv->context,
-                                                       i,
-                                                       fonts[i]);
-        pango_font_description_free (fonts[i]);
-    }
-    g_object_unref (G_OBJECT(layout));
-}
-
-ClutterActor *
-eek_clutter_keyboard_get_actor (EekClutterKeyboard *keyboard)
-{
-    EekClutterKeyboardPrivate *priv =
-        EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
-    if (!priv->actor) {
-        priv->actor = clutter_group_new ();
-        g_object_ref_sink (priv->actor);
-        g_signal_connect (priv->actor, "realize",
-                          G_CALLBACK (on_clutter_realize), keyboard);
-        g_return_val_if_fail (priv->actor, NULL);
-
-        eek_keyboard_realize (EEK_KEYBOARD(keyboard));
-        update_category_fonts (keyboard);
-    }
-    return priv->actor;
-}
@@ -1,61 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CLUTTER_KEYBOARD_H
-#define EEK_CLUTTER_KEYBOARD_H 1
-
-#include "eek-clutter-section.h"
-#include "eek-keyboard.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_CLUTTER_KEYBOARD (eek_clutter_keyboard_get_type())
-#define EEK_CLUTTER_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CLUTTER_KEYBOARD, EekClutterKeyboard))
-#define EEK_CLUTTER_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CLUTTER_KEYBOARD, EekClutterKeyboardClass))
-#define EEK_IS_CLUTTER_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CLUTTER_KEYBOARD))
-#define EEK_IS_CLUTTER_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CLUTTER_KEYBOARD))
-#define EEK_CLUTTER_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CLUTTER_KEYBOARD, EekClutterKeyboardClass))
-
-typedef struct _EekClutterKeyboard EekClutterKeyboard;
-typedef struct _EekClutterKeyboardClass EekClutterKeyboardClass;
-typedef struct _EekClutterKeyboardPrivate EekClutterKeyboardPrivate;
-
-struct _EekClutterKeyboard
-{
-    /*< private >*/
-    EekKeyboard parent;
-
-    EekClutterKeyboardPrivate *priv;
-};
-
-struct _EekClutterKeyboardClass
-{
-    /*< private >*/
-    EekKeyboardClass parent_class;
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType         eek_clutter_keyboard_get_type  (void) G_GNUC_CONST;
-EekKeyboard  *eek_clutter_keyboard_new       (void);
-ClutterActor *eek_clutter_keyboard_get_actor (EekClutterKeyboard *keyboard);
-
-G_END_DECLS
-#endif  /* EEK_CLUTTER_KEYBOARD_H */
@@ -1,190 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-clutter-section.h"
-
-G_DEFINE_TYPE (EekClutterSection, eek_clutter_section, EEK_TYPE_SECTION);
-
-#define EEK_CLUTTER_SECTION_GET_PRIVATE(obj)                           \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_SECTION, EekClutterSectionPrivate))
-
-struct _EekClutterSectionPrivate
-{
-    EekClutterDrawingContext *context;
-    ClutterActor *actor;
-};
-
-static void
-eek_clutter_section_real_set_name (EekElement  *self,
-                                   const gchar *name)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_section_parent_class)->
-        set_name (self, name);
-
-    if (priv->actor)
-        clutter_actor_set_name (priv->actor, name);
-}
-
-static void
-eek_clutter_section_real_set_bounds (EekElement *self,
-                                     EekBounds  *bounds)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(self);
-
-    EEK_ELEMENT_CLASS (eek_clutter_section_parent_class)->
-        set_bounds (self, bounds);
-
-    if (priv->actor) {
-        clutter_actor_set_position (priv->actor, bounds->x, bounds->y);
-        clutter_actor_set_size (priv->actor, bounds->width, bounds->height);
-    }
-}
-
-static void
-eek_clutter_section_real_set_angle (EekSection *self,
-                                    gint angle)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(self);
-
-    EEK_SECTION_CLASS (eek_clutter_section_parent_class)->
-        set_angle (self, angle);
-
-    g_return_if_fail (priv->actor);
-
-    clutter_actor_set_rotation (priv->actor,
-                                CLUTTER_Z_AXIS,
-                                eek_section_get_angle (self),
-                                0, 0, 0);
-}
-
-static void
-pressed_event (EekKey *key, gpointer user_data)
-{
-    g_signal_emit_by_name (user_data, "key-pressed", key);
-}
-
-static void
-released_event (EekKey *key, gpointer user_data)
-{
-    g_signal_emit_by_name (user_data, "key-released", key);
-}
-
-static EekKey *
-eek_clutter_section_real_create_key (EekSection  *self,
-                                     gint         column,
-                                     gint         row)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(self);
-    EekKey *key;
-    gint num_columns, num_rows;
-    EekOrientation orientation;
-    ClutterActor *actor;
-
-    num_rows = eek_section_get_n_rows (self);
-    g_return_val_if_fail (0 <= row && row < num_rows, NULL);
-    eek_section_get_row (self, row, &num_columns, &orientation);
-    g_return_val_if_fail (column < num_columns, NULL);
-
-    key = eek_clutter_key_new (priv->context, column, row);
-    g_return_val_if_fail (key, NULL);
-    
-    g_signal_connect (key, "pressed", G_CALLBACK(pressed_event), self);
-    g_signal_connect (key, "released", G_CALLBACK(released_event), self);
-
-    EEK_CONTAINER_GET_CLASS(self)->add_child (EEK_CONTAINER(self),
-                                              EEK_ELEMENT(key));
-
-    actor = eek_clutter_section_get_actor (EEK_CLUTTER_SECTION(self));
-    clutter_container_add_actor
-        (CLUTTER_CONTAINER(actor),
-         eek_clutter_key_get_actor (EEK_CLUTTER_KEY(key)));
-
-    return key;
-}
-
-static void
-eek_clutter_section_dispose (GObject *object)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(object);
-
-    if (priv->context) {
-        g_object_unref (priv->context);
-        priv->context = NULL;
-    }
-    if (priv->actor) {
-        g_object_unref (priv->actor);
-        priv->actor = NULL;
-    }
-    G_OBJECT_CLASS (eek_clutter_section_parent_class)->dispose (object);
-}
-
-static void
-eek_clutter_section_class_init (EekClutterSectionClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    EekElementClass *element_class = EEK_ELEMENT_CLASS (klass);
-    EekSectionClass *section_class = EEK_SECTION_CLASS (klass);
-
-    g_type_class_add_private (gobject_class, sizeof (EekClutterSectionPrivate));
-
-    section_class->set_angle = eek_clutter_section_real_set_angle;
-    section_class->create_key = eek_clutter_section_real_create_key;
-    element_class->set_name = eek_clutter_section_real_set_name;
-    element_class->set_bounds = eek_clutter_section_real_set_bounds;
-    gobject_class->dispose = eek_clutter_section_dispose;
-}
-
-static void
-eek_clutter_section_init (EekClutterSection *self)
-{
-    EekClutterSectionPrivate *priv;
-    priv = self->priv = EEK_CLUTTER_SECTION_GET_PRIVATE (self);
-    priv->actor = NULL;
-}
-
-ClutterActor *
-eek_clutter_section_get_actor (EekClutterSection *section)
-{
-    EekClutterSectionPrivate *priv = EEK_CLUTTER_SECTION_GET_PRIVATE(section);
-    if (!priv->actor) {
-        priv->actor = clutter_group_new ();
-        g_object_ref_sink (priv->actor);
-    }
-    return priv->actor;
-}
-
-EekSection *
-eek_clutter_section_new (EekClutterDrawingContext *context)
-{
-    EekClutterSection *section;
-
-    g_return_val_if_fail (context, NULL);
-    section = g_object_new (EEK_TYPE_CLUTTER_SECTION, NULL);
-    section->priv->context = context;
-    g_object_ref_sink (G_OBJECT(section->priv->context));
-
-    return EEK_SECTION(section);
-}
@@ -1,62 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CLUTTER_SECTION_H
-#define EEK_CLUTTER_SECTION_H 1
-
-#include "eek-clutter-drawing-context.h"
-#include "eek-clutter-key.h"
-#include "eek-section.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_CLUTTER_SECTION (eek_clutter_section_get_type())
-#define EEK_CLUTTER_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CLUTTER_SECTION, EekClutterSection))
-#define EEK_CLUTTER_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CLUTTER_SECTION, EekClutterSectionClass))
-#define EEK_IS_CLUTTER_SECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CLUTTER_SECTION))
-#define EEK_IS_CLUTTER_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CLUTTER_SECTION))
-#define EEK_CLUTTER_SECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CLUTTER_SECTION, EekClutterSectionClass))
-
-typedef struct _EekClutterSection        EekClutterSection;
-typedef struct _EekClutterSectionClass   EekClutterSectionClass;
-typedef struct _EekClutterSectionPrivate EekClutterSectionPrivate;
-
-struct _EekClutterSection
-{
-    /*< private >*/
-    EekSection parent;
-
-    EekClutterSectionPrivate *priv;
-};
-
-struct _EekClutterSectionClass
-{
-    /*< private >*/
-    EekSectionClass parent_class;
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType         eek_clutter_section_get_type  (void) G_GNUC_CONST;
-EekSection *  eek_clutter_section_new       (EekClutterDrawingContext *context);
-ClutterActor *eek_clutter_section_get_actor (EekClutterSection        *section);
-
-G_END_DECLS
-#endif  /* EEK_CLUTTER_SECTION_H */
@@ -1,270 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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-container
- * @short_description: Base class of a keyboard container
- *
- * The #EekContainerClass class represents a keyboard container, which
- * shall be used to implement #EekKeyboard and #EekSection.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-container.h"
-
-enum {
-    CHILD_ADDED,
-    CHILD_REMOVED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_ABSTRACT_TYPE (EekContainer, eek_container, EEK_TYPE_ELEMENT);
-
-#define EEK_CONTAINER_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CONTAINER, EekContainerPrivate))
-
-
-struct _EekContainerPrivate
-{
-    GSList *children;
-};
-
-static void
-eek_container_real_add_child (EekContainer *self,
-                              EekElement   *child)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    g_object_ref_sink (child);
-
-    priv->children = g_slist_prepend (priv->children, child);
-    eek_element_set_parent (child, EEK_ELEMENT(self));
-}
-
-static void
-eek_container_real_remove_child (EekContainer *self,
-                                 EekElement   *child)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    head = g_slist_find (priv->children, child);
-    g_return_if_fail (head);
-    g_object_unref (child);
-    priv->children = g_slist_remove_link (priv->children, head);
-    eek_element_set_parent (child, NULL);
-}
-
-static void
-eek_container_real_foreach_child (EekContainer *self,
-                                  EekCallback   callback,
-                                  gpointer      user_data)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
-
-    for (head = priv->children; head; head = g_slist_next (head))
-        (*callback) (EEK_ELEMENT(head->data), user_data);
-}
-
-static EekElement *
-eek_container_real_find (EekContainer *self,
-                         EekCompareFunc func,
-                         gpointer user_data)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
-
-    head = g_slist_find_custom (priv->children, user_data, (GCompareFunc)func);
-    if (head)
-        return head->data;
-    return NULL;
-}
-
-static void
-eek_container_dispose (GObject *object)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
-    GSList *head;
-
-    for (head = priv->children; head; head = g_slist_next (head)) {
-        if (head->data) {
-            g_object_unref (head->data);
-            head->data = NULL;
-        }
-    }
-    G_OBJECT_CLASS(eek_container_parent_class)->dispose (object);
-}
-
-static void
-eek_container_finalize (GObject *object)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
-
-    g_slist_free (priv->children);
-    G_OBJECT_CLASS(eek_container_parent_class)->finalize (object);
-}
-
-static void
-eek_container_class_init (EekContainerClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekContainerPrivate));
-
-    klass->add_child = eek_container_real_add_child;
-    klass->remove_child = eek_container_real_remove_child;
-    klass->foreach_child = eek_container_real_foreach_child;
-    klass->find = eek_container_real_find;
-
-    gobject_class->finalize = eek_container_finalize;
-    gobject_class->dispose = eek_container_dispose;
-
-    /**
-     * EekContainer::child-added:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-added signal is emitted each time an element is
-     * added to @container.
-     */
-    signals[CHILD_ADDED] =
-        g_signal_new ("child-added",
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_added),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-
-    /**
-     * EekContainer::child-removed:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-removed signal is emitted each time an element is
-     * removed from @container.
-     */
-    signals[CHILD_REMOVED] =
-        g_signal_new ("child-removed",
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_removed),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-}
-
-static void
-eek_container_init (EekContainer *self)
-{
-    EekContainerPrivate *priv;
-
-    priv = self->priv = EEK_CONTAINER_GET_PRIVATE(self);
-    priv->children = NULL;
-}
-
-/**
- * eek_container_foreach_child:
- * @container: an #EekContainer
- * @callback: an #EekCallback
- * @user_data: additional data passed to @callback
- *
- * Enumerate children of @container and run @callback with each child.
- */
-void
-eek_container_foreach_child (EekContainer *container,
-                             EekCallback   callback,
-                             gpointer      user_data)
-{
-    g_return_if_fail (EEK_IS_CONTAINER(container));
-    EEK_CONTAINER_GET_CLASS(container)->foreach_child (container,
-                                                       callback,
-                                                       user_data);
-}
-
-/**
- * eek_container_find:
- * @container: an #EekContainer
- * @func: function to be used to compare two children
- * @user_data: additional data passed to @func
- *
- * Find a child which matches the criteria supplied as @func, in @container.
- * Returns: an #EekElement or NULL on failure
- */
-EekElement *
-eek_container_find (EekContainer  *container,
-                    EekCompareFunc func,
-                    gpointer       user_data)
-{
-    g_return_val_if_fail (EEK_IS_CONTAINER(container), NULL);
-    return EEK_CONTAINER_GET_CLASS(container)->find (container,
-                                                     func,
-                                                     user_data);
-}
-
-struct _FbpData
-{
-    EekKey *key;
-    gint x, y;
-};
-typedef struct _FbpData FbpData;
-
-static gint
-compare_element_by_position (EekElement *element, gpointer user_data)
-{
-    EekBounds bounds;
-    FbpData *data = user_data;
-
-    eek_element_get_bounds (element, &bounds);
-    if (bounds.x <= data->x && bounds.y <= data->y &&
-        data->x <= (bounds.x + bounds.width) &&
-        data->y <= (bounds.y + bounds.height))
-        return 0;
-    return -1;
-}
-
-EekElement *
-eek_container_find_by_position (EekContainer *container,
-                                gdouble       x,
-                                gdouble       y)
-{
-    EekBounds bounds;
-    FbpData data;
-
-    g_return_val_if_fail (EEK_IS_CONTAINER(container), NULL);
-    eek_element_get_bounds (EEK_ELEMENT(container), &bounds);
-    data.x = x - bounds.x;
-    data.y = y - bounds.y;
-    return eek_container_find (container,
-                               compare_element_by_position,
-                               &data);
-}
@@ -1,98 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_CONTAINER_H
-#define EEK_CONTAINER_H 1
-
-#include "eek-element.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_CONTAINER (eek_container_get_type())
-#define EEK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CONTAINER, EekContainer))
-#define EEK_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CONTAINER, EekContainerClass))
-#define EEK_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CONTAINER))
-#define EEK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CONTAINER))
-#define EEK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CONTAINER, EekContainerClass))
-
-typedef struct _EekContainerClass EekContainerClass;
-typedef struct _EekContainerPrivate EekContainerPrivate;
-
-typedef void (*EekCallback) (EekElement *element, gpointer user_data);
-typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);
-
-struct _EekContainer
-{
-    /*< private >*/
-    EekElement parent;
-
-    EekContainerPrivate *priv;
-};
-
-/**
- * EekContainerClass:
- * @foreach_child: virtual function for iterating over the container's children
- * @find: virtual function for looking up a child
- * @child_added: class handler for #EekContainer::child-added
- * @child_removed: class handler for #EekContainer::child-added
- */
-struct _EekContainerClass
-{
-    /*< private >*/
-    EekElementClass parent_class;
-
-    void        (* add_child)        (EekContainer  *self,
-                                      EekElement    *element);
-
-    void        (* remove_child)     (EekContainer  *self,
-                                      EekElement    *element);
-
-    /*< public >*/
-    void        (* foreach_child)    (EekContainer  *self,
-                                      EekCallback    callback,
-                                      gpointer       user_data);
-    EekElement *(* find)             (EekContainer  *self,
-                                      EekCompareFunc func,
-                                      gpointer       user_data);
-
-    /* signals */
-    void        (* child_added)      (EekContainer  *self,
-                                      EekElement    *element);
-    void        (* child_removed)    (EekContainer  *self,
-                                      EekElement    *element);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType       eek_container_get_type         (void) G_GNUC_CONST;
-
-void        eek_container_foreach_child    (EekContainer  *container,
-                                            EekCallback    callback,
-                                            gpointer       user_data);
-EekElement *eek_container_find             (EekContainer  *container,
-                                            EekCompareFunc func,
-                                            gpointer       user_data);
-EekElement *eek_container_find_by_position (EekContainer  *container,
-                                            gdouble        x,
-                                            gdouble        y);
-
-G_END_DECLS
-#endif  /* EEK_CONTAINER_H */
@@ -1,462 +0,0 @@
-/* 
- * Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
-
- */
-
-#include <math.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-keyboard.h"
-#include "eek-key.h"
-#include "eek-drawing.h"
-#include "eek-keysym.h"
-
-
-void
-eek_draw_text_on_layout (PangoLayout *layout,
-                         const gchar *text)
-{
-    /* pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); */
-    pango_layout_set_text (layout, text, -1);
-}
-
-struct _GetFontSizeCallbackData
-{
-    PangoLayout *layout;
-    EekKeysymCategory category;
-    gint minimum_font_size;
-    gint font_size;
-};
-typedef struct _GetFontSizeCallbackData GetFontSizeCallbackData;
-
-static gint
-get_font_size (const gchar *text,
-               EekBounds   *bounds,
-               PangoLayout *layout)
-{
-    gdouble scale_x, scale_y;
-    const PangoFontDescription *base_font_desc;
-    PangoFontDescription *font_desc;
-    PangoRectangle logical_rect = { 0, };
-    gint font_size;
-
-    layout = pango_layout_copy (layout);
-    base_font_desc = pango_layout_get_font_description (layout);
-    font_desc = pango_font_description_copy (base_font_desc);
-
-    font_size = eek_bounds_long_side (bounds) * PANGO_SCALE;
-    pango_font_description_set_size (font_desc, font_size);
-    pango_layout_set_font_description (layout, font_desc);
-    pango_font_description_free (font_desc);
-
-    eek_draw_text_on_layout (layout, text);
-    pango_layout_get_extents (layout, NULL, &logical_rect);
-
-    scale_x = scale_y = 1.0;
-    if (logical_rect.width > bounds->width * PANGO_SCALE)
-        scale_x = bounds->width * PANGO_SCALE / logical_rect.width;
-    if (logical_rect.height > bounds->height * PANGO_SCALE)
-        scale_y = bounds->height * PANGO_SCALE / logical_rect.height;
-    g_object_unref (layout);
-    return font_size * (scale_x < scale_y ? scale_x : scale_y);
-}
-
-static void
-egf_key_callback (EekElement *element,
-                  gpointer user_data)
-{
-    EekKey *key = EEK_KEY(element);
-    GetFontSizeCallbackData *data = user_data;
-    gdouble font_size;
-    guint keysym;
-    EekBounds bounds;
-    const gchar *label;
-
-    keysym = eek_key_get_keysym (key);
-    if (keysym == EEK_INVALID_KEYSYM ||
-        eek_keysym_get_category (keysym) != data->category)
-        return;
-
-    eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
-    label = eek_keysym_to_string (keysym);
-    font_size = get_font_size (label, &bounds, data->layout);
-    if (font_size < data->font_size && font_size >= data->minimum_font_size)
-        data->font_size = font_size;
-}
-
-static void
-egf_section_callback (EekElement *element,
-                      gpointer    user_data)
-{
-    eek_container_foreach_child (EEK_CONTAINER(element),
-                                 egf_key_callback,
-                                 user_data);
-}
-
-static PangoFontDescription *
-get_font_for_category (EekKeyboard      *keyboard,
-                       EekKeysymCategory category,
-                       PangoLayout      *layout,
-                       gdouble           minimum_font_size,
-                       gdouble           maximum_font_size)
-{
-    GetFontSizeCallbackData data;
-    PangoFontDescription *font_desc;
-    const PangoFontDescription *base_font_desc;
-
-    data.layout = layout;
-    data.category = category;
-    data.minimum_font_size = minimum_font_size;
-    data.font_size = maximum_font_size;
-
-    eek_container_foreach_child (EEK_CONTAINER(keyboard),
-                                 egf_section_callback,
-                                 &data);
-
-    base_font_desc = pango_layout_get_font_description (layout);
-    font_desc = pango_font_description_copy (base_font_desc);
-    pango_font_description_set_size (font_desc, data.font_size);
-
-    return font_desc;
-}
-
-void
-eek_get_fonts (EekKeyboard           *keyboard,
-               PangoLayout           *layout,
-               PangoFontDescription **fonts)
-{
-    EekBounds bounds;
-    PangoFontDescription *font_desc;
-    gint font_size;
-
-    /* font for EEK_KEYSYM_CATEGORY_LETTER */
-    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
-    font_desc = get_font_for_category (keyboard,
-                                       EEK_KEYSYM_CATEGORY_LETTER,
-                                       layout,
-                                       0,
-                                       eek_bounds_long_side (&bounds) *
-                                       PANGO_SCALE);
-    font_size = pango_font_description_get_size (font_desc);
-    fonts[EEK_KEYSYM_CATEGORY_LETTER] = font_desc;
-
-    /* font for EEK_KEYSYM_CATEGORY_FUNCTION */
-    font_desc = get_font_for_category (keyboard,
-                                       EEK_KEYSYM_CATEGORY_FUNCTION,
-                                       layout,
-                                       font_size * 0.3,
-                                       font_size);
-    fonts[EEK_KEYSYM_CATEGORY_FUNCTION] = font_desc;
-
-    /* font for EEK_KEYSYM_CATEGORY_KEYNAME */
-    font_desc = get_font_for_category (keyboard,
-                                       EEK_KEYSYM_CATEGORY_KEYNAME,
-                                       layout,
-                                       font_size * 0.3,
-                                       font_size);
-    fonts[EEK_KEYSYM_CATEGORY_KEYNAME] = font_desc;
-}
-
-void
-eek_draw_outline (cairo_t *cr, EekOutline *outline)
-{
-    cairo_pattern_t *pat;
-
-    cairo_set_line_width (cr, 1);
-    cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
-
-    pat = cairo_pattern_create_linear (0.0, 0.0,  0.0, 256.0);
-    cairo_pattern_add_color_stop_rgba (pat, 1, 0.5, 0.5, 0.5, 1);
-    cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1);
-
-    cairo_set_source (cr, pat);
-
-    eek_draw_rounded_polygon (cr,
-                              TRUE,
-                              outline->corner_radius,
-                              outline->points,
-                              outline->num_points);
-
-    cairo_pattern_destroy (pat);
-
-    cairo_set_source_rgba (cr, 0.3, 0.3, 0.3, 0.5);
-    eek_draw_rounded_polygon (cr,
-                              FALSE,
-                              outline->corner_radius,
-                              outline->points,
-                              outline->num_points);
-}
-
-void
-eek_draw_key_label (cairo_t               *cr,
-                    EekKey                *key,
-                    PangoFontDescription **fonts)
-{
-    guint keysym;
-    EekKeysymCategory category;
-    const gchar *label;
-    PangoLayout *layout;
-    PangoRectangle logical_rect = { 0, };
-    EekBounds bounds;
-
-    keysym = eek_key_get_keysym (key);
-    if (keysym == EEK_INVALID_KEYSYM)
-        return;
-
-    category = eek_keysym_get_category (keysym);
-    if (category == EEK_KEYSYM_CATEGORY_UNKNOWN)
-        return;
-
-    label = eek_keysym_to_string (keysym);
-    if (!label)
-        return;
-
-    eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
-    layout = pango_cairo_create_layout (cr);
-    pango_layout_set_font_description (layout, fonts[category]);
-    pango_layout_set_width (layout, PANGO_SCALE * bounds.width);
-    pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-    pango_layout_set_text (layout, label, -1);
-    pango_layout_get_extents (layout, NULL, &logical_rect);
-    cairo_rel_move_to (cr,
-                   (bounds.width - logical_rect.width / PANGO_SCALE) / 2,
-                   (bounds.height - logical_rect.height / PANGO_SCALE) / 2);
-    pango_cairo_show_layout (cr, layout);
-    g_object_unref (layout);
-}
-
-/*
- * The functions below are borrowed from
- * libgnomekbd/gkbd-keyboard-drawing.c.
- * Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
- *
- * length(), point_line_distance(), normal_form(), inverse(), multiply(),
- * intersect(), rounded_corner(), draw_rounded_polygon()
- */
-
-static gdouble
-length (gdouble x, gdouble y)
-{
-    return sqrt (x * x + y * y);
-}
-
-static gdouble
-point_line_distance (gdouble ax, gdouble ay, gdouble nx, gdouble ny)
-{
-    return ax * nx + ay * ny;
-}
-
-static void
-normal_form (gdouble ax, gdouble ay,
-	     gdouble bx, gdouble by,
-	     gdouble * nx, gdouble * ny, gdouble * d)
-{
-    gdouble l;
-
-    *nx = by - ay;
-    *ny = ax - bx;
-
-    l = length (*nx, *ny);
-
-    *nx /= l;
-    *ny /= l;
-
-    *d = point_line_distance (ax, ay, *nx, *ny);
-}
-
-static void
-inverse (gdouble a, gdouble b, gdouble c, gdouble d,
-	 gdouble * e, gdouble * f, gdouble * g, gdouble * h)
-{
-    gdouble det;
-
-    det = a * d - b * c;
-
-    *e = d / det;
-    *f = -b / det;
-    *g = -c / det;
-    *h = a / det;
-}
-
-static void
-multiply (gdouble a, gdouble b, gdouble c, gdouble d,
-	  gdouble e, gdouble f, gdouble * x, gdouble * y)
-{
-    *x = a * e + b * f;
-    *y = c * e + d * f;
-}
-
-static void
-intersect (gdouble n1x, gdouble n1y, gdouble d1,
-	   gdouble n2x, gdouble n2y, gdouble d2, gdouble * x, gdouble * y)
-{
-    gdouble e, f, g, h;
-
-    inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h);
-    multiply (e, f, g, h, d1, d2, x, y);
-}
-
-
-/* draw an angle from the current point to b and then to c,
- * with a rounded corner of the given radius.
- */
-static void
-rounded_corner (cairo_t * cr,
-		gdouble bx, gdouble by,
-		gdouble cx, gdouble cy, gdouble radius)
-{
-    gdouble ax, ay;
-    gdouble n1x, n1y, d1;
-    gdouble n2x, n2y, d2;
-    gdouble pd1, pd2;
-    gdouble ix, iy;
-    gdouble dist1, dist2;
-    gdouble nx, ny, d;
-    gdouble a1x, a1y, c1x, c1y;
-    gdouble phi1, phi2;
-
-    cairo_get_current_point (cr, &ax, &ay);
-#ifdef KBDRAW_DEBUG
-    printf ("        current point: (%f, %f), radius %f:\n", ax, ay,
-            radius);
-#endif
-
-    /* make sure radius is not too large */
-    dist1 = length (bx - ax, by - ay);
-    dist2 = length (cx - bx, cy - by);
-
-    radius = MIN (radius, MIN (dist1, dist2));
-
-    /* construct normal forms of the lines */
-    normal_form (ax, ay, bx, by, &n1x, &n1y, &d1);
-    normal_form (bx, by, cx, cy, &n2x, &n2y, &d2);
-
-    /* find which side of the line a,b the point c is on */
-    if (point_line_distance (cx, cy, n1x, n1y) < d1)
-        pd1 = d1 - radius;
-    else
-        pd1 = d1 + radius;
-
-    /* find which side of the line b,c the point a is on */
-    if (point_line_distance (ax, ay, n2x, n2y) < d2)
-        pd2 = d2 - radius;
-    else
-        pd2 = d2 + radius;
-
-    /* intersect the parallels to find the center of the arc */
-    intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy);
-
-    nx = (bx - ax) / dist1;
-    ny = (by - ay) / dist1;
-    d = point_line_distance (ix, iy, nx, ny);
-
-    /* a1 is the point on the line a-b where the arc starts */
-    intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y);
-
-    nx = (cx - bx) / dist2;
-    ny = (cy - by) / dist2;
-    d = point_line_distance (ix, iy, nx, ny);
-
-    /* c1 is the point on the line b-c where the arc ends */
-    intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y);
-
-    /* determine the first angle */
-    if (a1x - ix == 0)
-        phi1 = (a1y - iy > 0) ? M_PI_2 : 3 * M_PI_2;
-    else if (a1x - ix > 0)
-        phi1 = atan ((a1y - iy) / (a1x - ix));
-    else
-        phi1 = M_PI + atan ((a1y - iy) / (a1x - ix));
-
-    /* determine the second angle */
-    if (c1x - ix == 0)
-        phi2 = (c1y - iy > 0) ? M_PI_2 : 3 * M_PI_2;
-    else if (c1x - ix > 0)
-        phi2 = atan ((c1y - iy) / (c1x - ix));
-    else
-        phi2 = M_PI + atan ((c1y - iy) / (c1x - ix));
-
-    /* compute the difference between phi2 and phi1 mod 2pi */
-    d = phi2 - phi1;
-    while (d < 0)
-        d += 2 * M_PI;
-    while (d > 2 * M_PI)
-        d -= 2 * M_PI;
-
-#ifdef KBDRAW_DEBUG
-    printf ("        line 1 to: (%f, %f):\n", a1x, a1y);
-#endif
-    if (!(isnan (a1x) || isnan (a1y)))
-        cairo_line_to (cr, a1x, a1y);
-
-    /* pick the short arc from phi1 to phi2 */
-    if (d < M_PI)
-        cairo_arc (cr, ix, iy, radius, phi1, phi2);
-    else
-        cairo_arc_negative (cr, ix, iy, radius, phi1, phi2);
-
-#ifdef KBDRAW_DEBUG
-    printf ("        line 2 to: (%f, %f):\n", cx, cy);
-#endif
-    cairo_line_to (cr, cx, cy);
-}
-
-void
-eek_draw_rounded_polygon (cairo_t  *cr,
-                          gboolean  filled,
-                          gdouble   radius,
-                          EekPoint *points,
-                          gint      num_points)
-{
-    gint i, j;
-
-    cairo_move_to (cr,
-                   (gdouble) (points[num_points - 1].x +
-                              points[0].x) / 2,
-                   (gdouble) (points[num_points - 1].y +
-                              points[0].y) / 2);
-
-
-#ifdef KBDRAW_DEBUG
-    printf ("    rounded polygon of radius %f:\n", radius);
-#endif
-    for (i = 0; i < num_points; i++) {
-        j = (i + 1) % num_points;
-        rounded_corner (cr, (gdouble) points[i].x,
-                        (gdouble) points[i].y,
-                        (gdouble) (points[i].x + points[j].x) / 2,
-                        (gdouble) (points[i].y + points[j].y) / 2,
-                        radius);
-#ifdef KBDRAW_DEBUG
-        printf ("      corner (%d, %d) -> (%d, %d):\n",
-                points[i].x, points[i].y, points[j].x,
-                points[j].y);
-#endif
-    };
-    cairo_close_path (cr);
-
-    if (filled)
-        cairo_fill (cr);
-    else
-        cairo_stroke (cr);
-}
@@ -1,32 +0,0 @@
-#ifndef EEK_DRAWING_H
-#define EEK_DRAWING_H 1
-
-#include <pango/pangocairo.h>
-#include "eek-keyboard.h"
-#include "eek-keysym.h"
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-
-void eek_draw_text_on_layout  (PangoLayout           *layout,
-                               const gchar           *text);
-
-void eek_get_fonts            (EekKeyboard           *keyboard,
-                               PangoLayout           *layout,
-                               PangoFontDescription **fonts);
-
-void eek_draw_outline         (cairo_t               *cr,
-                               EekOutline            *outline);
-
-void eek_draw_key_label       (cairo_t               *cr,
-                               EekKey                *key,
-                               PangoFontDescription **fonts);
-
-void eek_draw_rounded_polygon (cairo_t               *cr,
-                               gboolean               filled,
-                               gdouble                radius,
-                               EekPoint              *points,
-                               gint                   num_points);
-
-G_END_DECLS
-#endif  /* EEK_DRAWING_H */
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 Red Hat, Inc.
+ * 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
@@ -26,108 +26,29 @@
 * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
 */

+#include "config.h"
+
 #include <string.h>

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
 #include "eek-element.h"
-#include "eek-container.h"

 enum {
    PROP_0,
-    PROP_NAME,
    PROP_BOUNDS,
    PROP_LAST
 };

-G_DEFINE_ABSTRACT_TYPE (EekElement, eek_element, G_TYPE_INITIALLY_UNOWNED);
-
-#define EEK_ELEMENT_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_ELEMENT, EekElementPrivate))
-
-
-struct _EekElementPrivate
+typedef struct _EekElementPrivate
 {
-    gchar *name;
    EekBounds bounds;
-    EekElement *parent;
-};
+} EekElementPrivate;

-static void
-eek_element_real_set_parent (EekElement *self,
-                             EekElement *parent)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    if (!parent) {
-        g_return_if_fail (priv->parent);
-        /* release self-reference acquired when setting parent */
-        g_object_unref (self);
-        priv->parent = NULL;
-    } else {
-        g_return_if_fail (!priv->parent);
-        g_object_ref_sink (self);
-        priv->parent = parent;
-    }
-}
-
-static EekElement *
-eek_element_real_get_parent (EekElement *self)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    return priv->parent;
-}
-
-static void
-eek_element_real_set_name (EekElement  *self,
-                           const gchar *name)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    g_free (priv->name);
-    priv->name = g_strdup (name);
-
-    g_object_notify (G_OBJECT(self), "name");
-}
-
-static G_CONST_RETURN gchar *
-eek_element_real_get_name (EekElement *self)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    return priv->name;
-}
-
-static void
-eek_element_real_set_bounds (EekElement *self,
-                             EekBounds *bounds)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    priv->bounds = *bounds;
-}
-
-static void
-eek_element_real_get_bounds (EekElement *self,
-                             EekBounds  *bounds)
-{
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(self);
-
-    g_return_if_fail (bounds);
-    *bounds = priv->bounds;
-
-    g_object_notify (G_OBJECT(self), "bounds");
-}
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)

 static void
 eek_element_finalize (GObject *object)
 {
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(object);
-
-    g_free (priv->name);
+    G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
 }

 static void
@@ -136,15 +57,11 @@ eek_element_set_property (GObject      *object,
                          const GValue *value,
                          GParamSpec   *pspec)
 {
-    g_return_if_fail (EEK_IS_ELEMENT(object));
+    EekElement *element = EEK_ELEMENT(object);
+
    switch (prop_id) {
-    case PROP_NAME:
-        eek_element_set_name (EEK_ELEMENT(object),
-                              g_value_get_string (value));
-        break;
    case PROP_BOUNDS:
-        eek_element_set_bounds (EEK_ELEMENT(object),
-                                g_value_get_boxed (value));
+        eek_element_set_bounds (element, g_value_get_boxed (value));
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -158,15 +75,12 @@ eek_element_get_property (GObject    *object,
                          GValue     *value,
                          GParamSpec *pspec)
 {
-    EekBounds  bounds;
+    EekElement *element = EEK_ELEMENT(object);
+    EekBounds bounds;

-    g_return_if_fail (EEK_IS_ELEMENT(object));
    switch (prop_id) {
-    case PROP_NAME:
-        g_value_set_string (value, eek_element_get_name (EEK_ELEMENT(object)));
-        break;
    case PROP_BOUNDS:
-        eek_element_get_bounds (EEK_ELEMENT(object), &bounds);
+        eek_element_get_bounds (element, &bounds);
        g_value_set_boxed (value, &bounds);
        break;
    default:
@@ -181,34 +95,11 @@ eek_element_class_init (EekElementClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

-    g_type_class_add_private (gobject_class,
-                              sizeof (EekElementPrivate));
-
-    klass->set_parent = eek_element_real_set_parent;
-    klass->get_parent = eek_element_real_get_parent;
-    klass->set_name = eek_element_real_set_name;
-    klass->get_name = eek_element_real_get_name;
-    klass->set_bounds = eek_element_real_set_bounds;
-    klass->get_bounds = eek_element_real_get_bounds;
-
+    /* signals */
    gobject_class->set_property = eek_element_set_property;
    gobject_class->get_property = eek_element_get_property;
    gobject_class->finalize     = eek_element_finalize;

-    /**
-     * EekElement:name:
-     *
-     * The name of #EekElement.
-     */
-    pspec = g_param_spec_string ("name",
-                                 "Name",
-                                 "Name",
-                                 NULL,
-                                 G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_NAME,
-                                     pspec);
-
    /**
     * EekElement:bounds:
     *
@@ -227,70 +118,7 @@ eek_element_class_init (EekElementClass *klass)
 static void
 eek_element_init (EekElement *self)
 {
-    EekElementPrivate *priv;
-
-    priv = self->priv = EEK_ELEMENT_GET_PRIVATE(self);
-    priv->name = NULL;
-    memset (&priv->bounds, 0, sizeof priv->bounds);
-}
-
-/**
- * eek_element_set_parent:
- * @element: an #EekElement
- * @parent: an #EekElement
- *
- * Set the parent of @element to @parent.
- */
-void
-eek_element_set_parent (EekElement *element,
-                        EekElement *parent)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (EEK_IS_ELEMENT(parent));
-    EEK_ELEMENT_GET_CLASS(element)->set_parent (element, parent);
-}
-
-/**
- * eek_element_get_parent:
- * @element: an #EekElement
- *
- * Get the parent of @element.
- * Returns: an #EekElement if the parent is set
- */
-EekElement *
-eek_element_get_parent (EekElement *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-    return EEK_ELEMENT_GET_CLASS(element)->get_parent (element);
-}
-
-/**
- * eek_element_set_name:
- * @element: an #EekElement
- * @name: name of @element
- *
- * Set the name of @element to @name.
- */
-void
-eek_element_set_name (EekElement  *element,
-                      const gchar *name)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    EEK_ELEMENT_GET_CLASS(element)->set_name (element, name);
-}
-
-/**
- * eek_element_get_name:
- * @element: an #EekElement
- *
- * Get the name of @element.
- * Returns: the name of @element or NULL when the name is not set
- */
-G_CONST_RETURN gchar *
-eek_element_get_name (EekElement  *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-    return EEK_ELEMENT_GET_CLASS(element)->get_name (element);
+    (void)self;
 }

 /**
@@ -307,13 +135,16 @@ eek_element_set_bounds (EekElement  *element,
                        EekBounds   *bounds)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-    EEK_ELEMENT_GET_CLASS(element)->set_bounds (element, bounds);
+
+    EekElementPrivate *priv = eek_element_get_instance_private (element);
+
+    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
 }

 /**
 * eek_element_get_bounds:
 * @element: an #EekElement
- * @bounds: pointer where bounding box of @element will be stored
+ * @bounds: (out): pointer where bounding box of @element will be stored
 *
 * Get the bounding box of @element.  Note that if @element has
 * parent, position of @bounds are relative to the parent.  To obtain
@@ -324,30 +155,9 @@ eek_element_get_bounds (EekElement  *element,
                        EekBounds   *bounds)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-    EEK_ELEMENT_GET_CLASS(element)->get_bounds (element, bounds);
-}
+    g_return_if_fail (bounds != NULL);

-/**
- * eek_element_get_absolute_position:
- * @element: an #EekElement
- * @x: pointer where the X coordinate of @element will be stored
- * @y: pointer where the Y coordinate of @element will be stored
- *
- * Compute the absolute position of @element.
- */
-void
-eek_element_get_absolute_position (EekElement *element,
-                                   gdouble    *x,
-                                   gdouble    *y)
-{
-    EekBounds bounds;
-    gdouble ax = 0.0, ay = 0.0;
+    EekElementPrivate *priv = eek_element_get_instance_private (element);

-    do {
-        eek_element_get_bounds (element, &bounds);
-        ax += bounds.x;
-        ay += bounds.y;
-    } while ((element = eek_element_get_parent (element)) != NULL);
-    *x = ax;
-    *y = ay;
+    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
 }
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 Red Hat, Inc.
+ * 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
@@ -17,6 +17,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02110-1301 USA
 */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
 #ifndef EEK_ELEMENT_H
 #define EEK_ELEMENT_H 1

@@ -25,65 +30,24 @@

 G_BEGIN_DECLS
 #define EEK_TYPE_ELEMENT (eek_element_get_type())
-#define EEK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_ELEMENT, EekElement))
-#define EEK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_ELEMENT, EekElementClass))
-#define EEK_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_ELEMENT))
-#define EEK_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_ELEMENT))
-#define EEK_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_ELEMENT, EekElementClass))
-
-typedef struct _EekElementClass   EekElementClass;
-typedef struct _EekElementPrivate EekElementPrivate;
-
-struct _EekElement
-{
-    /*< private >*/
-    GInitiallyUnowned parent;
-
-    EekElementPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)

 struct _EekElementClass
 {
    /*< private >*/
-    GInitiallyUnownedClass parent_class;
-    void                  (* set_parent) (EekElement  *self,
-                                          EekElement  *parent);
-    EekElement           *(* get_parent) (EekElement  *self);
-    void                  (* set_name)   (EekElement  *self,
-                                          const gchar *name);
-
-    G_CONST_RETURN gchar *(* get_name)   (EekElement  *self);
-
-    void                  (* set_bounds) (EekElement  *self,
-                                          EekBounds   *bounds);
-
-    void                  (* get_bounds) (EekElement  *self,
-                                          EekBounds   *bounds);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
+    GObjectClass parent_class;
 };

-GType                 eek_element_get_type              (void) G_GNUC_CONST;
+void         eek_element_set_name              (EekElement  *element,
+                                                const gchar *name);

-void                  eek_element_set_parent            (EekElement  *element,
-                                                         EekElement  *parent);
-EekElement           *eek_element_get_parent            (EekElement  *element);
-void                  eek_element_set_name              (EekElement  *element,
-                                                         const gchar *name);
+const gchar *eek_element_get_name              (EekElement  *element);

-G_CONST_RETURN gchar *eek_element_get_name              (EekElement  *element);
+void         eek_element_set_bounds            (EekElement  *element,
+                                                EekBounds   *bounds);

-void                  eek_element_set_bounds            (EekElement  *element,
-                                                         EekBounds   *bounds);
-
-void                  eek_element_get_bounds            (EekElement  *element,
-                                                         EekBounds   *bounds);
-
-void                  eek_element_get_absolute_position (EekElement  *element,
-                                                         gdouble     *x,
-                                                         gdouble     *y);
+void         eek_element_get_bounds            (EekElement  *element,
+                                                EekBounds   *bounds);

 G_END_DECLS
 #endif  /* EEK_ELEMENT_H */
@@ -1,17 +1,17 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 Red Hat, Inc.
- * 
+/*
+ * 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
@@ -20,471 +20,412 @@

 /**
 * SECTION:eek-gtk-keyboard
- * @short_description: #EekKeyboard that can be converted into a #GtkWidget
+ * @short_description: a #GtkWidget displaying #EekKeyboard
 */
+
+#include "config.h"
+
+#include <math.h>
 #include <string.h>

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
+#include "eek-renderer.h"
+#include "eek-keyboard.h"

 #include "eek-gtk-keyboard.h"
-#include "eek-drawing.h"
-#include "eek-keyboard.h"
-#include "eek-section.h"
-#include "eek-key.h"
-#include "eek-keysym.h"

-G_DEFINE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK_TYPE_KEYBOARD);
+#include "eekboard/eekboard-context-service.h"
+#include "src/layout.h"
+#include "src/submission.h"

-#define EEK_GTK_KEYBOARD_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardPrivate))
+#define LIBFEEDBACK_USE_UNSTABLE_API
+#include <libfeedback.h>

-#define SCALE 1.5
+#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"

-struct _EekGtkKeyboardPrivate
+typedef struct _EekGtkKeyboardPrivate
 {
-    GtkWidget *widget;
+    EekRenderer *renderer; // owned, nullable
+    EekboardContextService *eekboard_context; // unowned reference
+    struct submission *submission; // unowned reference

-    /* pixmap of entire keyboard (for expose event) */
-    GdkPixmap *pixmap;
+    struct squeek_layout_state *layout; // unowned
+    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context

-    /* mapping from outline pointer to pixmap */
-    GHashTable *outline_textures;
+    GdkEventSequence *sequence; // unowned reference
+    LfbEvent *event;
+} EekGtkKeyboardPrivate;

-    /* mapping from outline pointer to large pixmap */
-    GHashTable *large_outline_textures;
-
-    PangoFontDescription *fonts[EEK_KEYSYM_CATEGORY_LAST];
-
-    gdouble scale;
-};
-
-static void prepare_keyboard_pixmap (EekGtkKeyboard *keyboard);
+G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)

 static void
-eek_gtk_keyboard_real_set_keysym_index (EekKeyboard *self,
-                                        gint         group,
-                                        gint         level)
+eek_gtk_keyboard_real_realize (GtkWidget      *self)
 {
-    gint g, l;
+    gtk_widget_set_events (self,
+                           GDK_EXPOSURE_MASK |
+                           GDK_KEY_PRESS_MASK |
+                           GDK_KEY_RELEASE_MASK |
+                           GDK_BUTTON_PRESS_MASK |
+                           GDK_BUTTON_RELEASE_MASK |
+                           GDK_BUTTON_MOTION_MASK |
+                           GDK_TOUCH_MASK);

-    eek_keyboard_get_keysym_index (self, &g, &l);
-    EEK_KEYBOARD_CLASS(eek_gtk_keyboard_parent_class)->
-        set_keysym_index (self, group, level);
-    if (g != group || l != level) {
-        EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD(self);
-        EekGtkKeyboardPrivate *priv =
-            EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-        GtkStateType state;
-        GtkAllocation allocation;
+    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
+}

-        prepare_keyboard_pixmap (keyboard);
-        state = gtk_widget_get_state (GTK_WIDGET (priv->widget));
-        gtk_widget_get_allocation (GTK_WIDGET (priv->widget), &allocation);
-        gdk_draw_drawable (gtk_widget_get_window (priv->widget),
-                           gtk_widget_get_style (priv->widget)->fg_gc[state],
-                           priv->pixmap,
-                           0, 0,
-                           0, 0,
-                           allocation.width, allocation.height);
+static gboolean
+eek_gtk_keyboard_real_draw (GtkWidget *self,
+                            cairo_t   *cr)
+{
+    EekGtkKeyboardPrivate *priv =
+        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);
+
+        eek_renderer_set_allocation_size (priv->renderer,
+                                          priv->keyboard->layout,
+                                          allocation.width,
+                                          allocation.height);
+        eek_renderer_set_scale_factor (priv->renderer,
+                                       gtk_widget_get_scale_factor (self));
+    }
+
+    eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, 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));
+    // 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);
+
+    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->
+        size_allocate (self, allocation);
+}
+
+static void
+on_event_triggered (LfbEvent      *event,
+                    GAsyncResult  *res,
+                    gpointer      unused)
+{
+    g_autoptr (GError) err = NULL;
+
+    if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
+        g_warning ("Failed to trigger feedback for '%s': %s",
+                   lfb_event_get_event (event), err->message);
+    }
+}
+
+static void depress(EekGtkKeyboard *self,
+                    gdouble x, gdouble y, guint32 time)
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    if (!priv->keyboard) {
+        return;
+    }
+    squeek_layout_depress(priv->keyboard->layout,
+                          priv->submission,
+                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
+}
+
+static void drag(EekGtkKeyboard *self,
+                 gdouble x, gdouble y, guint32 time)
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (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);
+    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
+eek_gtk_keyboard_real_button_press_event (GtkWidget      *self,
+                                          GdkEventButton *event)
+{
+    if (event->type == GDK_BUTTON_PRESS && event->button == 1) {
+        depress(EEK_GTK_KEYBOARD(self), event->x, event->y, event->time);
+    }
+    return TRUE;
+}
+
+// TODO: this belongs more in gtk_keyboard, with a way to find out which key to re-render
+static gboolean
+eek_gtk_keyboard_real_button_release_event (GtkWidget      *self,
+                                            GdkEventButton *event)
+{
+    if (event->type == GDK_BUTTON_RELEASE && event->button == 1) {
+        // 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_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)
+{
+    if (event->state & GDK_BUTTON1_MASK) {
+        drag(EEK_GTK_KEYBOARD(self), event->x, event->y, event->time);
+    }
+    return TRUE;
+}
+
+// Only one touch stream at a time allowed. Others will be completely ignored.
+static gboolean
+handle_touch_event (GtkWidget     *widget,
+                    GdkEventTouch *event)
+{
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+
+    /* For each new touch, release the previous one and record the new event
+       sequence. */
+    if (event->type == GDK_TOUCH_BEGIN) {
+        release(self, event->time);
+        priv->sequence = event->sequence;
+        depress(self, event->x, event->y, event->time);
+        return TRUE;
+    }
+
+    /* Only allow the latest touch point to be dragged. */
+    if (event->type == GDK_TOUCH_UPDATE && event->sequence == priv->sequence) {
+        drag(self, event->x, event->y, event->time);
+    }
+    else if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
+        // TODO: can the event have different coords than the previous update event?
+        /* Only respond to the release of the latest touch point. Previous
+           touches have already been released. */
+        if (event->sequence == priv->sequence) {
+            release(self, event->time);
+            priv->sequence = NULL;
+        }
+    }
+    return TRUE;
+}
+
+static void
+eek_gtk_keyboard_real_unmap (GtkWidget *self)
+{
+    EekGtkKeyboardPrivate *priv =
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+
+    if (priv->keyboard) {
+        squeek_layout_release_all_only(
+            priv->keyboard->layout,
+            priv->submission,
+            gdk_event_get_time(NULL));
+    }
+
+    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->unmap (self);
+}
+
+static void
+eek_gtk_keyboard_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+    (void)value;
+    switch (prop_id) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
    }
 }

 static void
 eek_gtk_keyboard_dispose (GObject *object)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(object);
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (object);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

-    if (priv->widget) {
-        g_object_unref (priv->widget);
-        priv->widget = NULL;
+    if (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->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);
 }

-static void
-eek_gtk_keyboard_finalize (GObject *object)
-{
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(object);
-    gint i;
-
-    g_hash_table_unref (priv->outline_textures);
-    g_hash_table_unref (priv->large_outline_textures);
-
-    for (i = 0; i < EEK_KEYSYM_CATEGORY_LAST; i++)
-        pango_font_description_free (priv->fonts[i]);
-}
-
 static void
 eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 {
-    EekKeyboardClass *keyboard_class = EEK_KEYBOARD_CLASS (klass);
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

-    g_type_class_add_private (gobject_class,
-                              sizeof (EekGtkKeyboardPrivate));
+    widget_class->realize = eek_gtk_keyboard_real_realize;
+    widget_class->unmap = eek_gtk_keyboard_real_unmap;
+    widget_class->draw = eek_gtk_keyboard_real_draw;
+    widget_class->size_allocate = eek_gtk_keyboard_real_size_allocate;
+    widget_class->button_press_event =
+        eek_gtk_keyboard_real_button_press_event;
+    widget_class->button_release_event =
+        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;

-    keyboard_class->set_keysym_index = eek_gtk_keyboard_real_set_keysym_index;
+    widget_class->touch_event = handle_touch_event;
+
+    gobject_class->set_property = eek_gtk_keyboard_set_property;
    gobject_class->dispose = eek_gtk_keyboard_dispose;
-    gobject_class->finalize = eek_gtk_keyboard_finalize;
 }

 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv;
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    g_autoptr(GError) err = NULL;

-    priv = self->priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-    priv->widget = NULL;
-    priv->pixmap = NULL;
-    priv->outline_textures =
-        g_hash_table_new_full (g_direct_hash,
-                               g_direct_equal,
-                               NULL,
-                               g_object_unref);
-    priv->large_outline_textures =
-        g_hash_table_new_full (g_direct_hash,
-                               g_direct_equal,
-                               NULL,
-                               g_object_unref);
-    memset (priv->fonts, 0, sizeof priv->fonts);
-    priv->scale = 1.0;
+    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:
- *
- * Create a new #EekGtkKeyboard.
+ * Create a new #GtkWidget displaying @keyboard.
+ * Returns: a #GtkWidget
 */
-EekKeyboard*
-eek_gtk_keyboard_new (void)
-{
-    return g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL);
-}
-
-struct _DrawingContext
-{
-    EekGtkKeyboard *keyboard;
-    cairo_t *cr;
-    GdkColor *fg, *bg;
-};
-typedef struct _DrawingContext DrawingContext;
-
-static void
-prepare_keyboard_pixmap_key_callback (EekElement *element,
-                                      gpointer    user_data)
-{
-    DrawingContext *context = user_data;
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(context->keyboard);
-    EekKey *key = EEK_KEY(element);
-    EekBounds bounds;
-    EekOutline *outline;
-    GdkPixmap *texture;
-
-    eek_element_get_bounds (element, &bounds);
-
-    outline = eek_key_get_outline (key);
-    texture = g_hash_table_lookup (priv->outline_textures, outline);
-    if (!texture) {
-        cairo_t *cr;
-
-        texture =
-            gdk_pixmap_new (gtk_widget_get_window (GTK_WIDGET (priv->widget)),
-                            bounds.width, bounds.height, -1);
-        cr = gdk_cairo_create (GDK_DRAWABLE (texture));
-        gdk_cairo_set_source_color (cr, context->bg);
-        cairo_rectangle (cr, 0, 0, bounds.width, bounds.height);
-        gdk_cairo_set_source_color (cr, context->fg);
-        eek_draw_outline (cr, outline);
-        cairo_destroy (cr);
-        g_hash_table_insert (priv->outline_textures, outline, texture);
-    }
-
-    cairo_save (context->cr);
-    cairo_translate (context->cr, bounds.x, bounds.y);
-
-    gdk_cairo_set_source_pixmap (context->cr, texture, 0, 0);
-    cairo_rectangle (context->cr, 0, 0, bounds.width, bounds.height);
-    cairo_fill (context->cr);
-
-    cairo_move_to (context->cr, 0, 0);
-    gdk_cairo_set_source_color (context->cr, context->fg);
-    eek_draw_key_label (context->cr, key, priv->fonts);
-
-    cairo_restore (context->cr);
-}
-
-static void
-prepare_keyboard_pixmap_section_callback (EekElement *element,
-                                          gpointer    user_data)
-{
-    DrawingContext *context = user_data;
-    EekBounds bounds;
-
-    eek_element_get_bounds (element, &bounds);
-    cairo_save (context->cr);
-    cairo_translate (context->cr,
-                     bounds.x,
-                     bounds.y);
-    eek_container_foreach_child (EEK_CONTAINER(element),
-                                 prepare_keyboard_pixmap_key_callback,
-                                 context);
-    cairo_restore (context->cr);
-}
-
-static void
-drawing_context_init (DrawingContext *context, EekGtkKeyboard *keyboard)
-{
-    EekGtkKeyboardPrivate *priv = keyboard->priv;
-    GtkStateType state;
-
-    state = gtk_widget_get_state (GTK_WIDGET (priv->widget));
-    context->keyboard = keyboard;
-    context->fg = &gtk_widget_get_style (GTK_WIDGET (priv->widget))->fg[state];
-    context->bg = &gtk_widget_get_style (GTK_WIDGET (priv->widget))->bg[state];
-}
-
-static void
-prepare_keyboard_pixmap (EekGtkKeyboard *keyboard)
-{
-    EekGtkKeyboardPrivate *priv = keyboard->priv;
-    GtkAllocation allocation;
-    GtkStateType state;
-    DrawingContext context;
-
-    gtk_widget_get_allocation (GTK_WIDGET (priv->widget), &allocation);
-    priv->pixmap =
-        gdk_pixmap_new (gtk_widget_get_window (GTK_WIDGET (priv->widget)),
-                        allocation.width, allocation.height, -1);
-
-    /* blank background */
-    state = gtk_widget_get_state (GTK_WIDGET (priv->widget));
-    gdk_draw_rectangle
-        (priv->pixmap,
-         gtk_widget_get_style (GTK_WIDGET(priv->widget))->base_gc[state],
-         TRUE,
-         0, 0, allocation.width, allocation.height);
-
-    /* draw sections on the canvas */
-    drawing_context_init (&context, keyboard);
-    context.cr = gdk_cairo_create (GDK_DRAWABLE (priv->pixmap));
-    cairo_scale (context.cr, priv->scale, priv->scale);
-    eek_container_foreach_child (EEK_CONTAINER(keyboard),
-                                 prepare_keyboard_pixmap_section_callback,
-                                 &context);
-    cairo_destroy (context.cr);
-}
-
-static gboolean
-on_expose_event (GtkWidget      *widget,
-                 GdkEventExpose *event,
-                 gpointer        user_data)
-{
-    EekGtkKeyboard *keyboard = user_data;
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    GtkStateType state = gtk_widget_get_state (widget);
-
-    if (!priv->pixmap) {
-        /* compute font sizes which fit in each key shape */
-        PangoFontDescription *base_font;
-        PangoContext *context;
-        PangoLayout *layout;
-
-        context = gtk_widget_get_pango_context (priv->widget);
-        layout = pango_layout_new (context);
-        base_font = gtk_widget_get_style (priv->widget)->font_desc;
-        pango_layout_set_font_description (layout, base_font);
-        eek_get_fonts (EEK_KEYBOARD(keyboard), layout, priv->fonts);
-
-        prepare_keyboard_pixmap (keyboard);
-    }
-    g_return_val_if_fail (priv->pixmap, FALSE);
-
-    gdk_draw_drawable (gtk_widget_get_window (widget),
-                       gtk_widget_get_style (widget)->fg_gc[state],
-                       priv->pixmap,
-                       event->area.x, event->area.y,
-                       event->area.x, event->area.y,
-                       event->area.width, event->area.height);
-    return TRUE;
-}
-
-static void
-key_enlarge (EekGtkKeyboard *keyboard, EekKey *key)
-{
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    EekBounds bounds;
-    EekOutline *outline;
-    gdouble ax, ay;
-    GdkPixmap *pixmap, *texture;
-    DrawingContext context;
-    GtkStateType state;
-    cairo_t *cr;
-
-    drawing_context_init (&context, keyboard);
-
-    eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
-    eek_element_get_absolute_position (EEK_ELEMENT(key), &ax, &ay);
-
-    outline = eek_key_get_outline (key);
-    texture = g_hash_table_lookup (priv->large_outline_textures, outline);
-    if (!texture) {
-        texture =
-            gdk_pixmap_new (gtk_widget_get_window (GTK_WIDGET (priv->widget)),
-                            bounds.width * SCALE, bounds.height * SCALE, -1);
-        cr = gdk_cairo_create (GDK_DRAWABLE (texture));
-        cairo_scale (cr, SCALE, SCALE);
-        gdk_cairo_set_source_color (cr, context.bg);
-        cairo_rectangle (cr, 0, 0, bounds.width, bounds.height);
-        gdk_cairo_set_source_color (cr, context.fg);
-        eek_draw_outline (cr, outline);
-        cairo_destroy (cr);
-        g_hash_table_insert (priv->large_outline_textures, outline, texture);
-    }
-
-    pixmap =
-        gdk_pixmap_new (gtk_widget_get_window (GTK_WIDGET (priv->widget)),
-                        bounds.width * SCALE * priv->scale,
-                        bounds.height * SCALE * priv->scale, -1);
-    cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
-    cairo_scale (cr, priv->scale, priv->scale);
-    gdk_cairo_set_source_pixmap (cr, texture, 0, 0);
-    cairo_rectangle (cr, 0, 0, bounds.width * SCALE, bounds.height * SCALE);
-    cairo_fill (cr);
-
-    cairo_move_to (cr, 0, 0);
-    cairo_scale (cr, SCALE, SCALE);
-    gdk_cairo_set_source_color (cr, context.fg);
-    eek_draw_key_label (cr, key, priv->fonts);
-    cairo_destroy (cr);
-
-    state = gtk_widget_get_state (GTK_WIDGET (priv->widget));
-    gdk_draw_drawable (gtk_widget_get_window (priv->widget),
-                       gtk_widget_get_style (priv->widget)->fg_gc[state],
-                       pixmap,
-                       0, 0,
-                       (ax - (bounds.width * SCALE - bounds.width) / 2) *
-                       priv->scale,
-                       (ay - (bounds.height * SCALE - bounds.height) / 2) *
-                       priv->scale,
-                       bounds.width * SCALE * priv->scale,
-                       bounds.height * SCALE * priv->scale);
-    g_object_unref (pixmap);
-}
-
-static void
-key_shrink (EekGtkKeyboard *keyboard, EekKey *key)
-{
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    EekBounds bounds;
-    gdouble ax, ay;
-    GtkStateType state;
-
-    g_return_if_fail (priv->pixmap);
-    eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
-    eek_element_get_absolute_position (EEK_ELEMENT(key), &ax, &ay);
-    state = gtk_widget_get_state (GTK_WIDGET (priv->widget));
-
-    ax -= (bounds.width * SCALE - bounds.width) / 2;
-    ay -= (bounds.height * SCALE - bounds.height) / 2;
-
-    gdk_draw_drawable (gtk_widget_get_window (priv->widget),
-                       gtk_widget_get_style (priv->widget)->fg_gc[state],
-                       priv->pixmap,
-                       ax * priv->scale, ay * priv->scale,
-                       ax * priv->scale, ay * priv->scale,
-                       bounds.width * SCALE * priv->scale,
-                       bounds.height * SCALE * priv->scale);
-}
-
-static gboolean
-on_button_event (GtkWidget      *widget,
-                     GdkEventButton *event,
-                     gpointer        user_data)
-{
-    EekElement *keyboard = user_data, *section, *key;
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    EekBounds bounds;
-    gdouble x, y;
-
-    x = (gdouble)event->x / priv->scale;
-    y = (gdouble)event->y / priv->scale;
-    section = eek_container_find_by_position (EEK_CONTAINER(keyboard), x, y);
-    if (section) {
-        eek_element_get_bounds (keyboard, &bounds);
-        x -= bounds.x;
-        y -= bounds.y;
-        key = eek_container_find_by_position (EEK_CONTAINER(section),
-                                              x,
-                                              y);
-        if (key)
-            switch (event->type) {
-            case GDK_BUTTON_PRESS:
-                key_enlarge (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(key));
-                g_signal_emit_by_name (keyboard, "key-pressed", key);
-                return TRUE;
-            case GDK_BUTTON_RELEASE:
-                key_shrink (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(key));
-                g_signal_emit_by_name (keyboard, "key-released", key);
-                return TRUE;
-            default:
-                return FALSE;
-            }
-    }
-    return FALSE;
-}
-static void
-on_size_allocate (GtkWidget     *widget,
-                  GtkAllocation *allocation,
-                  gpointer       user_data)
-{
-    EekGtkKeyboard *keyboard = user_data;
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    EekBounds bounds;
-    GdkPixmap *pixmap;
-
-    if (priv->pixmap) {
-        pixmap = priv->pixmap;
-        priv->pixmap = NULL;
-        g_object_unref (pixmap);
-    }
-
-    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
-    priv->scale = allocation->width > allocation->height ?
-        allocation->width / bounds.width :
-        allocation->height / bounds.height;
-}
 GtkWidget *
-eek_gtk_keyboard_get_widget (EekGtkKeyboard *keyboard)
+eek_gtk_keyboard_new (EekboardContextService *eekservice,
+                      struct submission *submission,
+                      struct squeek_layout_state *layout)
 {
-    EekGtkKeyboardPrivate *priv =
-        EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
+    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
+    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
+    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);
+}

-    if (!priv->widget) {
-        priv->widget = gtk_drawing_area_new ();
-        g_object_ref_sink (priv->widget);
+/**
+ * eek_gtk_keyboard_emit_feedback:
+ *
+ * Emit button press haptic feedback via libfeedack.
+ */
+void
+eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
+{
+    EekGtkKeyboardPrivate *priv;

-        gtk_widget_set_double_buffered (priv->widget, FALSE);
-        gtk_widget_set_events (priv->widget,
-                               GDK_EXPOSURE_MASK |
-                               GDK_KEY_PRESS_MASK |
-                               GDK_BUTTON_PRESS_MASK |
-                               GDK_BUTTON_RELEASE_MASK);
-        g_signal_connect (priv->widget, "expose_event",
-                          G_CALLBACK (on_expose_event), keyboard);
-        g_signal_connect (priv->widget, "size-allocate",
-                          G_CALLBACK (on_size_allocate), keyboard);
-        g_signal_connect (priv->widget, "button-press-event",
-                          G_CALLBACK (on_button_event), keyboard);
-        g_signal_connect (priv->widget, "button-release-event",
-                          G_CALLBACK (on_button_event), keyboard);
-        eek_keyboard_realize (EEK_KEYBOARD(keyboard));
+    g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
+
+    priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    if (priv->event) {
+        lfb_event_trigger_feedback_async (priv->event,
+                                          NULL,
+                                          (GAsyncReadyCallback)on_event_triggered,
+                                          NULL);
    }
-    return priv->widget;
 }
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 Red Hat, Inc.
+ * 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
@@ -17,45 +17,38 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02110-1301 USA
 */
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek-gtk.h> can be included directly."
+#endif
+
 #ifndef EEK_GTK_KEYBOARD_H
 #define EEK_GTK_KEYBOARD_H 1

+#include <glib.h>
 #include <gtk/gtk.h>
-#include "eek-keyboard.h"
+
+#include "eek/eek-types.h"
+
+struct submission;
+struct squeek_layout_state;

 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
-#define EEK_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboard))
-#define EEK_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
-#define EEK_IS_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_KEYBOARD))
-#define EEK_IS_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_KEYBOARD))
-#define EEK_GTK_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
-
-typedef struct _EekGtkKeyboard EekGtkKeyboard;
-typedef struct _EekGtkKeyboardClass EekGtkKeyboardClass;
-typedef struct _EekGtkKeyboardPrivate EekGtkKeyboardPrivate;
-
-struct _EekGtkKeyboard
-{
-    /*< private >*/
-    EekKeyboard parent;
-
-    EekGtkKeyboardPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK, GTK_KEYBOARD, GtkDrawingArea)

 struct _EekGtkKeyboardClass
 {
    /*< private >*/
-    EekKeyboardClass parent_class;
+    GtkDrawingAreaClass parent_class;

    /*< private >*/
    /* padding */
    gpointer pdummy[24];
 };

-GType        eek_gtk_keyboard_get_type   (void) G_GNUC_CONST;
-EekKeyboard *eek_gtk_keyboard_new        (void);
-GtkWidget   *eek_gtk_keyboard_get_widget (EekGtkKeyboard *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 */
@@ -1,26 +0,0 @@
-/* 
- * Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010 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
- */
-#ifndef EEK_GTK_H
-#define EEK_GTK_H 1
-
-#include "eek.h"
-#include "eek-gtk-keyboard.h"
-
-#endif  /* EEK_GTK_H */
--- a/Show More
+++ b/Show More