WIP: SqueekInputMethod implementing zwp_input_method_v2

Merge branch 'drop-icons' into 'master'
Drop icons See merge request Librem5/squeekboard!29
2019-07-06 02:53:40 +02:00 · 2019-07-04 18:34:15 +00:00 · 2019-07-04 18:26:24 +00:00 · 2019-07-04 16:25:05 +02:00 · 2019-07-04 14:51:00 +02:00 · 2019-07-04 08:44:52 +00:00
201 changed files with 30604 additions and 8610 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,54 +0,0 @@
-*.la
-*.lo
-*.loT
-*.o
-*.so
-*~
-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
-
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,21 @@
+image: debian:buster
+
+stages:
+  - build
+
+before_script:
+  - apt-get -y update
+  - apt-get -y install wget gnupg2
+  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - apt-get -y update
+  - apt-get -y build-dep .
+
+build_meson:
+  stage: build
+  tags:
+    - librem5
+  script:
+    - meson . _build/ -Ddepdatadir=/usr/share
+    - ninja -C _build install
+
--- a/38
+++ b/38
@ -1,6 +1,36 @@
-eekboard is written by Daiki Ueno <ueno@unixuser.org>
+eekboard is written by Daiki Ueno <ueno@unixuser.org>.  The following
+files contain code derived from other free software packages:

-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.
+eek/eek-keyboard-drawing.h
+eek/eek-keyboard-drawing.c

+  These files contain code derived from the libgnomekbd library.
+  Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
+
+eek/eek-theme.h
+eek/eek-theme.c
+eek/eek-theme-context.h
+eek/eek-theme-context.c
+eek/eek-theme-node.h
+eek/eek-theme-node.c
+
+  These files contain code derived from gnome-shell.
+
+  Copyright 2008-2010 Red Hat, Inc.
+  Copyright 2009 Steve Frécinaux
+  Copyright 2009, 2010 Florian Müllner
+  Copyright 2010 Adel Gadllah
+  Copyright 2010 Giovanni Campagna
+  Copyright 2003-2004 Dodji Seketeli
+
+data/icons/8x8/Makefile.am
+data/icons/16x16/Makefile.am
+data/icons/22x22/Makefile.am
+data/icons/24x24/Makefile.am
+data/icons/32x32/Makefile.am
+data/icons/48x48/Makefile.am
+data/icons/scalable/Makefile.am
+
+  These files contain code derived from im-chooser.
+
+  Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
--- a/Makefile.am
+++ b/Makefile.am
@ -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
--- a/0
+++ b/0
--- a/29
+++ b/29
@ -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"
--- a/README.md
+++ b/README.md
@ -0,0 +1,68 @@
+*squeekboard* - a Wayland virtual keyboard
+========================================
+
+*Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.
+
+Features
+--------
+
+### Present
+
+- GTK3
+- Custom xml-defined keyboards
+- DBus interface to show and hide
+
+### Temporarily dropped
+
+- A settings interface
+
+### TODO
+
+- Use Wayland virtual keyboard protocol
+- Use Wayland text input protocol
+- Use Wayland input method protocol
+- Pick up DBus interface files from /usr/share
+
+Building
+--------
+
+### Dependencies
+
+See `.gitlab-ci.yml`.
+
+### Build from git repo
+
+```
+$ git clone https://source.puri.sm/Librem5/eekboard.git
+$ cd eekboard
+$ mkdir ../build
+$ meson ../build/
+$ cd ../build
+$ ninja install
+```
+
+For development, alter the `meson` call:
+
+```
+$ meson ../build/ --prefix=../install
+```
+
+and don't skip `ninja install` before running. The last step is necessary in order to find the keyboard definition files.
+
+Running
+-------
+
+```
+$ rootston
+$ cd ../build/
+$ src/squeekboard
+```
+
+### Testing
+
+```
+$ 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
+$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'ua')]"
+$ gsettings set org.gnome.desktop.input-sources current 1
+```
--- a/13
+++ b/13
@ -1,12 +1 @@
- packaging
-- GIR
-- .spec
-- debian
-- add more tests
-
- eekboard
-- a11y
-
- libeek
-- matchbox-keyboard layout engine
-- delay initialization of XKB and XKL layouts
+See https://github.com/ueno/eekboard/wiki/TODO
--- a/autogen.sh
+++ b/autogen.sh
@ -7,18 +7,14 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="eekboard"

 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/README ) || {
+  && test -f $srcdir/README.md ) || {
    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
+REQUIRED_AUTOMAKE_VERSION=1.10
+REQUIRED_AUTOCONF_VERSION=2.60

 . gnome-autogen.sh
--- a/bindings/vala/Eek-0.90.metadata
+++ b/bindings/vala/Eek-0.90.metadata
@ -0,0 +1 @@
+Eek cheader_filename="eek/eek.h"
--- a/bindings/vala/EekGtk-0.90.metadata
+++ b/bindings/vala/EekGtk-0.90.metadata
@ -0,0 +1 @@
+EekGtk cheader_filename="eek/eek-gtk.h"
--- a/bindings/vala/EekXkl-0.90.metadata
+++ b/bindings/vala/EekXkl-0.90.metadata
@ -0,0 +1 @@
+EekXkl cheader_filename="eek/eek-xkl.h"
--- a/bindings/vala/eek-0.90.deps
+++ b/bindings/vala/eek-0.90.deps
@ -0,0 +1 @@
+gio-2.0
--- a/bindings/vala/eek-gtk-0.90.deps
+++ b/bindings/vala/eek-gtk-0.90.deps
@ -0,0 +1 @@
+eek-0.90
--- a/bindings/vala/eek-xkl-0.90.deps
+++ b/bindings/vala/eek-xkl-0.90.deps
@ -0,0 +1,2 @@
+eek-0.90
+x11
--- a/configure.ac
+++ b/configure.ac
@ -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
--- a/data/eekboard-autostart.desktop.in
+++ b/data/eekboard-autostart.desktop.in
@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Eekboard
+Exec=eekboard -f
+Type=Application
+#AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+X-GNOME-AutoRestart=true
--- a/data/eekboard-server.service.in
+++ b/data/eekboard-server.service.in
@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.fedorahosted.Eekboard
+Exec=@bindir@/eekboard-server
--- a/data/eekboard.desktop.in
+++ b/data/eekboard.desktop.in
@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eekboard
+GenericName=Eekboard Virtual Keyboard
+Comment=Virtual Keyboard
+Exec=eekboard
+Icon=eekboard
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<geometry version="0.90">
+  <bounds x="0.000000" y="0.000000" width="426.0000" height="296.5853"/>
+  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
+    <row orientation="1">
+      <key keycode="24" name="AD01" oref="outline2">
+	<bounds x="65.56097" y="42.14634" width="37.46341" height="52.44877"/>
+      </key>
+      <key keycode="25" name="AD02" oref="outline2">
+	<bounds x="106.1463" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="26" name="AD03" oref="outline2">
+	<bounds x="145.1707" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="27" name="AD04" oref="outline2">
+	<bounds x="185.7560" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="28" name="AD05" oref="outline2">
+	<bounds x="226.3414" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="29" name="AD06" oref="outline2">
+	<bounds x="266.9268" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="30" name="AD07" oref="outline2">
+	<bounds x="307.5121" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="31" name="AD08" oref="outline2">
+	<bounds x="348.0975" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="32" name="AD09" oref="outline2">
+	<bounds x="388.6829" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="33" name="AD10" oref="outline2">
+	<bounds x="429.2682" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+    </row>
+  </section>
+  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
+    <row orientation="1">
+      <key keycode="38" name="AC01" oref="outline2">
+	<bounds x="76.48780" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="39" name="AC02" oref="outline2">
+	<bounds x="115.5121" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="40" name="AC03" oref="outline2">
+	<bounds x="156.0975" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="41" name="AC04" oref="outline2">
+	<bounds x="196.6829" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="42" name="AC05" oref="outline2">
+	<bounds x="237.2682" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="43" name="AC06" oref="outline2">
+	<bounds x="277.8536" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="44" name="AC07" oref="outline2">
+	<bounds x="318.4390" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="45" name="AC08" oref="outline2">
+	<bounds x="359.0243" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="46" name="AC09" oref="outline2">
+	<bounds x="399.6097" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+    </row>
+  </section>
+  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
+    <row orientation="1">
+      <key keycode="50" name="LFSH" oref="altline">
+	<bounds x="3.121951" y="121.7560" width="88.97561" height="37.46341"/>
+      </key>
+      <key keycode="52" name="AB01" oref="outline2">
+	<bounds x="95.21951" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="53" name="AB02" oref="outline2">
+	<bounds x="135.8048" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="54" name="AB03" oref="outline2">
+	<bounds x="176.3902" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="55" name="AB04" oref="outline2">
+	<bounds x="215.4146" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="56" name="AB05" oref="outline2">
+	<bounds x="256.0000" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="57" name="AB06" oref="outline2">
+	<bounds x="296.5853" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="58" name="AB07" oref="outline2">
+	<bounds x="337.1707" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="22" name="BKSP" oref="altline">
+	<bounds x="529.1707" y="1.560976" width="79.60975" height="37.46341"/>
+      </key>
+    </row>
+  </section>
+  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
+    <row orientation="1">
+      <key keycode="37" name="LCTL" oref="altline">
+	<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
+      </key>
+      <key keycode="66" name="ALTGR" oref="altline">
+	<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
+      </key>
+      <key keycode="65" name="SPCE" oref="spaceline">
+	<bounds x="165.4634" y="162.3414" width="217.5853" height="37.46341"/>
+      </key>
+      <key keycode="60" name="AB09" oref="outline2">
+       <bounds x="418.3414" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="36" name="RTRN" oref="outline7">
+	<bounds x="519.8048" y="82.73170" width="88.97561" height="37.46341"/>
+      </key>
+    </row>
+  </section>
+  <outline id="outline2" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="altline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="48.39024" y="0.000000"/>
+    <point x="48.39024" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline4" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline5" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline6" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="68.68292" y="0.000000"/>
+    <point x="68.68292" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline7" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline8" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline9" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="109.2682" y="0.000000"/>
+    <point x="109.2682" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline10" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline13" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="79.60975" y="0.000000"/>
+    <point x="79.60975" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="spaceline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="150.5853" y="0.000000"/>
+    <point x="150.5853" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+</geometry>
--- a/data/keyboards/keyboards.xml
+++ b/data/keyboards/keyboards.xml
@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<keyboards version="0.90">
+  <keyboard id="ar" name="ar"
+	    geometry="compact" symbols="ar"
+	    longname="Arabic" language="ar"/>
+  <keyboard id="be" name="be"
+	    geometry="compact" symbols="be"
+	    longname="Belarusian" language="be"/>
+  <keyboard id="fa" name="fa"
+	    geometry="compact" symbols="fa"
+	    longname="Farsi (ISIRI 2901-1994)" language="fa"/>
+  <keyboard id="he" name="he"
+	    geometry="compact" symbols="he"
+	    longname="Hebrew" language="he"/>
+  <keyboard id="ja" name="ja"
+	    geometry="compact" symbols="ja-kana"
+	    longname="Japanese (Kana)" language="ja"/>
+  <keyboard id="kk" name="kk"
+	    geometry="compact" symbols="kk"
+	    longname="Kazakh" language="kk"/>
+  <keyboard id="ks" name="ks"
+	    geometry="compact" symbols="ks"
+	    longname="Kashmiri" language="ks"/>
+  <keyboard id="my" name="my"
+	    geometry="compact" symbols="my"
+	    longname="Myanmar" language="my"/>
+  <keyboard id="ru" name="ru"
+	    geometry="compact" symbols="us"
+	    longname="Russian" language="ru"/>
+  <keyboard id="th" name="th"
+	    geometry="compact" symbols="th"
+	    longname="Thai" language="th"/>
+  <keyboard id="ua" name="ua"
+	    geometry="compact" symbols="ua"
+	    longname="Ukrainian" language="ua"/>
+  <keyboard id="ug" name="ug"
+	    geometry="compact" symbols="ug"
+	    longname="Uyghur" language="ug"/>
+  <keyboard id="us" name="us"
+	    geometry="compact" symbols="us"
+	    longname="US" language="en"/>
+  <keyboard id="zh-bopomofo" name="zh-bopomofo"
+	    geometry="compact" symbols="zh-bopomofo"
+	    longname="Chinese (Bopomofo)" language="zh"/>
+  <!-- Indic Inscript keyboards converted from m17n-lib -->
+  <keyboard id="as-inscript" name="as-inscript"
+	    geometry="compact" symbols="as-inscript"
+	    longname="Assamese (Inscript)" language="as"/>
+  <keyboard id="bn-inscript" name="bn-inscript"
+	    geometry="compact" symbols="bn-inscript"
+	    longname="Bengali (Inscript)" language="bn"/>
+  <keyboard id="gu-inscript" name="gu-inscript"
+	    geometry="compact" symbols="gu-inscript"
+	    longname="Gujarati (Inscript)" language="gu"/>
+  <keyboard id="hi-inscript" name="hi-inscript"
+	    geometry="compact" symbols="hi-inscript"
+	    longname="Hindi (Inscript)" language="hi"/>
+  <keyboard id="kn-inscript" name="kn-inscript"
+	    geometry="compact" symbols="kn-inscript"
+	    longname="Kannada (Inscript)" language="kn"/>
+  <keyboard id="ks-inscript" name="ks-inscript"
+	    geometry="compact" symbols="ks-inscript"
+	    longname="Kashmiri Devanagari (Inscript)" language="ks"/>
+  <keyboard id="mai-inscript" name="mai-inscript"
+	    geometry="compact" symbols="mai-inscript"
+	    longname="Maithili (Inscript)" language="mai"/>
+  <keyboard id="ml-inscript" name="ml-inscript"
+	    geometry="compact" symbols="ml-inscript"
+	    longname="Malayalam (Inscript)" language="ml-inscript"/>
+  <keyboard id="mr-inscript" name="mr-inscript"
+	    geometry="compact" symbols="mr-inscript"
+	    longname="Marathi (Inscript)" language="mr"/>
+  <keyboard id="or-inscript" name="or-inscript"
+	    geometry="compact" symbols="or-inscript"
+	    longname="Oriya (Inscript)" language="or"/>
+  <keyboard id="pa-inscript" name="pa-inscript"
+	    geometry="compact" symbols="pa-inscript"
+	    longname="Punjabi (Inscript)" language="pa"/>
+  <keyboard id="sd-inscript" name="sd-inscript"
+	    geometry="compact" symbols="sd-inscript"
+	    longname="Sindhi (Inscript)" language="sd"/>
+  <keyboard id="ta-inscript" name="ta-inscript"
+	    geometry="compact" symbols="ta-inscript"
+	    longname="Tamil (Inscript)" language="ta"/>
+  <keyboard id="te-inscript" name="te-inscript"
+	    geometry="compact" symbols="te-inscript"
+	    longname="Telugu (Inscript)" language="te"/>
+</keyboards>
--- a/data/keyboards/symbols/ar.xml
+++ b/data/keyboards/symbols/ar.xml
@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ّ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">١</text>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">٢</text>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">٣</text>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">٤</text>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">٥</text>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">٦</text>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">٧</text>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">٨</text>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">٩</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">٠</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ض</text>
+    <text category="letter">َ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ص</text>
+    <text category="letter">ً</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ث</text>
+    <text category="letter">ُ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ق</text>
+    <text category="letter">ٌ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ف</text>
+    <text category="letter">لإ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">غ</text>
+    <text category="letter">إ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ع</text>
+    <text category="letter">`</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ه</text>
+    <text category="letter">÷</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">خ</text>
+    <text category="letter">×</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ح</text>
+    <text category="letter">؛</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ج</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">د</text>
+    <text category="letter">&lt;</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ش</text>
+    <text category="letter">ِ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">س</text>
+    <text category="letter">ٍ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">ي</text>
+    <text category="letter">]</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ب</text>
+    <text category="letter">[</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ل</text>
+    <text category="letter">لأ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ا</text>
+    <text category="letter">أ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ت</text>
+    <text category="letter">ـ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ن</text>
+    <text category="letter">،</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">م</text>
+    <text category="letter">/</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ك</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ئ</text>
+    <text category="letter">~</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ء</text>
+    <text category="letter">ْ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ؤ</text>
+    <text category="letter">}</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ر</text>
+    <text category="letter">{</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">لا</text>
+    <text category="letter">لآ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ى</text>
+    <text category="letter">آ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ة</text>
+    <text category="letter">&apos;</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">و</text>
+    <text category="letter">,</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ز</text>
+    <text category="letter">.</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ظ</text>
+    <text category="letter">؟</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/as-inscript.xml
+++ b/data/keyboards/symbols/as-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">~</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">১</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">২</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">৩</text>
+    <text category="letter">্ৰ</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">৪</text>
+    <text category="letter">ৰ্</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">৫</text>
+    <text category="letter">জ্ঞ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">৬</text>
+    <text category="letter">ত্ৰ</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">৭</text>
+    <text category="letter">ক্ষ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">৮</text>
+    <text category="letter">শ্ৰ</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">৯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">০</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ঃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ৃ</text>
+    <text category="letter">ঋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ৌ</text>
+    <text category="letter">ঔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ৈ</text>
+    <text category="letter">ঐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">া</text>
+    <text category="letter">আ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ী</text>
+    <text category="letter">ঈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ূ</text>
+    <text category="letter">ঊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ব</text>
+    <text category="letter">ভ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">হ</text>
+    <text category="letter">ঙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">গ</text>
+    <text category="letter">ঘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">দ</text>
+    <text category="letter">ধ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">জ</text>
+    <text category="letter">ঝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ড</text>
+    <text category="letter">ঢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">়</text>
+    <text category="letter">ঞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">য</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ো</text>
+    <text category="letter">ও</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ে</text>
+    <text category="letter">এ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">্</text>
+    <text category="letter">অ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ি</text>
+    <text category="letter">ই</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ু</text>
+    <text category="letter">উ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">প</text>
+    <text category="letter">ফ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ৰ</text>
+    <text category="letter">J</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ক</text>
+    <text category="letter">খ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ত</text>
+    <text category="letter">থ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">চ</text>
+    <text category="letter">ছ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ঠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ৎ</text>
+    <text category="letter">৺</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ং</text>
+    <text category="letter">ঁ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ম</text>
+    <text category="letter">ণ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ন</text>
+    <text category="letter">V</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ৱ</text>
+    <text category="letter">B</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ল</text>
+    <text category="letter">N</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">স</text>
+    <text category="letter">শ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ষ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">য়</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/be.xml
+++ b/data/keyboards/symbols/be.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">Ё</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <text category="letter">№</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <text category="letter">;</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <text category="letter">?</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <text category="letter">_</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">й</text>
+    <text category="letter">Й</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ц</text>
+    <text category="letter">Ц</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">у</text>
+    <text category="letter">У</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">к</text>
+    <text category="letter">К</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">е</text>
+    <text category="letter">Е</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">н</text>
+    <text category="letter">Н</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">г</text>
+    <text category="letter">Г</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ш</text>
+    <text category="letter">Ш</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ў</text>
+    <text category="letter">Ў</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">з</text>
+    <text category="letter">З</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">х</text>
+    <text category="letter">Х</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">&apos;</text>
+    <text category="letter">&apos;</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ф</text>
+    <text category="letter">Ф</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ы</text>
+    <text category="letter">Ы</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">в</text>
+    <text category="letter">В</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">а</text>
+    <text category="letter">А</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">п</text>
+    <text category="letter">П</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">р</text>
+    <text category="letter">Р</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">о</text>
+    <text category="letter">О</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">л</text>
+    <text category="letter">Л</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">д</text>
+    <text category="letter">Д</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ж</text>
+    <text category="letter">Ж</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">Э</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">я</text>
+    <text category="letter">Я</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ч</text>
+    <text category="letter">Ч</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">с</text>
+    <text category="letter">С</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">м</text>
+    <text category="letter">М</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">і</text>
+    <text category="letter">І</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">т</text>
+    <text category="letter">Т</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ь</text>
+    <text category="letter">Ь</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">б</text>
+    <text category="letter">Б</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ю</text>
+    <text category="letter">Ю</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">.</text>
+    <text category="letter">,</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/bn-inscript.xml
+++ b/data/keyboards/symbols/bn-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">~</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">১</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">২</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">৩</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">৪</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">৫</text>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">৬</text>
+    <text category="letter">^</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">৭</text>
+    <text category="letter">&amp;</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">৮</text>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">৯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">০</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ঃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ৃ</text>
+    <text category="letter">ঋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ৌ</text>
+    <text category="letter">ঔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ৈ</text>
+    <text category="letter">ঐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">া</text>
+    <text category="letter">আ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ী</text>
+    <text category="letter">ঈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ূ</text>
+    <text category="letter">ঊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ব</text>
+    <text category="letter">ভ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">হ</text>
+    <text category="letter">ঙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">গ</text>
+    <text category="letter">ঘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">দ</text>
+    <text category="letter">ধ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">জ</text>
+    <text category="letter">ঝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ড</text>
+    <text category="letter">ঢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">়</text>
+    <text category="letter">ঞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ো</text>
+    <text category="letter">ও</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ে</text>
+    <text category="letter">এ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">্</text>
+    <text category="letter">অ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ি</text>
+    <text category="letter">ই</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ু</text>
+    <text category="letter">উ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">প</text>
+    <text category="letter">ফ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">র</text>
+    <text category="letter">J</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ক</text>
+    <text category="letter">খ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ত</text>
+    <text category="letter">থ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">চ</text>
+    <text category="letter">ছ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ঠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">z</text>
+    <text category="letter">Z</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ং</text>
+    <text category="letter">ঁ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ম</text>
+    <text category="letter">ণ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ন</text>
+    <text category="letter">V</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ব</text>
+    <text category="letter">B</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ল</text>
+    <text category="letter">N</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">স</text>
+    <text category="letter">শ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ষ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">য়</text>
+    <text category="letter">য</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/fa.xml
+++ b/data/keyboards/symbols/fa.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">۱</text>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">۲</text>
+    <text category="letter">٬</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">۳</text>
+    <text category="letter">٫</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">۴</text>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">۵</text>
+    <text category="letter">٪</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">۶</text>
+    <text category="letter">×</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">۷</text>
+    <text category="letter">،</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">۸</text>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">۹</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">۰</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ض</text>
+    <text category="letter">ْ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ص</text>
+    <text category="letter">ٌ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ث</text>
+    <text category="letter">ٍ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ق</text>
+    <text category="letter">ً</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ف</text>
+    <text category="letter">ُ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">غ</text>
+    <text category="letter">ِ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ع</text>
+    <text category="letter">َ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ه</text>
+    <text category="letter">ّ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">خ</text>
+    <text category="letter">]</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ح</text>
+    <text category="letter">[</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ج</text>
+    <text category="letter">}</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">چ</text>
+    <text category="letter">{</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ش</text>
+    <text category="letter">ؤ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">س</text>
+    <text category="letter">ئ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">ی</text>
+    <text category="letter">ي</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ب</text>
+    <text category="letter">إ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ل</text>
+    <text category="letter">أ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ا</text>
+    <text category="letter">آ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ت</text>
+    <text category="letter">ة</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ن</text>
+    <text category="letter">»</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">م</text>
+    <text category="letter">«</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ک</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">؛</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ظ</text>
+    <text category="letter">ك</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ط</text>
+    <keysym keyval="88">X</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ز</text>
+    <text category="letter">ژ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ر</text>
+    <keysym keyval="86">V</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ذ</text>
+    <text category="letter">‌</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">د</text>
+    <text name="N" category="letter"></text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">پ</text>
+    <text category="letter">ء</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">و</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <keysym keyval="46">period</keysym>
+    <text category="letter">&lt;</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <keysym keyval="47">slash</keysym>
+    <text category="letter">؟</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/gu-inscript.xml
+++ b/data/keyboards/symbols/gu-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">~</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">૧</text>
+    <text category="letter">ઍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">૨</text>
+    <text category="letter">ૅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">૩</text>
+    <text category="letter">ૠ</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">૪</text>
+    <text category="letter">ૄ</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">૫</text>
+    <text category="letter">જ્ઞ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">૬</text>
+    <text category="letter">ત્ર</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">૭</text>
+    <text category="letter">ક્ષ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">૮</text>
+    <text category="letter">શ્ર</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">૯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">૦</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ઃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ૃ</text>
+    <text category="letter">ઋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ૌ</text>
+    <text category="letter">ઔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ૈ</text>
+    <text category="letter">ઐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ા</text>
+    <text category="letter">આ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ી</text>
+    <text category="letter">ઈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ૂ</text>
+    <text category="letter">ઊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">બ</text>
+    <text category="letter">ભ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">હ</text>
+    <text category="letter">ઙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ગ</text>
+    <text category="letter">ઘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">દ</text>
+    <text category="letter">ધ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">જ</text>
+    <text category="letter">ઝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ડ</text>
+    <text category="letter">ઢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">઼</text>
+    <text category="letter">ઞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ૉ</text>
+    <text category="letter">ઑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ો</text>
+    <text category="letter">ઓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ે</text>
+    <text category="letter">એ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">્</text>
+    <text category="letter">અ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">િ</text>
+    <text category="letter">ઇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ુ</text>
+    <text category="letter">ઉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">પ</text>
+    <text category="letter">ફ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ર</text>
+    <text category="letter">ઽ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ક</text>
+    <text category="letter">ખ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ત</text>
+    <text category="letter">થ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ચ</text>
+    <text category="letter">છ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ઠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">૱</text>
+    <text category="letter">ૐ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ં</text>
+    <text category="letter">ઁ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">મ</text>
+    <text category="letter">ણ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ન</text>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">વ</text>
+    <text category="letter">&apos;</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">લ</text>
+    <text category="letter">ળ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">સ</text>
+    <text category="letter">શ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ષ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ય</text>
+    <text category="letter">?</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/he.xml
+++ b/data/keyboards/symbols/he.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">/</text>
+    <keysym keyval="81">Q</keysym>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">&apos;</text>
+    <keysym keyval="87">W</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ק</text>
+    <keysym keyval="69">E</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ר</text>
+    <keysym keyval="82">R</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">א</text>
+    <keysym keyval="84">T</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ט</text>
+    <keysym keyval="89">Y</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ו</text>
+    <keysym keyval="85">U</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ן</text>
+    <keysym keyval="73">I</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ם</text>
+    <keysym keyval="79">O</keysym>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">פ</text>
+    <keysym keyval="80">P</keysym>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">]</text>
+    <text category="letter">}</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">[</text>
+    <text category="letter">{</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ש</text>
+    <keysym keyval="65">A</keysym>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ד</text>
+    <keysym keyval="83">S</keysym>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">ג</text>
+    <keysym keyval="68">D</keysym>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">כ</text>
+    <keysym keyval="70">F</keysym>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ע</text>
+    <keysym keyval="71">G</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">י</text>
+    <keysym keyval="72">H</keysym>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ח</text>
+    <keysym keyval="74">J</keysym>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ל</text>
+    <keysym keyval="75">K</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ך</text>
+    <keysym keyval="76">L</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ף</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ז</text>
+    <keysym keyval="90">Z</keysym>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ס</text>
+    <keysym keyval="88">X</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ב</text>
+    <keysym keyval="67">C</keysym>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ה</text>
+    <keysym keyval="86">V</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">נ</text>
+    <keysym keyval="66">B</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">מ</text>
+    <keysym keyval="78">N</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">צ</text>
+    <keysym keyval="77">M</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">ת</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ץ</text>
+    <text category="letter">&lt;</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">.</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/hi-inscript.xml
+++ b/data/keyboards/symbols/hi-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ऒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">१</text>
+    <text category="letter">ऍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">२</text>
+    <text category="letter">ॅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">३</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">४</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">५</text>
+    <text category="letter">ज्ञ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">६</text>
+    <text category="letter">त्र</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">७</text>
+    <text category="letter">क्ष</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">८</text>
+    <text category="letter">श्र</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">९</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">०</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ः</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ृ</text>
+    <text category="letter">ऋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ौ</text>
+    <text category="letter">औ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ै</text>
+    <text category="letter">ऐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ा</text>
+    <text category="letter">आ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ी</text>
+    <text category="letter">ई</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ू</text>
+    <text category="letter">ऊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ब</text>
+    <text category="letter">भ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ह</text>
+    <text category="letter">ङ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ग</text>
+    <text category="letter">घ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">द</text>
+    <text category="letter">ध</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ज</text>
+    <text category="letter">झ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ड</text>
+    <text category="letter">ढ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">़</text>
+    <text category="letter">ञ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ॉ</text>
+    <text category="letter">ऑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ो</text>
+    <text category="letter">ओ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">े</text>
+    <text category="letter">ए</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">्‌</text>
+    <text category="letter">अ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ि</text>
+    <text category="letter">इ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ु</text>
+    <text category="letter">उ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">प</text>
+    <text category="letter">फ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">र</text>
+    <text category="letter">ऱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">क</text>
+    <text category="letter">ख</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">त</text>
+    <text category="letter">थ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">च</text>
+    <text category="letter">छ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ठ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ॆ</text>
+    <text category="letter">ऎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ं</text>
+    <text category="letter">ँ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">म</text>
+    <text category="letter">ण</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">न</text>
+    <text category="letter">ऩ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">व</text>
+    <text category="letter">ऴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ल</text>
+    <text category="letter">ळ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">स</text>
+    <text category="letter">श</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ष</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">य</text>
+    <text category="letter">य़</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ja-kana.xml
+++ b/data/keyboards/symbols/ja-kana.xml
@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="1246">゛</keysym>
+    <keysym keyval="1247">゜</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="1223">ぬ</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="1228">ふ</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="1201">あ</keysym>
+    <keysym keyval="1191">ぁ</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="1203">う</keysym>
+    <keysym keyval="1193">ぅ</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="1204">え</keysym>
+    <keysym keyval="1194">ぇ</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="1205">お</keysym>
+    <keysym keyval="1195">ぉ</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="1236">や</keysym>
+    <keysym keyval="1196">ゃ</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="1237">ゆ</keysym>
+    <keysym keyval="1197">ゅ</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="1238">よ</keysym>
+    <keysym keyval="1198">ょ</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="1244">わ</keysym>
+    <keysym keyval="1190">を</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="1230">ほ</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="1229">へ</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <keysym keyval="1216">た</keysym>
+  </key>
+  <key keycode="25" name="AD02">
+    <keysym keyval="1219">て</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <keysym keyval="1202">い</keysym>
+    <keysym keyval="1192">ぃ</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <keysym keyval="1213">す</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <keysym keyval="1206">か</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <keysym keyval="1245">ん</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <keysym keyval="1221">な</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <keysym keyval="1222">に</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <keysym keyval="1239">ら</keysym>
+  </key>
+  <key keycode="33" name="AD10">
+    <keysym keyval="1214">せ</keysym>
+  </key>
+  <key keycode="34" name="AD11">
+    <keysym keyval="1233">む</keysym>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="1243">ろ</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <keysym keyval="1217">ち</keysym>
+  </key>
+  <key keycode="39" name="AC02">
+    <keysym keyval="1220">と</keysym>
+  </key>
+  <key keycode="40" name="AC03">
+    <keysym keyval="1212">し</keysym>
+  </key>
+  <key keycode="41" name="AC04">
+    <keysym keyval="1226">は</keysym>
+  </key>
+  <key keycode="42" name="AC05">
+    <keysym keyval="1207">き</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <keysym keyval="1208">く</keysym>
+  </key>
+  <key keycode="44" name="AC07">
+    <keysym keyval="1231">ま</keysym>
+  </key>
+  <key keycode="45" name="AC08">
+    <keysym keyval="1225">の</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <keysym keyval="1240">り</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <keysym keyval="1242">れ</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="1209">け</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <keysym keyval="1218">つ</keysym>
+    <keysym keyval="1199">っ</keysym>
+  </key>
+  <key keycode="53" name="AB02">
+    <keysym keyval="1211">さ</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <keysym keyval="1215">そ</keysym>
+  </key>
+  <key keycode="55" name="AB04">
+    <keysym keyval="1227">ひ</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <keysym keyval="1210">こ</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <keysym keyval="1232">み</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <keysym keyval="1235">も</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <keysym keyval="1224">ね</keysym>
+  </key>
+  <key keycode="60" name="AB09">
+    <keysym keyval="1241">る</keysym>
+  </key>
+  <key keycode="61" name="AB10">
+    <keysym keyval="1234">め</keysym>
+  </key>
+</symbols>
+
--- a/data/keyboards/symbols/kk.xml
+++ b/data/keyboards/symbols/kk.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">&quot;</text>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">ә</text>
+    <text category="letter">Ә</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">і</text>
+    <text category="letter">І</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">ӊ</text>
+    <text category="letter">Ӊ</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">ғ</text>
+    <text category="letter">Ғ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">,</text>
+    <text category="letter">;</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">.</text>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">ү</text>
+    <text category="letter">Ү</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">ұ</text>
+    <text category="letter">Ұ</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">қ</text>
+    <text category="letter">Қ</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">ө</text>
+    <text category="letter">Ө</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">һ</text>
+    <text category="letter">Һ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">й</text>
+    <text category="letter">Й</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ц</text>
+    <text category="letter">Ц</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">у</text>
+    <text category="letter">У</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">к</text>
+    <text category="letter">К</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">е</text>
+    <text category="letter">Е</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">н</text>
+    <text category="letter">Н</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">г</text>
+    <text category="letter">Г</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ш</text>
+    <text category="letter">Ш</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">щ</text>
+    <text category="letter">Щ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">з</text>
+    <text category="letter">З</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">х</text>
+    <text category="letter">Х</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">ъ</text>
+    <text category="letter">Ъ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ф</text>
+    <text category="letter">Ф</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ы</text>
+    <text category="letter">Ы</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">в</text>
+    <text category="letter">В</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">а</text>
+    <text category="letter">А</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">п</text>
+    <text category="letter">П</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">р</text>
+    <text category="letter">Р</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">о</text>
+    <text category="letter">О</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">л</text>
+    <text category="letter">Л</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">д</text>
+    <text category="letter">Д</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ж</text>
+    <text category="letter">Ж</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">Э</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">я</text>
+    <text category="letter">Я</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ч</text>
+    <text category="letter">Ч</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">с</text>
+    <text category="letter">С</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">м</text>
+    <text category="letter">М</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">и</text>
+    <text category="letter">И</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">т</text>
+    <text category="letter">Т</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ь</text>
+    <text category="letter">Ь</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">б</text>
+    <text category="letter">Б</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ю</text>
+    <text category="letter">Ю</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">№</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/kn-inscript.xml
+++ b/data/keyboards/symbols/kn-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ಒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">೧</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">೨</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">೩</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">೪</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">೫</text>
+    <text category="letter">ಜ್ಞ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">೬</text>
+    <text category="letter">ತ್ರ</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">೭</text>
+    <text category="letter">ಕ್ಷ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">೮</text>
+    <text category="letter">ಶ್ರ</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">೯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">೦</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ಃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ೃ</text>
+    <text category="letter">ಋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ೌ</text>
+    <text category="letter">ಔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ೈ</text>
+    <text category="letter">ಐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ಾ</text>
+    <text category="letter">ಆ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ೀ</text>
+    <text category="letter">ಈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ೂ</text>
+    <text category="letter">ಊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ಬ</text>
+    <text category="letter">ಭ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ಹ</text>
+    <text category="letter">ಙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ಗ</text>
+    <text category="letter">ಘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ದ</text>
+    <text category="letter">ಧ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ಜ</text>
+    <text category="letter">ಝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ಡ</text>
+    <text category="letter">ಢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">]</text>
+    <text category="letter">ಞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">‍</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ೋ</text>
+    <text category="letter">ಓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ೇ</text>
+    <text category="letter">ಏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">್</text>
+    <text category="letter">ಅ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ಿ</text>
+    <text category="letter">ಇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ು</text>
+    <text category="letter">ಉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ಪ</text>
+    <text category="letter">ಫ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ರ</text>
+    <text category="letter">ಱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ಕ</text>
+    <text category="letter">ಖ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ತ</text>
+    <text category="letter">ಥ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ಚ</text>
+    <text category="letter">ಛ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ಠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ೆ</text>
+    <text category="letter">ಎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ಂ</text>
+    <text name="X" category="letter"></text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ಮ</text>
+    <text category="letter">ಣ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ನ</text>
+    <text category="letter">‌</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ವ</text>
+    <keysym keyval="66">B</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ಲ</text>
+    <text category="letter">ಳ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ಸ</text>
+    <text category="letter">ಶ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ಷ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">ಾ</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ಯ</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ks-inscript.xml
+++ b/data/keyboards/symbols/ks-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ऒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">१</text>
+    <text category="letter">ऍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">२</text>
+    <text category="letter">ॅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">३</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">४</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">५</text>
+    <text category="letter">ज्ञ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">६</text>
+    <text category="letter">त्र</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">७</text>
+    <text category="letter">क्ष</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">८</text>
+    <text category="letter">श्र</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">९</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">०</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ः</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ृ</text>
+    <text category="letter">ऋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ौ</text>
+    <text category="letter">औ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ै</text>
+    <text category="letter">ऐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ा</text>
+    <text category="letter">आ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ी</text>
+    <text category="letter">ई</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ू</text>
+    <text category="letter">ऊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ॿ</text>
+    <text category="letter">भ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ह</text>
+    <text category="letter">ङ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ॻ</text>
+    <text category="letter">घ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">द</text>
+    <text category="letter">ध</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ॼ</text>
+    <text category="letter">झ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ॾ</text>
+    <text category="letter">ढ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">़</text>
+    <text category="letter">ञ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ॉ</text>
+    <text category="letter">ऑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ो</text>
+    <text category="letter">ओ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">े</text>
+    <text category="letter">ए</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">्‌</text>
+    <text category="letter">अ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ि</text>
+    <text category="letter">इ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <keysym keyval="103">g</keysym>
+    <keysym keyval="71">G</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">प</text>
+    <text category="letter">फ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">र</text>
+    <text category="letter">ऱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">क</text>
+    <text category="letter">ख</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">त</text>
+    <text category="letter">थ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">च</text>
+    <text category="letter">छ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ठ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ॆ</text>
+    <text category="letter">ऎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ं</text>
+    <text category="letter">ँ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">म</text>
+    <text category="letter">ण</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">न</text>
+    <text category="letter">ऩ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">व</text>
+    <text category="letter">ऴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ल</text>
+    <text category="letter">ळ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">स</text>
+    <text category="letter">श</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ष</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">य</text>
+    <text category="letter">य़</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ks.xml
+++ b/data/keyboards/symbols/ks.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ً</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">۱</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">۲</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">۳</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">۴</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">۵</text>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">۶</text>
+    <text category="letter">^</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">۷</text>
+    <text category="letter">&amp;</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">۸</text>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">۹</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">۰</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ّ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">=</text>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ق</text>
+    <text category="letter">ﷺ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">و</text>
+    <text category="letter">ؤ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ع</text>
+    <text category="letter">ئ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ر</text>
+    <text category="letter">ڑ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ت</text>
+    <text category="letter">ٹ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ے</text>
+    <text category="letter">؁</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ء</text>
+    <text category="letter">،</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ی</text>
+    <text category="letter">ۆ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ہ</text>
+    <text category="letter">ۃ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">پ</text>
+    <text category="letter">إ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">]</text>
+    <text category="letter">ٰ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">[</text>
+    <text category="letter">ٰ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">؎</text>
+    <text category="letter">أ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ا</text>
+    <text category="letter">آ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">س</text>
+    <text category="letter">ش</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">د</text>
+    <text category="letter">ڈ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ف</text>
+    <text category="letter">ُ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">گ</text>
+    <text category="letter">غ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ھ</text>
+    <text category="letter">ح</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ج</text>
+    <text category="letter">ژ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ک</text>
+    <text category="letter">خ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ل</text>
+    <text category="letter">ؓ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">؛</text>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ز</text>
+    <text category="letter">ذ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ص</text>
+    <text category="letter">ض</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">چ</text>
+    <text category="letter">ث</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ط</text>
+    <text category="letter">ظ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ب</text>
+    <text category="letter">أ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ن</text>
+    <text category="letter">ں</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">م</text>
+    <text category="letter">ٔ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">،</text>
+    <text category="letter">ِ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">۔</text>
+    <text category="letter">َ</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">/</text>
+    <text category="letter">؟</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/mai-inscript.xml
+++ b/data/keyboards/symbols/mai-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ऒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">१</text>
+    <text category="letter">ऍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">२</text>
+    <text category="letter">ॅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">३</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">४</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">५</text>
+    <text category="letter">ज्ञ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">६</text>
+    <text category="letter">त्र</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">७</text>
+    <text category="letter">क्ष</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">८</text>
+    <text category="letter">श्र</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">९</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">०</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ः</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ृ</text>
+    <text category="letter">ऋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ौ</text>
+    <text category="letter">औ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ै</text>
+    <text category="letter">ऐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ा</text>
+    <text category="letter">आ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ी</text>
+    <text category="letter">ई</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ू</text>
+    <text category="letter">ऊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ब</text>
+    <text category="letter">भ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ह</text>
+    <text category="letter">ङ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ग</text>
+    <text category="letter">घ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">द</text>
+    <text category="letter">ध</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ज</text>
+    <text category="letter">झ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ड</text>
+    <text category="letter">ढ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">़</text>
+    <text category="letter">ञ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ॉ</text>
+    <text category="letter">ऑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ो</text>
+    <text category="letter">ओ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">े</text>
+    <text category="letter">ए</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">्‌</text>
+    <text category="letter">अ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ि</text>
+    <text category="letter">इ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ु</text>
+    <text category="letter">उ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">प</text>
+    <text category="letter">फ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">र</text>
+    <text category="letter">ऱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">क</text>
+    <text category="letter">ख</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">त</text>
+    <text category="letter">थ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">च</text>
+    <text category="letter">छ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ठ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ॆ</text>
+    <text category="letter">ऎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ं</text>
+    <text category="letter">ँ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">म</text>
+    <text category="letter">ण</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">न</text>
+    <text category="letter">ऩ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">व</text>
+    <text category="letter">ऴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ल</text>
+    <text category="letter">ळ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">स</text>
+    <text category="letter">श</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ष</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">य</text>
+    <text category="letter">य़</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ml-inscript.xml
+++ b/data/keyboards/symbols/ml-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ഒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">൧</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">൨</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">൩</text>
+    <text category="letter">്ര</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">൪</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">൫</text>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">൬</text>
+    <text category="letter">^</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">൭</text>
+    <text category="letter">ക്ഷ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">൮</text>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">൯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">൦</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ഃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ൃ</text>
+    <text category="letter">ഋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ൌ</text>
+    <text category="letter">ഔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ൈ</text>
+    <text category="letter">ഐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ാ</text>
+    <text category="letter">ആ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ീ</text>
+    <text category="letter">ഈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ൂ</text>
+    <text category="letter">ഊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ബ</text>
+    <text category="letter">ഭ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ഹ</text>
+    <text category="letter">ങ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ഗ</text>
+    <text category="letter">ഘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ദ</text>
+    <text category="letter">ധ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ജ</text>
+    <text category="letter">ഝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ഡ</text>
+    <text category="letter">ഢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">‍</text>
+    <text category="letter">ഞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">‌</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ോ</text>
+    <text category="letter">ഓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">േ</text>
+    <text category="letter">ഏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">്</text>
+    <text category="letter">അ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ി</text>
+    <text category="letter">ഇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ു</text>
+    <text category="letter">ഉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">പ</text>
+    <text category="letter">ഫ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ര</text>
+    <text category="letter">റ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ക</text>
+    <text category="letter">ഖ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ത</text>
+    <text category="letter">ഥ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ച</text>
+    <text category="letter">ഛ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ഠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">െ</text>
+    <text category="letter">എ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ം</text>
+    <text category="letter">X</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">മ</text>
+    <text category="letter">ണ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ന</text>
+    <text category="letter">V</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">വ</text>
+    <text category="letter">ഴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ല</text>
+    <text category="letter">ള</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">സ</text>
+    <text category="letter">ശ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ഷ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">യ</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/mr-inscript.xml
+++ b/data/keyboards/symbols/mr-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ऒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">१</text>
+    <text category="letter">ऍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">२</text>
+    <text category="letter">ॅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">३</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">४</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">५</text>
+    <text category="letter">ज्ञ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">६</text>
+    <text category="letter">त्र</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">७</text>
+    <text category="letter">क्ष</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">८</text>
+    <text category="letter">श्र</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">९</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">०</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ः</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ृ</text>
+    <text category="letter">ऋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ौ</text>
+    <text category="letter">औ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ै</text>
+    <text category="letter">ऐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ा</text>
+    <text category="letter">आ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ी</text>
+    <text category="letter">ई</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ू</text>
+    <text category="letter">ऊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ब</text>
+    <text category="letter">भ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ह</text>
+    <text category="letter">ङ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ग</text>
+    <text category="letter">घ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">द</text>
+    <text category="letter">ध</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ज</text>
+    <text category="letter">झ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ड</text>
+    <text category="letter">ढ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">़</text>
+    <text category="letter">ञ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ॉ</text>
+    <text category="letter">ऑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ो</text>
+    <text category="letter">ओ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">े</text>
+    <text category="letter">ए</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">्</text>
+    <text category="letter">अ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ि</text>
+    <text category="letter">इ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ु</text>
+    <text category="letter">उ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">प</text>
+    <text category="letter">फ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">र</text>
+    <text category="letter">ऱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">क</text>
+    <text category="letter">ख</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">त</text>
+    <text category="letter">थ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">च</text>
+    <text category="letter">छ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ठ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ॆ</text>
+    <text category="letter">ऎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ं</text>
+    <text category="letter">ँ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">म</text>
+    <text category="letter">ण</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">न</text>
+    <text category="letter">ऩ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">व</text>
+    <text category="letter">ऴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ल</text>
+    <text category="letter">ळ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">स</text>
+    <text category="letter">श</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ष</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">य</text>
+    <text category="letter">य़</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/my.xml
+++ b/data/keyboards/symbols/my.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">၁</text>
+    <text category="letter">ဍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">၂</text>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">၃</text>
+    <text category="letter">ဋ</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">၄</text>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">၅</text>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">၆</text>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">၇</text>
+    <text category="letter">ရ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">၈</text>
+    <text category="letter">ဂ</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">၉</text>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">၀</text>
+    <text category="letter">ဝ</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ဆ</text>
+    <text category="letter">၍</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">တ</text>
+    <keysym keyval="87">W</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">န</text>
+    <keysym keyval="69">E</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">မ</text>
+    <keysym keyval="82">R</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">အ</text>
+    <keysym keyval="84">T</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ပ</text>
+    <keysym keyval="89">Y</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">က</text>
+    <keysym keyval="85">U</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">င</text>
+    <keysym keyval="73">I</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">သ</text>
+    <text category="letter">ဥ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">စ</text>
+    <text category="letter">ဏ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ဟ</text>
+    <text category="letter">ဎ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">ဉ</text>
+    <text category="letter">ဧ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">၏</text>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ေ</text>
+    <text category="letter">ဗ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">္</text>
+    <text category="letter">္</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">ိ</text>
+    <text category="letter">ီ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">္</text>
+    <text category="letter">‍</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">‌</text>
+    <text category="letter">္</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">့</text>
+    <text category="letter">ံ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">္</text>
+    <text category="letter">ဲ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ု</text>
+    <keysym keyval="75">K</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ူ</text>
+    <keysym keyval="76">L</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">း</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ဓ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ဖ</text>
+    <text category="letter">ဇ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ထ</text>
+    <text category="letter">ဌ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ခ</text>
+    <text category="letter">ဃ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">လ</text>
+    <text category="letter">ဠ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ဘ</text>
+    <keysym keyval="66">B</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ည</text>
+    <keysym keyval="78">N</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ာ</text>
+    <keysym keyval="77">M</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">ယ</text>
+    <text category="letter">၍</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ဈ</text>
+    <text category="letter">ဤ</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">။</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/or-inscript.xml
+++ b/data/keyboards/symbols/or-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">୰</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">୧</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">୨</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">୩</text>
+    <text category="letter">୍ର</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">୪</text>
+    <text category="letter">ର୍</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">୫</text>
+    <text category="letter">ଜ୍ଞ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">୬</text>
+    <text category="letter">ତ୍ର</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">୭</text>
+    <text category="letter">କ୍ଷ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">୮</text>
+    <text category="letter">ଶ୍ର</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">୯</text>
+    <text category="letter">‍</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">୦</text>
+    <text category="letter">‌</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ଃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ୃ</text>
+    <text category="letter">ଋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ୌ</text>
+    <text category="letter">ଔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ୈ</text>
+    <text category="letter">ଐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ା</text>
+    <text category="letter">ଆ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ୀ</text>
+    <text category="letter">ଈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ୂ</text>
+    <text category="letter">ଊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ବ</text>
+    <text category="letter">ଭ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ହ</text>
+    <text category="letter">ଙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ଗ</text>
+    <text category="letter">ଘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ଦ</text>
+    <text category="letter">ଧ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ଜ</text>
+    <text category="letter">ଝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ଡ</text>
+    <text category="letter">ଢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">଼</text>
+    <text category="letter">ଞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ୋ</text>
+    <text category="letter">ଓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">େ</text>
+    <text category="letter">ଏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">୍</text>
+    <text category="letter">ଅ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ି</text>
+    <text category="letter">ଇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ୁ</text>
+    <text category="letter">ଉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ପ</text>
+    <text category="letter">ଫ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ର</text>
+    <text category="letter">J</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">କ</text>
+    <text category="letter">ଖ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ତ</text>
+    <text category="letter">ଥ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ଚ</text>
+    <text category="letter">ଛ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ଠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">z</text>
+    <text category="letter">Z</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ଂ</text>
+    <text category="letter">ଁ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ମ</text>
+    <text category="letter">ଣ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ନ</text>
+    <text category="letter">V</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ୱ</text>
+    <text category="letter">ଵ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ଲ</text>
+    <text category="letter">ଳ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ସ</text>
+    <text category="letter">ଶ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ଷ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ୟ</text>
+    <text category="letter">ଯ</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/pa-inscript.xml
+++ b/data/keyboards/symbols/pa-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">੧</text>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">੨</text>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">੩</text>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">੪</text>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">੫</text>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">੬</text>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">੭</text>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">੮</text>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">੯</text>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">੦</text>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">_</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">=</text>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ੌ</text>
+    <text category="letter">ਔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ੈ</text>
+    <text category="letter">ਐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ਾ</text>
+    <text category="letter">ਆ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ੀ</text>
+    <text category="letter">ਈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ੂ</text>
+    <text category="letter">ਊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ਬ</text>
+    <text category="letter">ਭ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ਹ</text>
+    <text category="letter">ਙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ਗ</text>
+    <text category="letter">ਘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ਦ</text>
+    <text category="letter">ਧ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ਜ</text>
+    <text category="letter">ਝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ਡ</text>
+    <text category="letter">ਢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">਼</text>
+    <text category="letter">ਞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ੋ</text>
+    <text category="letter">ਓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ੇ</text>
+    <text category="letter">ਏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">੍</text>
+    <text category="letter">ਅ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ਿ</text>
+    <text category="letter">ਇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ੁ</text>
+    <text category="letter">ਉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ਪ</text>
+    <text category="letter">ਫ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ਰ</text>
+    <text category="letter">ੜ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ਕ</text>
+    <text category="letter">ਖ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ਤ</text>
+    <text category="letter">ਥ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ਚ</text>
+    <text category="letter">ਛ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ਠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ੰ</text>
+    <text category="letter">ੱ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ਜ਼</text>
+    <text category="letter">ਫ਼</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ਮ</text>
+    <text category="letter">ਣ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ਨ</text>
+    <text category="letter">ਂ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ਵ</text>
+    <text category="letter">ਞ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ਲ</text>
+    <text category="letter">ਲ਼</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ਸ</text>
+    <text category="letter">ਸ਼</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ੳ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">ੲ</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ਯ</text>
+    <text category="letter">?</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ru.xml
+++ b/data/keyboards/symbols/ru.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">Ё</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <text category="letter">№</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <text category="letter">;</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <text category="letter">?</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <text category="letter">_</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">й</text>
+    <text category="letter">Й</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ц</text>
+    <text category="letter">Ц</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">у</text>
+    <text category="letter">У</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">к</text>
+    <text category="letter">К</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">е</text>
+    <text category="letter">Е</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">н</text>
+    <text category="letter">Н</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">г</text>
+    <text category="letter">Г</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ш</text>
+    <text category="letter">Ш</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">щ</text>
+    <text category="letter">Щ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">з</text>
+    <text category="letter">З</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">х</text>
+    <text category="letter">Х</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">ъ</text>
+    <text category="letter">Ъ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ф</text>
+    <text category="letter">Ф</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ы</text>
+    <text category="letter">Ы</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">в</text>
+    <text category="letter">В</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">а</text>
+    <text category="letter">А</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">п</text>
+    <text category="letter">П</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">р</text>
+    <text category="letter">Р</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">о</text>
+    <text category="letter">О</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">л</text>
+    <text category="letter">Л</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">д</text>
+    <text category="letter">Д</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ж</text>
+    <text category="letter">Ж</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">Э</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">я</text>
+    <text category="letter">Я</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ч</text>
+    <text category="letter">Ч</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">с</text>
+    <text category="letter">С</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">м</text>
+    <text category="letter">М</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">и</text>
+    <text category="letter">И</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">т</text>
+    <text category="letter">Т</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ь</text>
+    <text category="letter">Ь</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">б</text>
+    <text category="letter">Б</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ю</text>
+    <text category="letter">Ю</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">.</text>
+    <text category="letter">,</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/sd-inscript.xml
+++ b/data/keyboards/symbols/sd-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ऒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">१</text>
+    <text category="letter">ऍ</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">२</text>
+    <text category="letter">ॅ</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">३</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">४</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">५</text>
+    <text category="letter">ज्ञ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">६</text>
+    <text category="letter">त्र</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">७</text>
+    <text category="letter">क्ष</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">८</text>
+    <text category="letter">श्र</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">९</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">०</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ः</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ृ</text>
+    <text category="letter">ऋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ौ</text>
+    <text category="letter">औ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ै</text>
+    <text category="letter">ऐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ा</text>
+    <text category="letter">आ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ी</text>
+    <text category="letter">ई</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ू</text>
+    <text category="letter">ऊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ॿ</text>
+    <text category="letter">भ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ह</text>
+    <text category="letter">ङ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ॻ</text>
+    <text category="letter">घ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">द</text>
+    <text category="letter">ध</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ॼ</text>
+    <text category="letter">झ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">ॾ</text>
+    <text category="letter">ढ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">़</text>
+    <text category="letter">ञ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ॉ</text>
+    <text category="letter">ऑ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ो</text>
+    <text category="letter">ओ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">े</text>
+    <text category="letter">ए</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">्‌</text>
+    <text category="letter">अ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ि</text>
+    <text category="letter">इ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ु</text>
+    <text category="letter">उ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">प</text>
+    <text category="letter">फ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">र</text>
+    <text category="letter">ऱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">क</text>
+    <text category="letter">ख</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">त</text>
+    <text category="letter">थ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">च</text>
+    <text category="letter">छ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ठ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ॆ</text>
+    <text category="letter">ऎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ं</text>
+    <text category="letter">ँ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">म</text>
+    <text category="letter">ण</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">न</text>
+    <text category="letter">ऩ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">व</text>
+    <text category="letter">ऴ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ल</text>
+    <text category="letter">ळ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">स</text>
+    <text category="letter">श</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ष</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">।</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">य</text>
+    <text category="letter">य़</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ta-inscript.xml
+++ b/data/keyboards/symbols/ta-inscript.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ஒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">1</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">2</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">3</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">4</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">5</text>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">6</text>
+    <text category="letter">^</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">7</text>
+    <text category="letter">க்ஷ</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">8</text>
+    <text category="letter">ஷ்ர</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">9</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">0</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">ஃ</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">=</text>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ௌ</text>
+    <text category="letter">ஔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ை</text>
+    <text category="letter">ஐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ா</text>
+    <text category="letter">ஆ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ீ</text>
+    <text category="letter">ஈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ூ</text>
+    <text category="letter">ஊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">y</text>
+    <text category="letter">Y</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ஹ</text>
+    <text category="letter">ங</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">i</text>
+    <text category="letter">I</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">o</text>
+    <text category="letter">O</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ஜ</text>
+    <text category="letter">P</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">[</text>
+    <text category="letter">{</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">]</text>
+    <text category="letter">ஞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ோ</text>
+    <text category="letter">ஓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ே</text>
+    <text category="letter">ஏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">்</text>
+    <text category="letter">அ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ி</text>
+    <text category="letter">இ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ு</text>
+    <text category="letter">உ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ப</text>
+    <text category="letter">H</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ர</text>
+    <text category="letter">ற</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">க</text>
+    <text category="letter">K</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">த</text>
+    <text category="letter">L</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ச</text>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ெ</text>
+    <text category="letter">எ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">x</text>
+    <text category="letter">X</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ம</text>
+    <text category="letter">ண</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ந</text>
+    <text category="letter">ன</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">வ</text>
+    <text category="letter">ழ</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ல</text>
+    <text category="letter">ள</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ஸ</text>
+    <text category="letter">M</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ஷ</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ய</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/te-inscript.xml
+++ b/data/keyboards/symbols/te-inscript.xml
@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">ఒ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">౧</text>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">౨</text>
+    <text category="letter">@</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">౩</text>
+    <text category="letter">#</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">౪</text>
+    <text category="letter">$</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">౫</text>
+    <text category="letter">జ్ఞ</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">౬</text>
+    <text category="letter">త్ర</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">౭</text>
+    <text category="letter">క్ష</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">౮</text>
+    <text category="letter">శ్ర</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">౯</text>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">౦</text>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">-</text>
+    <text category="letter">_</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <text category="letter">ృ</text>
+    <text category="letter">ఋ</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ౌ</text>
+    <text category="letter">ఔ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ై</text>
+    <text category="letter">ఐ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ా</text>
+    <text category="letter">ఆ</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ీ</text>
+    <text category="letter">ఈ</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ూ</text>
+    <text category="letter">ఊ</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">బ</text>
+    <text category="letter">భ</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">హ</text>
+    <text category="letter">ఙ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">గ</text>
+    <text category="letter">ఘ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ద</text>
+    <text category="letter">ధ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">జ</text>
+    <text category="letter">ఝ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">డ</text>
+    <text category="letter">ఢ</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">‍</text>
+    <text category="letter">ఞ</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">ౄ</text>
+    <text category="letter">ౠ</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ో</text>
+    <text category="letter">ఓ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ే</text>
+    <text category="letter">ఏ</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">్</text>
+    <text category="letter">అ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ి</text>
+    <text category="letter">ఇ</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ు</text>
+    <text category="letter">ఉ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ప</text>
+    <text category="letter">ఫ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ర</text>
+    <text category="letter">ఱ</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">క</text>
+    <text category="letter">ఖ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">త</text>
+    <text category="letter">థ</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">చ</text>
+    <text category="letter">ఛ</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">ఠ</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ె</text>
+    <text category="letter">ఎ</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ం</text>
+    <text category="letter">ఁ</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">మ</text>
+    <text category="letter">ణ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">న</text>
+    <text category="letter">ః</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">వ</text>
+    <text category="letter">‌</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ల</text>
+    <text category="letter">ళ</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">స</text>
+    <text category="letter">శ</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">,</text>
+    <text category="letter">ష</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">.</text>
+    <text category="letter">&gt;</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">య</text>
+    <text category="letter">?</text>
+  </key>
+</symbols>
+
--- a/data/keyboards/symbols/th.xml
+++ b/data/keyboards/symbols/th.xml
@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="95">underscore</keysym>
+    <keysym keyval="37">percent</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="3557">Thai_lakkhangyao</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="47">slash</keysym>
+    <keysym keyval="3569">Thai_leknung</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="3570">Thai_leksong</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="3520">Thai_phosamphao</keysym>
+    <keysym keyval="3571">Thai_leksam</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="3510">Thai_thothung</keysym>
+    <keysym keyval="3572">Thai_leksi</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="3544">Thai_sarau</keysym>
+    <keysym keyval="3545">Thai_sarauu</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="3542">Thai_saraue</keysym>
+    <keysym keyval="3551">Thai_baht</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="3492">Thai_khokhwai</keysym>
+    <keysym keyval="3573">Thai_lekha</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="3509">Thai_totao</keysym>
+    <keysym keyval="3574">Thai_lekhok</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="3496">Thai_chochan</keysym>
+    <keysym keyval="3575">Thai_lekchet</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="3490">Thai_khokhai</keysym>
+    <keysym keyval="3576">Thai_lekpaet</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="3498">Thai_chochang</keysym>
+    <keysym keyval="3577">Thai_lekkao</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <keysym keyval="3558">Thai_maiyamok</keysym>
+    <keysym keyval="3568">Thai_leksun</keysym>
+  </key>
+  <key keycode="25" name="AD02">
+    <keysym keyval="3556">Thai_saraaimaimalai</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <keysym keyval="3539">Thai_saraam</keysym>
+    <keysym keyval="3502">Thai_dochada</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <keysym keyval="3518">Thai_phophan</keysym>
+    <keysym keyval="3505">Thai_thonangmontho</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <keysym keyval="3536">Thai_saraa</keysym>
+    <keysym keyval="3512">Thai_thothong</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <keysym keyval="3537">Thai_maihanakat</keysym>
+    <keysym keyval="3565">Thai_nikhahit</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <keysym keyval="3541">Thai_saraii</keysym>
+    <keysym keyval="3562">Thai_maitri</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <keysym keyval="3523">Thai_rorua</keysym>
+    <keysym keyval="3507">Thai_nonen</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <keysym keyval="3513">Thai_nonu</keysym>
+    <keysym keyval="3535">Thai_paiyannoi</keysym>
+  </key>
+  <key keycode="33" name="AD10">
+    <keysym keyval="3522">Thai_yoyak</keysym>
+    <keysym keyval="3501">Thai_yoying</keysym>
+  </key>
+  <key keycode="34" name="AD11">
+    <keysym keyval="3514">Thai_bobaimai</keysym>
+    <keysym keyval="3504">Thai_thothan</keysym>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="3525">Thai_loling</keysym>
+    <keysym keyval="44">comma</keysym>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="3491">Thai_khokhuat</keysym>
+    <keysym keyval="3493">Thai_khokhon</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <keysym keyval="3519">Thai_fofan</keysym>
+    <keysym keyval="3524">Thai_ru</keysym>
+  </key>
+  <key keycode="39" name="AC02">
+    <keysym keyval="3531">Thai_hohip</keysym>
+    <keysym keyval="3494">Thai_khorakhang</keysym>
+  </key>
+  <key keycode="40" name="AC03">
+    <keysym keyval="3489">Thai_kokai</keysym>
+    <keysym keyval="3503">Thai_topatak</keysym>
+  </key>
+  <key keycode="41" name="AC04">
+    <keysym keyval="3508">Thai_dodek</keysym>
+    <keysym keyval="3554">Thai_sarao</keysym>
+  </key>
+  <key keycode="42" name="AC05">
+    <keysym keyval="3552">Thai_sarae</keysym>
+    <keysym keyval="3500">Thai_chochoe</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <keysym keyval="3561">Thai_maitho</keysym>
+    <keysym keyval="3559">Thai_maitaikhu</keysym>
+  </key>
+  <key keycode="44" name="AC07">
+    <keysym keyval="3560">Thai_maiek</keysym>
+    <keysym keyval="3563">Thai_maichattawa</keysym>
+  </key>
+  <key keycode="45" name="AC08">
+    <keysym keyval="3538">Thai_saraaa</keysym>
+    <keysym keyval="3529">Thai_sorusi</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <keysym keyval="3530">Thai_sosua</keysym>
+    <keysym keyval="3528">Thai_sosala</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <keysym keyval="3527">Thai_wowaen</keysym>
+    <keysym keyval="3499">Thai_soso</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="3495">Thai_ngongu</keysym>
+    <keysym keyval="46">period</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <keysym keyval="3516">Thai_phophung</keysym>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="53" name="AB02">
+    <keysym keyval="3515">Thai_popla</keysym>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <keysym keyval="3553">Thai_saraae</keysym>
+    <keysym keyval="3497">Thai_choching</keysym>
+  </key>
+  <key keycode="55" name="AB04">
+    <keysym keyval="3533">Thai_oang</keysym>
+    <keysym keyval="3534">Thai_honokhuk</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <keysym keyval="3540">Thai_sarai</keysym>
+    <keysym keyval="3546">Thai_phinthu</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <keysym keyval="3543">Thai_sarauee</keysym>
+    <keysym keyval="3564">Thai_thanthakhat</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <keysym keyval="3511">Thai_thothahan</keysym>
+    <keysym keyval="63">question</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <keysym keyval="3521">Thai_moma</keysym>
+    <keysym keyval="3506">Thai_thophuthao</keysym>
+  </key>
+  <key keycode="60" name="AB09">
+    <keysym keyval="3555">Thai_saraaimaimuan</keysym>
+    <keysym keyval="3532">Thai_lochula</keysym>
+  </key>
+  <key keycode="61" name="AB10">
+    <keysym keyval="3517">Thai_fofa</keysym>
+    <keysym keyval="3526">Thai_lu</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ua.xml
+++ b/data/keyboards/symbols/ua.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <text category="letter">Ґ</text>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <text category="letter">!</text>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <text category="letter">&quot;</text>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <text category="letter">№</text>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <text category="letter">;</text>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <text category="letter">%</text>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <text category="letter">:</text>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <text category="letter">?</text>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <text category="letter">*</text>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <text category="letter">(</text>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <text category="letter">)</text>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <text category="letter">_</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <text category="letter">+</text>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">й</text>
+    <text category="letter">Й</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ц</text>
+    <text category="letter">Ц</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">у</text>
+    <text category="letter">У</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">к</text>
+    <text category="letter">К</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">е</text>
+    <text category="letter">Е</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">н</text>
+    <text category="letter">Н</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">г</text>
+    <text category="letter">Г</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ш</text>
+    <text category="letter">Ш</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">щ</text>
+    <text category="letter">Щ</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">з</text>
+    <text category="letter">З</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <text category="letter">х</text>
+    <text category="letter">Х</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <text category="letter">ї</text>
+    <text category="letter">Ї</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <text category="letter">\</text>
+    <text category="letter">|</text>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ф</text>
+    <text category="letter">Ф</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">і</text>
+    <text category="letter">І</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">в</text>
+    <text category="letter">В</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">а</text>
+    <text category="letter">А</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">п</text>
+    <text category="letter">П</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">р</text>
+    <text category="letter">Р</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">о</text>
+    <text category="letter">О</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">л</text>
+    <text category="letter">Л</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">д</text>
+    <text category="letter">Д</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ж</text>
+    <text category="letter">Ж</text>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <text category="letter">Є</text>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">я</text>
+    <text category="letter">Я</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ч</text>
+    <text category="letter">Ч</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">с</text>
+    <text category="letter">С</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">м</text>
+    <text category="letter">М</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">и</text>
+    <text category="letter">И</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">т</text>
+    <text category="letter">Т</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ь</text>
+    <text category="letter">Ь</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">б</text>
+    <text category="letter">Б</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ю</text>
+    <text category="letter">Ю</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">.</text>
+    <text category="letter">,</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/ug.xml
+++ b/data/keyboards/symbols/ug.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <text category="letter">—</text>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">چ</text>
+    <text category="letter">چ</text>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ۋ</text>
+    <text category="letter">ۋ</text>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ې</text>
+    <text category="letter">ې</text>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ر</text>
+    <text category="letter">ر</text>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ت</text>
+    <text category="letter">ت</text>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ي</text>
+    <text category="letter">ي</text>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ۇ</text>
+    <text category="letter">ۇ</text>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ڭ</text>
+    <text category="letter">ڭ</text>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">و</text>
+    <text category="letter">و</text>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">پ</text>
+    <text category="letter">پ</text>
+  </key>
+  <key keycode="34" name="AD11">
+    <keysym keyval="91">bracketleft</keysym>
+    <text category="letter">«</text>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="93">bracketright</keysym>
+    <text category="letter">»</text>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ھ</text>
+    <text category="letter">ھ</text>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">س</text>
+    <text category="letter">س</text>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">د</text>
+    <text category="letter">ژ</text>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ا</text>
+    <text category="letter">ف</text>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ە</text>
+    <text category="letter">گ</text>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ى</text>
+    <text category="letter">خ</text>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ق</text>
+    <text category="letter">ج</text>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ك</text>
+    <text category="letter">ۆ</text>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ل</text>
+    <text category="letter">ل</text>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">؛</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ز</text>
+    <text category="letter">ز</text>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ش</text>
+    <text category="letter">ش</text>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">غ</text>
+    <text category="letter">غ</text>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ۈ</text>
+    <text category="letter">ۈ</text>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ب</text>
+    <text category="letter">ب</text>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ن</text>
+    <text category="letter">ن</text>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">م</text>
+    <text category="letter">م</text>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">،</text>
+    <text category="letter">‹</text>
+  </key>
+  <key keycode="60" name="AB09">
+    <keysym keyval="46">period</keysym>
+    <text category="letter">›</text>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ئ</text>
+    <text category="letter">؟</text>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@ -0,0 +1,304 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <key keycode="9" name="ESC">
+    <keysym keyval="65307">Escape</keysym>
+  </key>
+  <key keycode="67" name="FK01">
+    <keysym keyval="65470">F1</keysym>
+  </key>
+  <key keycode="68" name="FK02">
+    <keysym keyval="65471">F2</keysym>
+  </key>
+  <key keycode="69" name="FK03">
+    <keysym keyval="65472">F3</keysym>
+  </key>
+  <key keycode="70" name="FK04">
+    <keysym keyval="65473">F4</keysym>
+  </key>
+  <key keycode="71" name="FK05">
+    <keysym keyval="65474">F5</keysym>
+  </key>
+  <key keycode="72" name="FK06">
+    <keysym keyval="65475">F6</keysym>
+  </key>
+  <key keycode="73" name="FK07">
+    <keysym keyval="65476">F7</keysym>
+  </key>
+  <key keycode="74" name="FK08">
+    <keysym keyval="65477">F8</keysym>
+  </key>
+  <key keycode="75" name="FK09">
+    <keysym keyval="65478">F9</keysym>
+  </key>
+  <key keycode="76" name="FK10">
+    <keysym keyval="65479">F10</keysym>
+  </key>
+  <key keycode="95" name="FK11">
+    <keysym keyval="65480">F11</keysym>
+  </key>
+  <key keycode="96" name="FK12">
+    <keysym keyval="65481">F12</keysym>
+  </key>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="22" name="BKSP">
+    <keysym keyval="65288">BackSpace</keysym>
+  </key>
+  <key keycode="23" name="TAB">
+    <keysym keyval="65289">Tab</keysym>
+    <keysym keyval="65056">ISO_Left_Tab</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <keysym keyval="113">q</keysym>
+    <keysym keyval="81">Q</keysym>
+    <keysym keyval="49">1</keysym>
+  </key>
+  <key keycode="25" name="AD02">
+    <keysym keyval="119">w</keysym>
+    <keysym keyval="87">W</keysym>
+    <keysym keyval="50">2</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <keysym keyval="101">e</keysym>
+    <keysym keyval="69">E</keysym>
+    <keysym keyval="51">3</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <keysym keyval="114">r</keysym>
+    <keysym keyval="82">R</keysym>
+    <keysym keyval="52">4</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <keysym keyval="116">t</keysym>
+    <keysym keyval="84">T</keysym>
+    <keysym keyval="53">5</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <keysym keyval="121">y</keysym>
+    <keysym keyval="89">Y</keysym>
+    <keysym keyval="54">6</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <keysym keyval="117">u</keysym>
+    <keysym keyval="85">U</keysym>
+    <keysym keyval="55">7</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <keysym keyval="105">i</keysym>
+    <keysym keyval="73">I</keysym>
+    <keysym keyval="56">8</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <keysym keyval="111">o</keysym>
+    <keysym keyval="79">O</keysym>
+    <keysym keyval="57">9</keysym>
+  </key>
+  <key keycode="33" name="AD10">
+    <keysym keyval="112">p</keysym>
+    <keysym keyval="80">P</keysym>
+    <keysym keyval="48">0</keysym>
+  </key>
+  <key keycode="34" name="AD11">
+    <keysym keyval="91">bracketleft</keysym>
+    <keysym keyval="123">braceleft</keysym>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="93">bracketright</keysym>
+    <keysym keyval="125">braceright</keysym>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="66" name="ALTGR">
+    <keysym keyval="65027">ISO_Level3_Shift</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <keysym keyval="97">a</keysym>
+    <keysym keyval="65">A</keysym>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="39" name="AC02">
+    <keysym keyval="115">s</keysym>
+    <keysym keyval="83">S</keysym>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="40" name="AC03">
+    <keysym keyval="100">d</keysym>
+    <keysym keyval="68">D</keysym>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="41" name="AC04">
+    <keysym keyval="102">f</keysym>
+    <keysym keyval="70">F</keysym>
+    <keysym keyval="37">percent</keysym>
+  </key>
+  <key keycode="42" name="AC05">
+    <keysym keyval="103">g</keysym>
+    <keysym keyval="71">G</keysym>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <keysym keyval="104">h</keysym>
+    <keysym keyval="72">H</keysym>
+    <keysym keyval="45">minus</keysym>
+  </key>
+  <key keycode="44" name="AC07">
+    <keysym keyval="106">j</keysym>
+    <keysym keyval="74">J</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="45" name="AC08">
+    <keysym keyval="107">k</keysym>
+    <keysym keyval="75">K</keysym>
+    <keysym keyval="123">braceleft</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <keysym keyval="108">l</keysym>
+    <keysym keyval="76">L</keysym>
+    <keysym keyval="125">braceright</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <keysym keyval="59">semicolon</keysym>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="36" name="RTRN">
+    <keysym keyval="65293">Return</keysym>
+  </key>
+  <key keycode="50" name="LFSH">
+    <keysym keyval="65505">Shift_L</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <keysym keyval="122">z</keysym>
+    <keysym keyval="90">Z</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="53" name="AB02">
+    <keysym keyval="120">x</keysym>
+    <keysym keyval="88">X</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <keysym keyval="99">c</keysym>
+    <keysym keyval="67">C</keysym>
+    <keysym keyval="39">quoteright</keysym>
+  </key>
+  <key keycode="55" name="AB04">
+    <keysym keyval="118">v</keysym>
+    <keysym keyval="86">V</keysym>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <keysym keyval="98">b</keysym>
+    <keysym keyval="66">B</keysym>
+    <keysym keyval="59">semicolon</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <keysym keyval="110">n</keysym>
+    <keysym keyval="78">N</keysym>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <keysym keyval="109">m</keysym>
+    <keysym keyval="77">M</keysym>
+    <keysym keyval="63">question</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <keysym keyval="44">comma</keysym>
+    <keysym keyval="60">less</keysym>
+  </key>
+  <key keycode="60" name="AB09">
+    <keysym keyval="46">period</keysym>
+    <keysym keyval="62">greater</keysym>
+  </key>
+  <key keycode="61" name="AB10">
+    <keysym keyval="47">slash</keysym>
+    <keysym keyval="63">question</keysym>
+  </key>
+  <key keycode="62" name="RTSH">
+    <keysym keyval="65506">Shift_R</keysym>
+  </key>
+  <key keycode="149" name="I149">
+    <symbol label="⌨" icon="input-keyboard-symbolic" tooltip="Change keyboard">cycle-keyboard</symbol>
+  </key>
+  <key keycode="150" name="I150">
+    <symbol label="☺" icon="preferences-system-symbolic" tooltip="Setup">preferences</symbol>
+  </key>
+  <key keycode="37" name="LCTL">
+    <keysym keyval="65507">Control_L</keysym>
+  </key>
+  <key keycode="64" name="LALT">
+    <keysym keyval="65513">Alt_L</keysym>
+    <keysym keyval="65511">Meta_L</keysym>
+  </key>
+  <key keycode="65" name="SPCE">
+    <keysym keyval="32">space</keysym>
+  </key>
+  <key keycode="113" name="LEFT">
+    <keysym keyval="65361">Left</keysym>
+  </key>
+  <key keycode="111" name="UP">
+    <keysym keyval="65362">Up</keysym>
+  </key>
+  <key keycode="116" name="DOWN">
+    <keysym keyval="65364">Down</keysym>
+  </key>
+  <key keycode="114" name="RGHT">
+    <keysym keyval="65363">Right</keysym>
+  </key>
+</symbols>
--- a/data/keyboards/symbols/zh-bopomofo.xml
+++ b/data/keyboards/symbols/zh-bopomofo.xml
@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<symbols version="0.90">
+  <include>us</include>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <text category="letter">ㄅ</text>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <text category="letter">ㄉ</text>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <text category="letter">ˇ</text>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <text category="letter">ˋ</text>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <text category="letter">ㄓ</text>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <text category="letter">ˊ</text>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <text category="letter">˙</text>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <text category="letter">ㄚ</text>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <text category="letter">ㄞ</text>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <text category="letter">ㄢ</text>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <text category="letter">ㄦ</text>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="24" name="AD01">
+    <text category="letter">ㄆ</text>
+    <keysym keyval="81">Q</keysym>
+  </key>
+  <key keycode="25" name="AD02">
+    <text category="letter">ㄊ</text>
+    <keysym keyval="87">W</keysym>
+  </key>
+  <key keycode="26" name="AD03">
+    <text category="letter">ㄍ</text>
+    <keysym keyval="69">E</keysym>
+  </key>
+  <key keycode="27" name="AD04">
+    <text category="letter">ㄐ</text>
+    <keysym keyval="82">R</keysym>
+  </key>
+  <key keycode="28" name="AD05">
+    <text category="letter">ㄔ</text>
+    <keysym keyval="84">T</keysym>
+  </key>
+  <key keycode="29" name="AD06">
+    <text category="letter">ㄗ</text>
+    <keysym keyval="89">Y</keysym>
+  </key>
+  <key keycode="30" name="AD07">
+    <text category="letter">ㄧ</text>
+    <keysym keyval="85">U</keysym>
+  </key>
+  <key keycode="31" name="AD08">
+    <text category="letter">ㄛ</text>
+    <keysym keyval="73">I</keysym>
+  </key>
+  <key keycode="32" name="AD09">
+    <text category="letter">ㄟ</text>
+    <keysym keyval="79">O</keysym>
+  </key>
+  <key keycode="33" name="AD10">
+    <text category="letter">ㄣ</text>
+    <keysym keyval="80">P</keysym>
+  </key>
+  <key keycode="34" name="AD11">
+    <keysym keyval="91">bracketleft</keysym>
+    <keysym keyval="123">braceleft</keysym>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="93">bracketright</keysym>
+    <keysym keyval="125">braceright</keysym>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="38" name="AC01">
+    <text category="letter">ㄇ</text>
+    <keysym keyval="65">A</keysym>
+  </key>
+  <key keycode="39" name="AC02">
+    <text category="letter">ㄋ</text>
+    <keysym keyval="83">S</keysym>
+  </key>
+  <key keycode="40" name="AC03">
+    <text category="letter">ㄎ</text>
+    <keysym keyval="68">D</keysym>
+  </key>
+  <key keycode="41" name="AC04">
+    <text category="letter">ㄑ</text>
+    <keysym keyval="70">F</keysym>
+  </key>
+  <key keycode="42" name="AC05">
+    <text category="letter">ㄕ</text>
+    <keysym keyval="71">G</keysym>
+  </key>
+  <key keycode="43" name="AC06">
+    <text category="letter">ㄘ</text>
+    <keysym keyval="72">H</keysym>
+  </key>
+  <key keycode="44" name="AC07">
+    <text category="letter">ㄨ</text>
+    <keysym keyval="74">J</keysym>
+  </key>
+  <key keycode="45" name="AC08">
+    <text category="letter">ㄜ</text>
+    <keysym keyval="75">K</keysym>
+  </key>
+  <key keycode="46" name="AC09">
+    <text category="letter">ㄠ</text>
+    <keysym keyval="76">L</keysym>
+  </key>
+  <key keycode="47" name="AC10">
+    <text category="letter">ㄤ</text>
+    <keysym keyval="58">colon</keysym>
+  </key>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
+  </key>
+  <key keycode="52" name="AB01">
+    <text category="letter">ㄈ</text>
+    <keysym keyval="90">Z</keysym>
+  </key>
+  <key keycode="53" name="AB02">
+    <text category="letter">ㄌ</text>
+    <keysym keyval="88">X</keysym>
+  </key>
+  <key keycode="54" name="AB03">
+    <text category="letter">ㄏ</text>
+    <keysym keyval="67">C</keysym>
+  </key>
+  <key keycode="55" name="AB04">
+    <text category="letter">ㄒ</text>
+    <keysym keyval="86">V</keysym>
+  </key>
+  <key keycode="56" name="AB05">
+    <text category="letter">ㄖ</text>
+    <keysym keyval="66">B</keysym>
+  </key>
+  <key keycode="57" name="AB06">
+    <text category="letter">ㄙ</text>
+    <keysym keyval="78">N</keysym>
+  </key>
+  <key keycode="58" name="AB07">
+    <text category="letter">ㄩ</text>
+    <keysym keyval="77">M</keysym>
+  </key>
+  <key keycode="59" name="AB08">
+    <text category="letter">ㄝ</text>
+    <keysym keyval="60">less</keysym>
+  </key>
+  <key keycode="60" name="AB09">
+    <text category="letter">ㄡ</text>
+    <keysym keyval="62">greater</keysym>
+  </key>
+  <key keycode="61" name="AB10">
+    <text category="letter">ㄥ</text>
+    <keysym keyval="63">question</keysym>
+  </key>
+</symbols>
--- a/data/meson.build
+++ b/data/meson.build
@ -0,0 +1,64 @@
+
+install_data(
+    'themes/default.css',
+    install_dir: pkgdatadir + '/themes',
+)
+
+install_data(
+    'keyboards/keyboards.xml',
+    install_dir: pkgdatadir + '/keyboards/',
+)
+
+install_data(
+    'keyboards/geometry/compact.xml',
+    install_dir: pkgdatadir + '/keyboards/geometry/',
+)
+
+symbols = [
+    'ar.xml',
+    'as-inscript.xml',
+    'be.xml',
+    'bn-inscript.xml',
+    'fa.xml',
+    'gu-inscript.xml',
+    'he.xml',
+    'hi-inscript.xml',
+    'ja-kana.xml',
+    'kk.xml',
+    'kn-inscript.xml',
+    'ks-inscript.xml',
+    'ks.xml',
+    'mai-inscript.xml',
+    'ml-inscript.xml',
+    'mr-inscript.xml',
+    'my.xml',
+    'or-inscript.xml',
+    'pa-inscript.xml',
+    'ru.xml',
+    'sd-inscript.xml',
+    'ta-inscript.xml',
+    'te-inscript.xml',
+    'th.xml',
+    'ua.xml',
+    'ug.xml',
+    'us.xml',
+    'zh-bopomofo.xml',
+]
+
+foreach symbol: symbols
+    install_data(
+        'keyboards/symbols/' + symbol,
+        install_dir: pkgdatadir + '/keyboards/symbols/',
+    )
+endforeach
+
+desktop_file = 'sm.puri.Squeekboard.desktop'
+
+i18n.merge_file('desktop',
+    input: desktop_file + '.in',
+    output: desktop_file,
+    po_dir: '../po',
+    install: true,
+    install_dir: join_paths(datadir, 'applications'),
+    type: 'desktop'
+)
--- a/data/sm.puri.Squeekboard.desktop.in
+++ b/data/sm.puri.Squeekboard.desktop.in
@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Squeekboard
+GenericName=Squeekboard Virtual Keyboard
+Comment=Virtual Keyboard
+Exec=squeekboard
+Icon=squeekboard
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
--- a/data/themes/default.css
+++ b/data/themes/default.css
@ -0,0 +1,18 @@
+.keyboard {
+    background-color: rgba(0, 0, 0, 255);
+    color: #ffffff;
+    font-family: cantarell, sans-serif;
+}
+
+.key {
+    color: #deddda;
+    background: #464448;
+    border-width: 0.5px;
+    border-color: #5e5c64;
+    border-radius: 2px;
+}
+
+.key:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,11 @@
+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
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+10
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,25 @@
+Source: squeekboard
+Section: x11
+Priority: optional
+Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
+Build-Depends:
+ debhelper (>= 10),
+ meson (>=0.43.0),
+ pkg-config,
+ libglib2.0-dev,
+ libgtk-3-dev,
+ libcroco3-dev,
+ libwayland-dev (>= 1.16),
+ rustc,
+ virtboard,
+ wayland-protocols (>= 1.14)
+Standards-Version: 4.1.3
+Homepage: https://source.puri.sm/Librem5/squeekboard
+
+Package: squeekboard
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends}
+ ${misc:Depends}
+Description: On-screen keyboard for Wayland
+ Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: evscript
+Source: https://source.puri.sm/david.boddie/evscript
+
+Files: *
+Copyright: 2019 Purism SPC
+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".
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --builddirectory=_build --buildsystem=meson
+
+override_dh_autoreconf:
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (native)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@ -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
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@ -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
--- a/docs/reference/eek/Makefile.am
+++ b/docs/reference/eek/Makefile.am
@ -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
--- a/docs/reference/eek/eek-docs.sgml
+++ b/docs/reference/eek/eek-docs.sgml
@ -8,15 +8,15 @@
  <bookinfo>
    <title>libeek Reference Manual</title>
    <releaseinfo>
-      for libeek 0.0.1.
+      for libeek 0.90.0.
    </releaseinfo>
    <copyright>
-      <year>2010</year>
+      <year>2010-2011</year>
      <holder>Daiki Ueno</holder>
    </copyright>

    <copyright>
-      <year>2010</year>
+      <year>2010-2011</year>
      <holder>Red Hat, Inc.</holder>
    </copyright>

@ -37,23 +37,27 @@
    <title>API Manual</title>
    <chapter>
      <title>Base Classes, Interfaces, and Utilities</title>
+      <xi:include href="xml/eek.xml"/>
+      <xi:include href="xml/eek-serializable.xml"/>
      <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-symbol.xml"/>
+      <xi:include href="xml/eek-keysym.xml"/>
+      <xi:include href="xml/eek-text.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>
+      <title>GTK Adapter</title>
      <xi:include href="xml/eek-gtk-keyboard.xml"/>
    </chapter>
+    <chapter>
+      <title>Clutter Adapter</title>
+      <xi:include href="xml/eek-clutter-keyboard.xml"/>
+    </chapter>
    <chapter>
      <title>Libxklavier Layout Engine</title>
      <xi:include href="xml/eek-xkl-layout.xml"/>
@ -62,6 +66,11 @@
      <title>XKB Layout Engine</title>
      <xi:include href="xml/eek-xkb-layout.xml"/>
    </chapter>
+    <chapter>
+      <title>XML Layout Engine</title>
+      <xi:include href="xml/eek-xml-layout.xml"/>
+      <xi:include href="xml/eek-xml.xml"/>
+    </chapter>
    <chapter id="object-tree">
      <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml"/>
--- a/docs/reference/eek/eek-overview.xml
+++ b/docs/reference/eek/eek-overview.xml
@ -4,50 +4,60 @@

    <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>
+    kind of objects.  One is <emphasis>keyboard element</emphasis>
+    (objects derived from #EekElement) and another is
+    <emphasis>keyboard layout engine</emphasis> (objects 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,
+    element implements the Builder design pattern so that it can map
+    itself to different UI widgets (#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>
-
+    <para>Here is a sample code which demonstrates (1) keyboard
+    elements are arranged with the system keyboard layout using
+    libxklavier and (2) keyboard elements are mapped into
+    #ClutterActor:</para>
    <informalexample>
      <programlisting>
-EekKeyboard *keyboard;
 EekLayout *layout;
+EekKeyboard *keyboard;
+ClutterActor *actor;

-/* Create a keyboard layout using libxklavier configuration. */
+/* Create a layout engine based on libxklavier configuration. */
 layout = eek_xkl_layout_new ();

-/* Create a keyboard implemented as ClutterActor. */
-keyboard = eek_clutter_keyboard_new ();
+/* Create a keyboard from the given layout. */
+keyboard = eek_keyboard_new (layout, initial_width, initial_height);

-/* Apply the layout to the keyboard. */
-eek_keyboard_set_layout (keyboard, layout);
+/* Create a ClutterActor. */
+actor = eek_clutter_keyboard_new (eekboard->keyboard);

-clutter_group_add (CLUTTER_GROUP(stage),
-                   eek_clutter_keyboard_get_actor (EEK_CLUTTER_KEYBOARD(keyboard)));
+/* Add the actor to a stage. */
+clutter_group_add (CLUTTER_GROUP(stage), actor);
      </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>libeek currently supports GTK+ and Clutter as UI toolkits.
+    To create a keyboard-like #GtkWidget instead of #ClutterActor,
+    replace eek_clutter_keyboard_new() with eek_gtk_keyboard_new().
+    Similarly, if you want to use XKB configuration directly (without
+    libxklavier), you will only need to replace eek_xkl_layout_new ()
+    with eek_xkb_layout_new().</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>
+    <para>In the above example, 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 may emit
+    events when user pushes the corresponding UI widget.</para>
+    <para>
+      Here is another sample code which demonstrates logical events on
+      #EekElement:
+    </para>
    <informalexample>
      <programlisting>
 /* Find a key element in the logical keyboard. */
@ -55,6 +65,6 @@ 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>
+    <para>When user pushed a widget which looks like "a" key (i.e. keycode 0x38), on_a_pressed will be called.</para>
  </partintro>
 </part>
--- a/docs/reference/eek/eek-sections.txt
+++ b/docs/reference/eek/eek-sections.txt
@ -1,100 +1,28 @@
 <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
+<FILE>eek</FILE>
+eek_init
 </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
+<FILE>eek-clutter</FILE>
+
 </SECTION>

 <SECTION>
-<FILE>eek-gtk-keyboard</FILE>
-<TITLE>EekGtkKeyboard</TITLE>
-EekGtkKeyboard
-EekGtkKeyboardClass
-EekGtkKeyboardPrivate
-eek_gtk_keyboard_new
-eek_gtk_keyboard_get_widget
+<FILE>eek-clutter-key</FILE>
+<TITLE>EekClutterKey</TITLE>
+EekClutterKey
+EekClutterKeyClass
+eek_clutter_key_new
 <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
+EEK_CLUTTER_KEY
+EEK_CLUTTER_KEY_CLASS
+EEK_CLUTTER_KEY_GET_CLASS
+EEK_IS_CLUTTER_KEY
+EEK_IS_CLUTTER_KEY_CLASS
+EEK_TYPE_CLUTTER_KEY
+EekClutterKeyPrivate
+eek_clutter_key_get_type
 </SECTION>

 <SECTION>
@ -102,43 +30,425 @@ EEK_CONTAINER_GET_CLASS
 <TITLE>EekClutterKeyboard</TITLE>
 EekClutterKeyboard
 EekClutterKeyboardClass
-EekClutterKeyboardPrivate
 eek_clutter_keyboard_new
-eek_clutter_keyboard_get_actor
+eek_clutter_keyboard_set_theme
 <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
+EEK_IS_CLUTTER_KEYBOARD
+EEK_IS_CLUTTER_KEYBOARD_CLASS
+EEK_TYPE_CLUTTER_KEYBOARD
+EekClutterKeyboardPrivate
+eek_clutter_keyboard_get_type
 </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
+<FILE>eek-clutter-renderer</FILE>
+<TITLE>EekClutterRenderer</TITLE>
+EekClutterRenderer
+EekClutterRendererClass
+eek_clutter_renderer_new
+eek_clutter_renderer_render_key
 <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
+EEK_CLUTTER_RENDERER
+EEK_CLUTTER_RENDERER_CLASS
+EEK_CLUTTER_RENDERER_GET_CLASS
+EEK_IS_CLUTTER_RENDERER
+EEK_IS_CLUTTER_RENDERER_CLASS
+EEK_TYPE_CLUTTER_RENDERER
+EekClutterRendererPrivate
+eek_clutter_renderer_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-clutter-section</FILE>
+<TITLE>EekClutterSection</TITLE>
+EekClutterSection
+EekClutterSectionClass
+eek_clutter_section_new
+<SUBSECTION Standard>
+EEK_CLUTTER_SECTION
+EEK_CLUTTER_SECTION_CLASS
+EEK_CLUTTER_SECTION_GET_CLASS
+EEK_IS_CLUTTER_SECTION
+EEK_IS_CLUTTER_SECTION_CLASS
+EEK_TYPE_CLUTTER_SECTION
+EekClutterSectionPrivate
+eek_clutter_section_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-container</FILE>
+<TITLE>EekContainer</TITLE>
+EekCallback
+EekCompareFunc
+EekContainer
+EekContainerClass
+eek_container_add_child
+eek_container_find
+eek_container_foreach_child
+<SUBSECTION Standard>
+EEK_CONTAINER
+EEK_CONTAINER_CLASS
+EEK_CONTAINER_GET_CLASS
+EEK_IS_CONTAINER
+EEK_IS_CONTAINER_CLASS
+EEK_TYPE_CONTAINER
+EekContainerPrivate
+eek_container_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-element</FILE>
+<TITLE>EekElement</TITLE>
+EekElement
+EekElementClass
+eek_element_get_absolute_position
+eek_element_get_bounds
+eek_element_get_group
+eek_element_get_level
+eek_element_get_name
+eek_element_get_parent
+eek_element_get_symbol_index
+eek_element_set_bounds
+eek_element_set_group
+eek_element_set_level
+eek_element_set_name
+eek_element_set_parent
+eek_element_set_position
+eek_element_set_size
+eek_element_set_symbol_index
+<SUBSECTION Standard>
+EEK_ELEMENT
+EEK_ELEMENT_CLASS
+EEK_ELEMENT_GET_CLASS
+EEK_IS_ELEMENT
+EEK_IS_ELEMENT_CLASS
+EEK_TYPE_ELEMENT
+EekElementPrivate
+eek_element_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-gtk</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-gtk-keyboard</FILE>
+<TITLE>EekGtkKeyboard</TITLE>
+EekGtkKeyboard
+EekGtkKeyboardClass
+eek_gtk_keyboard_new
+eek_gtk_keyboard_set_theme
+<SUBSECTION Standard>
+EEK_GTK_KEYBOARD
+EEK_GTK_KEYBOARD_CLASS
+EEK_GTK_KEYBOARD_GET_CLASS
+EEK_IS_GTK_KEYBOARD
+EEK_IS_GTK_KEYBOARD_CLASS
+EEK_TYPE_GTK_KEYBOARD
+EekGtkKeyboardPrivate
+eek_gtk_keyboard_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-key</FILE>
+<TITLE>EekKey</TITLE>
+EekKey
+EekKeyClass
+eek_key_get_index
+eek_key_get_keycode
+eek_key_get_oref
+eek_key_get_symbol
+eek_key_get_symbol_at_index
+eek_key_get_symbol_matrix
+eek_key_get_symbol_with_fallback
+eek_key_is_locked
+eek_key_is_pressed
+eek_key_set_index
+eek_key_set_keycode
+eek_key_set_oref
+eek_key_set_symbol_matrix
+<SUBSECTION Standard>
+EEK_IS_KEY
+EEK_IS_KEY_CLASS
+EEK_KEY
+EEK_KEY_CLASS
+EEK_KEY_GET_CLASS
+EEK_TYPE_KEY
+EekKeyPrivate
+eek_key_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-keyboard</FILE>
+<TITLE>EekKeyboard</TITLE>
+EekKeyboard
+EekKeyboardClass
+EekModifierKey
+eek_keyboard_add_outline
+eek_keyboard_create_section
+eek_keyboard_find_key_by_keycode
+eek_keyboard_get_alt_gr_mask
+eek_keyboard_get_group
+eek_keyboard_get_layout
+eek_keyboard_get_level
+eek_keyboard_get_locked_keys
+eek_keyboard_get_modifier_behavior
+eek_keyboard_get_modifiers
+eek_keyboard_get_num_lock_mask
+eek_keyboard_get_outline
+eek_keyboard_get_pressed_keys
+eek_keyboard_get_size
+eek_keyboard_get_symbol_index
+eek_keyboard_new
+eek_keyboard_set_alt_gr_mask
+eek_keyboard_set_group
+eek_keyboard_set_level
+eek_keyboard_set_modifier_behavior
+eek_keyboard_set_modifiers
+eek_keyboard_set_num_lock_mask
+eek_keyboard_set_size
+eek_keyboard_set_symbol_index
+<SUBSECTION Standard>
+EEK_IS_KEYBOARD
+EEK_IS_KEYBOARD_CLASS
+EEK_KEYBOARD
+EEK_KEYBOARD_CLASS
+EEK_KEYBOARD_GET_CLASS
+EEK_TYPE_KEYBOARD
+EekKeyboardPrivate
+eek_keyboard_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-keysym</FILE>
+<TITLE>EekKeysym</TITLE>
+EekKeysym
+EekKeysymClass
+eek_keysym_get_xkeysym
+eek_keysym_new
+eek_keysym_new_from_name
+eek_keysym_new_with_modifier
+<SUBSECTION Standard>
+EEK_INVALID_KEYSYM
+EEK_IS_KEYSYM
+EEK_IS_KEYSYM_CLASS
+EEK_KEYSYM
+EEK_KEYSYM_CLASS
+EEK_KEYSYM_GET_CLASS
+EEK_TYPE_KEYSYM
+EekKeysymPrivate
+eek_keysym_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-layout</FILE>
+<TITLE>EekLayout</TITLE>
+EekLayout
+EekLayoutClass
+<SUBSECTION Standard>
+EEK_IS_LAYOUT
+EEK_IS_LAYOUT_CLASS
+EEK_LAYOUT
+EEK_LAYOUT_CLASS
+EEK_LAYOUT_GET_CLASS
+EEK_TYPE_LAYOUT
+eek_layout_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-marshalers</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-section</FILE>
+<TITLE>EekSection</TITLE>
+EekSection
+EekSectionClass
+eek_section_add_row
+eek_section_create_key
+eek_section_find_key_by_keycode
+eek_section_get_angle
+eek_section_get_n_rows
+eek_section_get_row
+eek_section_set_angle
+<SUBSECTION Standard>
+EEK_IS_SECTION
+EEK_IS_SECTION_CLASS
+EEK_SECTION
+EEK_SECTION_CLASS
+EEK_SECTION_GET_CLASS
+EEK_TYPE_SECTION
+EekSectionPrivate
+eek_section_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-serializable</FILE>
+<TITLE>EekSerializable</TITLE>
+EekSerializableIface
+eek_serializable_deserialize
+eek_serializable_serialize
+<SUBSECTION Standard>
+EEK_IS_SERIALIZABLE
+EEK_SERIALIZABLE
+EEK_SERIALIZABLE_GET_IFACE
+EEK_TYPE_SERIALIZABLE
+eek_serializable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-special-keysym-entries</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-symbol</FILE>
+<TITLE>EekSymbol</TITLE>
+EekSymbol
+EekSymbolCategory
+EekSymbolClass
+eek_symbol_category_from_name
+eek_symbol_category_get_name
+eek_symbol_get_category
+eek_symbol_get_icon_name
+eek_symbol_get_label
+eek_symbol_get_modifier_mask
+eek_symbol_get_name
+eek_symbol_is_modifier
+eek_symbol_new
+eek_symbol_set_category
+eek_symbol_set_icon_name
+eek_symbol_set_label
+eek_symbol_set_modifier_mask
+eek_symbol_set_name
+<SUBSECTION Standard>
+EEK_IS_SYMBOL
+EEK_IS_SYMBOL_CLASS
+EEK_SYMBOL
+EEK_SYMBOL_CLASS
+EEK_SYMBOL_GET_CLASS
+EEK_TYPE_SYMBOL
+EekSymbolPrivate
+eek_symbol_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-symbol-matrix</FILE>
+EekSymbolMatrix
+eek_symbol_matrix_copy
+eek_symbol_matrix_free
+eek_symbol_matrix_get_symbol
+eek_symbol_matrix_new
+eek_symbol_matrix_set_symbol
+<SUBSECTION Standard>
+EEK_TYPE_SYMBOL_MATRIX
+eek_symbol_matrix_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-text</FILE>
+<TITLE>EekText</TITLE>
+EekText
+EekTextClass
+eek_text_get_text
+eek_text_new
+<SUBSECTION Standard>
+EEK_IS_TEXT
+EEK_IS_TEXT_CLASS
+EEK_TEXT
+EEK_TEXT_CLASS
+EEK_TEXT_GET_CLASS
+EEK_TYPE_TEXT
+EekTextPrivate
+eek_text_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-theme-context</FILE>
+EekThemeContextClass
+eek_theme_context_get_font
+eek_theme_context_get_resolution
+eek_theme_context_get_root_node
+eek_theme_context_get_theme
+eek_theme_context_new
+eek_theme_context_set_default_resolution
+eek_theme_context_set_font
+eek_theme_context_set_resolution
+eek_theme_context_set_theme
+<SUBSECTION Standard>
+EEK_IS_THEME_CONTEXT
+EEK_IS_THEME_CONTEXT_CLASS
+EEK_THEME_CONTEXT
+EEK_THEME_CONTEXT_CLASS
+EEK_THEME_CONTEXT_GET_CLASS
+EEK_TYPE_THEME_CONTEXT
+eek_theme_context_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-theme-private</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-types</FILE>
+EEK_INVALID_KEYCODE
+EekBounds
+EekColor
+EekContainer
+EekElement
+EekGradientType
+EekKey
+EekKeyboard
+EekKeysym
+EekModifierBehavior
+EekModifierType
+EekOrientation
+EekOutline
+EekPoint
+EekSection
+EekSymbol
+EekSymbolMatrix
+EekText
+EekTheme
+EekThemeContext
+EekThemeNode
+I_
+eek_bounds_copy
+eek_bounds_free
+eek_bounds_long_side
+eek_color_copy
+eek_color_free
+eek_color_new
+eek_outline_copy
+eek_outline_free
+eek_point_copy
+eek_point_free
+eek_point_rotate
+<SUBSECTION Standard>
+EEK_TYPE_BOUNDS
+EEK_TYPE_COLOR
+EEK_TYPE_OUTLINE
+EEK_TYPE_POINT
+eek_bounds_get_type
+eek_color_get_type
+eek_outline_get_type
+eek_point_get_type
+</SECTION>
+
+<SECTION>
+<FILE>eek-unicode-keysym-entries</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-xkb</FILE>
+
 </SECTION>

 <SECTION>
@ -146,98 +456,89 @@ EEK_XKL_LAYOUT_GET_CLASS
 <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_keycodes
 eek_xkb_layout_get_symbols
+eek_xkb_layout_new
+eek_xkb_layout_set_geometry
+eek_xkb_layout_set_keycodes
+eek_xkb_layout_set_names
+eek_xkb_layout_set_names_full
+eek_xkb_layout_set_names_full_valist
+eek_xkb_layout_set_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_TYPE_XKB_LAYOUT
+EEK_XKB_LAYOUT
+EEK_XKB_LAYOUT_CLASS
 EEK_XKB_LAYOUT_GET_CLASS
+EekXkbLayoutPrivate
+eek_xkb_layout_get_type
 </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
+<FILE>eek-xkeysym-keysym-entries</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-xkl</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>eek-xkl-layout</FILE>
+<TITLE>EekXklLayout</TITLE>
+EekXklLayout
+EekXklLayoutClass
+eek_xkl_layout_disable_option
+eek_xkl_layout_enable_option
+eek_xkl_layout_get_layouts
+eek_xkl_layout_get_model
+eek_xkl_layout_get_option
+eek_xkl_layout_get_options
+eek_xkl_layout_get_variants
+eek_xkl_layout_new
+eek_xkl_layout_set_config
+eek_xkl_layout_set_config_full
+eek_xkl_layout_set_layouts
+eek_xkl_layout_set_model
+eek_xkl_layout_set_options
+eek_xkl_layout_set_variants
 <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
+EEK_IS_XKL_LAYOUT
+EEK_IS_XKL_LAYOUT_CLASS
+EEK_TYPE_XKL_LAYOUT
+EEK_XKL_LAYOUT
+EEK_XKL_LAYOUT_CLASS
+EEK_XKL_LAYOUT_GET_CLASS
+EekXklLayoutPrivate
+eek_xkl_layout_get_type
 </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
+<FILE>eek-xml</FILE>
+EEK_XML_SCHEMA_VERSION
+eek_keyboard_output
+</SECTION>
+
+<SECTION>
+<FILE>eek-xml-layout</FILE>
+<TITLE>EekXmlLayout</TITLE>
+EekXmlLayout
+EekXmlLayoutClass
+eek_xml_layout_get_source
+eek_xml_layout_new
+eek_xml_layout_set_source
 <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
+EEK_IS_XML_LAYOUT
+EEK_IS_XML_LAYOUT_CLASS
+EEK_TYPE_XML_LAYOUT
+EEK_XML_LAYOUT
+EEK_XML_LAYOUT_CLASS
+EEK_XML_LAYOUT_GET_CLASS
+EekXmlLayoutPrivate
+eek_xml_layout_get_type
 </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>
--- a/docs/reference/eekboard/eekboard-docs.sgml
+++ b/docs/reference/eekboard/eekboard-docs.sgml
@ -0,0 +1,56 @@
+<?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>eekboard Reference Manual</title>
+    <releaseinfo>
+      for eekboard 0.90.0.
+    </releaseinfo>
+    <copyright>
+      <year>2011</year>
+      <holder>Daiki Ueno</holder>
+    </copyright>
+
+    <copyright>
+      <year>2011</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>
+
+  <part id="apireference">
+    <title>API Manual</title>
+    <chapter>
+      <title>Client interface to eekboard-server</title>
+      <xi:include href="xml/eekboard-client.xml"/>
+      <xi:include href="xml/eekboard-context.xml"/>
+    </chapter>
+    <chapter>
+      <title>Server interface to implement custom eekboard-server</title>
+      <xi:include href="xml/eekboard-service.xml"/>
+      <xi:include href="xml/eekboard-context-service.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>
--- a/docs/reference/eekboard/eekboard-sections.txt
+++ b/docs/reference/eekboard/eekboard-sections.txt
@ -0,0 +1,104 @@
+<SECTION>
+<FILE>eekboard-client</FILE>
+<TITLE>EekboardClient</TITLE>
+EekboardClient
+EekboardClientClass
+eekboard_client_new
+eekboard_client_create_context
+eekboard_client_push_context
+eekboard_client_pop_context
+eekboard_client_destroy_context
+EekboardClientPrivate
+<SUBSECTION Standard>
+EEKBOARD_CLIENT
+EEKBOARD_IS_CLIENT
+EEKBOARD_TYPE_CLIENT
+eekboard_client_get_type
+EEKBOARD_CLIENT_CLASS
+EEKBOARD_IS_CLIENT_CLASS
+EEKBOARD_CLIENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>eekboard-service</FILE>
+<TITLE>EekboardService</TITLE>
+EEKBOARD_SERVICE_PATH
+EEKBOARD_SERVICE_INTERFACE
+EekboardService
+EekboardServiceClass
+eekboard_service_new
+EekboardServicePrivate
+<SUBSECTION Standard>
+EEKBOARD_SERVICE
+EEKBOARD_IS_SERVICE
+EEKBOARD_TYPE_SERVICE
+eekboard_service_get_type
+EEKBOARD_SERVICE_CLASS
+EEKBOARD_IS_SERVICE_CLASS
+EEKBOARD_SERVICE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>eekboard-context</FILE>
+<TITLE>EekboardContext</TITLE>
+EekboardContext
+EekboardContextClass
+eekboard_context_new
+eekboard_context_add_keyboard
+eekboard_context_remove_keyboard
+eekboard_context_set_keyboard
+eekboard_context_show_keyboard
+eekboard_context_hide_keyboard
+eekboard_context_set_group
+eekboard_context_get_group
+eekboard_context_press_keycode
+eekboard_context_release_keycode
+eekboard_context_is_keyboard_visible
+eekboard_context_set_enabled
+eekboard_context_is_enabled
+eekboard_context_set_fullscreen
+EekboardContextPrivate
+<SUBSECTION Standard>
+EEKBOARD_CONTEXT
+EEKBOARD_IS_CONTEXT
+EEKBOARD_TYPE_CONTEXT
+eekboard_context_get_type
+EEKBOARD_CONTEXT_CLASS
+EEKBOARD_IS_CONTEXT_CLASS
+EEKBOARD_CONTEXT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>eekboard-context-service</FILE>
+<TITLE>EekboardContextService</TITLE>
+EEKBOARD_CONTEXT_SERVICE_PATH
+EEKBOARD_CONTEXT_SERVICE_INTERFACE
+EekboardContextService
+EekboardContextServiceClass
+eekboard_context_service_enable
+eekboard_context_service_disable
+eekboard_context_service_get_keyboard
+eekboard_context_service_get_fullscreen
+eekboard_context_service_get_client_name
+EekboardContextServicePrivate
+<SUBSECTION Standard>
+EEKBOARD_CONTEXT_SERVICE
+EEKBOARD_IS_CONTEXT_SERVICE
+EEKBOARD_TYPE_CONTEXT_SERVICE
+eekboard_context_service_get_type
+EEKBOARD_CONTEXT_SERVICE_CLASS
+EEKBOARD_IS_CONTEXT_SERVICE_CLASS
+EEKBOARD_CONTEXT_SERVICE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>eekboard-xklutil</FILE>
+eekboard_xkl_config_rec_from_string
+eekboard_xkl_config_rec_to_string
+eekboard_xkl_list_models
+eekboard_xkl_list_layouts
+eekboard_xkl_list_option_groups
+eekboard_xkl_list_layout_variants
+eekboard_xkl_list_options
+</SECTION>
+
--- a/docs/reference/eekboard/eekboard.types
+++ b/docs/reference/eekboard/eekboard.types
@ -0,0 +1,4 @@
+eekboard_client_get_type
+eekboard_context_get_type
+eekboard_context_service_get_type
+eekboard_service_get_type
--- a/eek/Makefile.am
+++ b/eek/Makefile.am
@ -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
--- a/eek/config.h
+++ b/eek/config.h
--- a/eek/eek-0.90.pc.in
+++ b/eek/eek-0.90.pc.in
@ -1,5 +1,5 @@
-# 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
@ -23,8 +23,8 @@ includedir=@includedir@

 Name: EEK
 Description: A Library to Create Keyboard-like UI
-URL: http://github.com/ueno/eekboard
+URL: http://fedorahosted.org/eekboard/
 Version: @VERSION@
+Requires: gobject-2.0 gio-2.0
 Libs: -L${libdir} -leek
-Libs.private: @GOBJECT2_LIBS@
 Cflags: -I${includedir}/eek-@EEK_API_VERSION@
--- a/eek/eek-clutter-drawing-context.c
+++ b/eek/eek-clutter-drawing-context.c
@ -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);
-}
--- a/eek/eek-clutter-drawing-context.h
+++ b/eek/eek-clutter-drawing-context.h
@ -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 */
--- a/eek/eek-clutter-key-actor.c
+++ b/eek/eek-clutter-key-actor.c
@ -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);
-}
--- a/eek/eek-clutter-key-actor.h
+++ b/eek/eek-clutter-key-actor.h
@ -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 */
--- a/eek/eek-clutter-key.c
+++ b/eek/eek-clutter-key.c
@ -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);
-}
--- a/eek/eek-clutter-key.h
+++ b/eek/eek-clutter-key.h
@ -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 */
--- a/eek/eek-clutter-keyboard.c
+++ b/eek/eek-clutter-keyboard.c
@ -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;
-}
--- a/eek/eek-clutter-keyboard.h
+++ b/eek/eek-clutter-keyboard.h
@ -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 */
--- a/eek/eek-clutter-section.c
+++ b/eek/eek-clutter-section.c
@ -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);
-}
--- a/eek/eek-clutter-section.h
+++ b/eek/eek-clutter-section.h
@ -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 */
--- a/eek/eek-container.c
+++ b/eek/eek-container.c
@ -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
@ -48,7 +48,8 @@ G_DEFINE_ABSTRACT_TYPE (EekContainer, eek_container, EEK_TYPE_ELEMENT);

 struct _EekContainerPrivate
 {
-    GSList *children;
+    GList *head;
+    GList *last;
 };

 static void
@ -58,10 +59,16 @@ eek_container_real_add_child (EekContainer *self,
    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);

    g_return_if_fail (EEK_IS_ELEMENT(child));
-    g_object_ref_sink (child);
+    g_object_ref (child);

-    priv->children = g_slist_prepend (priv->children, child);
+    if (!priv->head) {
+        priv->head = priv->last = g_list_prepend (priv->head, child);
+    } else {
+        priv->last->next = g_list_prepend (priv->last->next, child);
+        priv->last = priv->last->next;
+    }
    eek_element_set_parent (child, EEK_ELEMENT(self));
+    g_signal_emit (self, signals[CHILD_ADDED], 0, child);
 }

 static void
@ -69,14 +76,17 @@ eek_container_real_remove_child (EekContainer *self,
                                 EekElement   *child)
 {
    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
+    GList *head;

    g_return_if_fail (EEK_IS_ELEMENT(child));
-    head = g_slist_find (priv->children, child);
+    head = g_list_find (priv->head, child);
    g_return_if_fail (head);
    g_object_unref (child);
-    priv->children = g_slist_remove_link (priv->children, head);
+    if (head == priv->last)
+        priv->last = g_list_previous (priv->last);
+    priv->head = g_list_remove_link (priv->head, head);
    eek_element_set_parent (child, NULL);
+    g_signal_emit (self, signals[CHILD_REMOVED], 0, child);
 }

 static void
@ -85,9 +95,9 @@ eek_container_real_foreach_child (EekContainer *self,
                                  gpointer      user_data)
 {
    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
+    GList *head;

-    for (head = priv->children; head; head = g_slist_next (head))
+    for (head = priv->head; head; head = g_list_next (head))
        (*callback) (EEK_ELEMENT(head->data), user_data);
 }

@ -97,9 +107,9 @@ eek_container_real_find (EekContainer *self,
                         gpointer user_data)
 {
    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GSList *head;
+    GList *head;

-    head = g_slist_find_custom (priv->children, user_data, (GCompareFunc)func);
+    head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
    if (head)
        return head->data;
    return NULL;
@ -109,26 +119,16 @@ static void
 eek_container_dispose (GObject *object)
 {
    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
-    GSList *head;
+    GList *head;

-    for (head = priv->children; head; head = g_slist_next (head)) {
-        if (head->data) {
-            g_object_unref (head->data);
-            head->data = NULL;
-        }
+    for (head = priv->head; head; head = priv->head) {
+        g_object_unref (head->data);
+        priv->head = g_list_next (head);
+        g_list_free1 (head);
    }
    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)
 {
@ -142,7 +142,10 @@ eek_container_class_init (EekContainerClass *klass)
    klass->foreach_child = eek_container_real_foreach_child;
    klass->find = eek_container_real_find;

-    gobject_class->finalize = eek_container_finalize;
+    /* signals */
+    klass->child_added = NULL;
+    klass->child_removed = NULL;
+
    gobject_class->dispose = eek_container_dispose;

    /**
@ -154,7 +157,7 @@ eek_container_class_init (EekContainerClass *klass)
     * added to @container.
     */
    signals[CHILD_ADDED] =
-        g_signal_new ("child-added",
+        g_signal_new (I_("child-added"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(EekContainerClass, child_added),
@ -172,7 +175,7 @@ eek_container_class_init (EekContainerClass *klass)
     * removed from @container.
     */
    signals[CHILD_REMOVED] =
-        g_signal_new ("child-removed",
+        g_signal_new (I_("child-removed"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(EekContainerClass, child_removed),
@ -186,16 +189,13 @@ eek_container_class_init (EekContainerClass *klass)
 static void
 eek_container_init (EekContainer *self)
 {
-    EekContainerPrivate *priv;
-
-    priv = self->priv = EEK_CONTAINER_GET_PRIVATE(self);
-    priv->children = NULL;
+    self->priv = EEK_CONTAINER_GET_PRIVATE(self);
 }

 /**
 * eek_container_foreach_child:
 * @container: an #EekContainer
- * @callback: an #EekCallback
+ * @callback: (scope call): an #EekCallback
 * @user_data: additional data passed to @callback
 *
 * Enumerate children of @container and run @callback with each child.
@ -231,40 +231,10 @@ eek_container_find (EekContainer  *container,
                                                     user_data);
 }

-struct _FbpData
+void
+eek_container_add_child (EekContainer *container, EekElement *element)
 {
-    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);
+    g_return_if_fail (EEK_IS_CONTAINER(container));
+    g_return_if_fail (EEK_IS_ELEMENT(element));
+    return EEK_CONTAINER_GET_CLASS(container)->add_child (container, element);
 }
--- a/eek/eek-container.h
+++ b/eek/eek-container.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
@ -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_CONTAINER_H
 #define EEK_CONTAINER_H 1

@ -34,6 +39,14 @@ G_BEGIN_DECLS
 typedef struct _EekContainerClass EekContainerClass;
 typedef struct _EekContainerPrivate EekContainerPrivate;

+/**
+ * EekCallback:
+ * @element: an #EekElement
+ * @user_data: user-supplied data
+ *
+ * The type of the callback function used for iterating over the
+ * children of a container, see eek_container_foreach_child().
+ */
 typedef void (*EekCallback) (EekElement *element, gpointer user_data);
 typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);

@ -57,42 +70,40 @@ struct _EekContainerClass
    /*< private >*/
    EekElementClass parent_class;

-    void        (* add_child)        (EekContainer  *self,
-                                      EekElement    *element);
+    void        (* add_child)      (EekContainer      *self,
+                                    EekElement        *element);

-    void        (* remove_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);
+    void        (* foreach_child)  (EekContainer      *self,
+                                    EekCallback        callback,
+                                    gpointer           user_data);
+    EekElement *(* find)           (EekContainer      *self,
+                                    EekCompareFunc     func,
+                                    gpointer           data);

    /* signals */
-    void        (* child_added)      (EekContainer  *self,
-                                      EekElement    *element);
-    void        (* child_removed)    (EekContainer  *self,
-                                      EekElement    *element);
-
+    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;
+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);
+void        eek_container_foreach_child (EekContainer  *container,
+                                         EekCallback    callback,
+                                         gpointer       user_data);
+EekElement *eek_container_find          (EekContainer  *container,
+                                         EekCompareFunc func,
+                                         gpointer       user_data);
+void        eek_container_add_child     (EekContainer  *container,
+                                         EekElement    *element);

 G_END_DECLS
 #endif  /* EEK_CONTAINER_H */
--- a/eek/eek-drawing.c
+++ b/eek/eek-drawing.c
@ -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);
-}
--- a/eek/eek-drawing.h
+++ b/eek/eek-drawing.h
@ -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 */
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -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,23 +26,33 @@
 * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
 */

-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */

+#include <string.h>
+
 #include "eek-element.h"
 #include "eek-container.h"
+#include "eek-marshalers.h"

 enum {
    PROP_0,
    PROP_NAME,
    PROP_BOUNDS,
+    PROP_GROUP,
+    PROP_LEVEL,
    PROP_LAST
 };

-G_DEFINE_ABSTRACT_TYPE (EekElement, eek_element, G_TYPE_INITIALLY_UNOWNED);
+enum {
+    SYMBOL_INDEX_CHANGED,
+    LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+G_DEFINE_ABSTRACT_TYPE (EekElement, eek_element, G_TYPE_OBJECT);

 #define EEK_ELEMENT_GET_PRIVATE(obj)                                  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_ELEMENT, EekElementPrivate))
@ -53,73 +63,16 @@ struct _EekElementPrivate
    gchar *name;
    EekBounds bounds;
    EekElement *parent;
+    gint group;
+    gint level;
 };

 static void
-eek_element_real_set_parent (EekElement *self,
-                             EekElement *parent)
+eek_element_real_symbol_index_changed (EekElement *self,
+                                       gint        group,
+                                       gint        level)
 {
-    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_debug ("symbol-index-changed");
 }

 static void
@ -128,6 +81,7 @@ 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,16 +90,21 @@ 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));
+        eek_element_set_name (element,
+                              g_value_dup_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;
+    case PROP_GROUP:
+        eek_element_set_group (element, g_value_get_int (value));
+        break;
+    case PROP_LEVEL:
+        eek_element_set_level (element, g_value_get_int (value));
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -158,17 +117,23 @@ 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)));
+        g_value_set_string (value, eek_element_get_name (element));
        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;
+    case PROP_GROUP:
+        g_value_set_int (value, eek_element_get_group (element));
+        break;
+    case PROP_LEVEL:
+        g_value_set_int (value, eek_element_get_level (element));
+        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -184,12 +149,8 @@ eek_element_class_init (EekElementClass *klass)
    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 */
+    klass->symbol_index_changed = eek_element_real_symbol_index_changed;

    gobject_class->set_property = eek_element_set_property;
    gobject_class->get_property = eek_element_get_property;
@ -222,6 +183,56 @@ eek_element_class_init (EekElementClass *klass)
    g_object_class_install_property (gobject_class,
                                     PROP_BOUNDS,
                                     pspec);
+
+    /**
+     * EekElement:group:
+     *
+     * The group value of the symbol index of #EekElement.
+     */
+    pspec = g_param_spec_int ("group",
+                              "Group",
+                              "Group value of the symbol index",
+                              -1, G_MAXINT, -1,
+                              G_PARAM_READWRITE);
+    g_object_class_install_property (gobject_class,
+                                     PROP_GROUP,
+                                     pspec);
+
+    /**
+     * EekElement:level:
+     *
+     * The level value of the symbol index of #EekElement.
+     */
+    pspec = g_param_spec_int ("level",
+                              "Level",
+                              "Level value of the symbol index",
+                              -1, G_MAXINT, -1,
+                              G_PARAM_READWRITE);
+    g_object_class_install_property (gobject_class,
+                                     PROP_LEVEL,
+                                     pspec);
+
+    /**
+     * EekElement::symbol-index-changed:
+     * @element: an #EekElement
+     * @group: row index of the symbol matrix of keys on @element
+     * @level: column index of the symbol matrix of keys on @element
+     *
+     * The ::symbol-index-changed signal is emitted each time the
+     * global configuration of group/level index changes.
+     */
+    signals[SYMBOL_INDEX_CHANGED] =
+        g_signal_new (I_("symbol-index-changed"),
+                      G_TYPE_FROM_CLASS(gobject_class),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET(EekElementClass, symbol_index_changed),
+                      NULL,
+                      NULL,
+                      _eek_marshal_VOID__INT_INT,
+                      G_TYPE_NONE,
+                      2,
+                      G_TYPE_INT,
+                      G_TYPE_INT);
 }

 static void
@ -230,14 +241,14 @@ 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);
+    priv->group = -1;
+    priv->level = -1;
 }

 /**
 * eek_element_set_parent:
 * @element: an #EekElement
- * @parent: an #EekElement
+ * @parent: (allow-none): an #EekElement or %NULL
 *
 * Set the parent of @element to @parent.
 */
@ -246,8 +257,21 @@ 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);
+    g_return_if_fail (parent == NULL || EEK_IS_ELEMENT(parent));
+
+    if (element->priv->parent == parent)
+        return;
+
+    if (element->priv->parent != NULL) {
+        /* release self-reference acquired when setting parent */
+        g_object_unref (element);
+    }
+
+    if (parent != NULL) {
+        g_object_ref (element);
+    }
+
+    element->priv->parent = parent;
 }

 /**
@ -261,7 +285,7 @@ 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);
+    return element->priv->parent;
 }

 /**
@ -276,7 +300,8 @@ 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);
+    g_free (element->priv->name);
+    element->priv->name = g_strdup (name);
 }

 /**
@ -286,11 +311,11 @@ eek_element_set_name (EekElement  *element,
 * Get the name of @element.
 * Returns: the name of @element or NULL when the name is not set
 */
-G_CONST_RETURN gchar *
+const 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);
+    return element->priv->name;
 }

 /**
@ -307,13 +332,13 @@ 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);
+    memcpy (&element->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,7 +349,8 @@ 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);
+    memcpy (bounds, &element->priv->bounds, sizeof(EekBounds));
 }

 /**
@ -351,3 +377,174 @@ eek_element_get_absolute_position (EekElement *element,
    *x = ax;
    *y = ay;
 }
+
+/**
+ * eek_element_set_position:
+ * @element: an #EekElement
+ * @x: X coordinate of top left corner
+ * @y: Y coordinate of top left corner
+ *
+ * Set the relative position of @element.
+ */
+void
+eek_element_set_position (EekElement *element,
+                          gdouble     x,
+                          gdouble     y)
+{
+    EekBounds bounds;
+
+    eek_element_get_bounds (element, &bounds);
+    bounds.x = x;
+    bounds.y = y;
+    eek_element_set_bounds (element, &bounds);
+}
+
+/**
+ * eek_element_set_size:
+ * @element: an #EekElement
+ * @width: width of @element
+ * @height: height of @element
+ *
+ * Set the size of @element.
+ */
+void
+eek_element_set_size (EekElement  *element,
+                      gdouble      width,
+                      gdouble      height)
+{
+    EekBounds bounds;
+
+    eek_element_get_bounds (element, &bounds);
+    bounds.width = width;
+    bounds.height = height;
+    eek_element_set_bounds (element, &bounds);
+}
+
+/**
+ * eek_element_set_symbol_index:
+ * @element: an #EekElement
+ * @group: row index of the symbol matrix
+ * @level: column index of the symbol matrix
+ *
+ * Set the default index of the symbol matrices of @element.  The
+ * setting affects the child, if child does not have the index set, as
+ * well as this element.  To unset, pass -1 as group/level.
+ */
+void
+eek_element_set_symbol_index (EekElement *element,
+                              gint        group,
+                              gint        level)
+{
+    gboolean emit_signal;
+
+    g_return_if_fail (EEK_IS_ELEMENT(element));
+
+    emit_signal = group != eek_element_get_group (element) ||
+        level != eek_element_get_level (element);
+
+    eek_element_set_group (element, group);
+    eek_element_set_level (element, level);
+
+    if (emit_signal)
+        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0, group, level);
+}
+
+/**
+ * eek_element_get_symbol_index:
+ * @element: an #EekElement
+ * @group: a pointer where the group value of the symbol index will be stored
+ * @level: a pointer where the level value of the symbol index will be stored
+ *
+ * Get the default index of the symbol matrices of @element.
+ * If the index is not set, -1 will be returned.
+ */
+void
+eek_element_get_symbol_index (EekElement *element,
+                              gint       *group,
+                              gint       *level)
+{
+    g_return_if_fail (EEK_IS_ELEMENT(element));
+    g_return_if_fail (group != NULL || level != NULL);
+    if (group != NULL)
+        *group = eek_element_get_group (element);
+    if (level != NULL)
+        *level = eek_element_get_level (element);
+}
+
+/**
+ * eek_element_set_group:
+ * @element: an #EekElement
+ * @group: group index of @element
+ *
+ * Set the group value of the default symbol index of @element.  To
+ * unset, pass -1 as @group.
+ *
+ * See also: eek_element_set_symbol_index()
+ */
+void
+eek_element_set_group (EekElement *element,
+                       gint        group)
+{
+    g_return_if_fail (EEK_IS_ELEMENT(element));
+    if (element->priv->group != group) {
+        element->priv->group = group;
+        g_object_notify (G_OBJECT(element), "group");
+        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
+                       group, element->priv->level);
+    }
+}
+
+/**
+ * eek_element_set_level:
+ * @element: an #EekElement
+ * @level: level index of @element
+ *
+ * Set the level value of the default symbol index of @element.  To
+ * unset, pass -1 as @level.
+ *
+ * See also: eek_element_set_symbol_index()
+ */
+void
+eek_element_set_level (EekElement *element,
+                       gint        level)
+{
+    g_return_if_fail (EEK_IS_ELEMENT(element));
+    if (element->priv->level != level) {
+        element->priv->level = level;
+        g_object_notify (G_OBJECT(element), "level");
+        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
+                       element->priv->group, level);
+    }
+}
+
+/**
+ * eek_element_get_group:
+ * @element: an #EekElement
+ *
+ * Return the group value of the default symbol index of @element.
+ * If the value is not set, -1 will be returned.
+ *
+ * See also: eek_element_get_symbol_index()
+ */
+gint
+eek_element_get_group (EekElement *element)
+{
+    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
+    return element->priv->group;
+}
+
+/**
+ * eek_element_get_level:
+ * @element: an #EekElement
+ *
+ * Return the level value of the default symbol index of @element.
+ * If the value is not set, -1 will be returned.
+ *
+ * See also: eek_element_get_symbol_index()
+ */
+gint
+eek_element_get_level (EekElement *element)
+{
+    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
+    return element->priv->level;
+}
--- a/eek/eek-element.h
+++ b/eek/eek-element.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
@ -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

@ -37,7 +42,7 @@ typedef struct _EekElementPrivate EekElementPrivate;
 struct _EekElement
 {
    /*< private >*/
-    GInitiallyUnowned parent;
+    GObject parent;

    EekElementPrivate *priv;
 };
@ -45,45 +50,53 @@ struct _EekElement
 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);
+    GObjectClass parent_class;

-    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];
+    /* signals */
+    void                  (* symbol_index_changed) (EekElement  *self,
+                                                    gint         group,
+                                                    gint         level);
 };

-GType                 eek_element_get_type              (void) G_GNUC_CONST;
+GType        eek_element_get_type              (void) G_GNUC_CONST;

-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);
+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);

-G_CONST_RETURN gchar *eek_element_get_name              (EekElement  *element);
+const 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_bounds            (EekElement  *element,
+                                                EekBounds   *bounds);

-void                  eek_element_get_absolute_position (EekElement  *element,
-                                                         gdouble     *x,
-                                                         gdouble     *y);
+void         eek_element_set_position          (EekElement  *element,
+                                                gdouble      x,
+                                                gdouble      y);
+void         eek_element_set_size              (EekElement  *element,
+                                                gdouble      width,
+                                                gdouble      height);
+
+void         eek_element_get_absolute_position (EekElement  *element,
+                                                gdouble     *x,
+                                                gdouble     *y);
+
+void         eek_element_set_symbol_index      (EekElement  *element,
+                                                gint         group,
+                                                gint         level);
+void         eek_element_get_symbol_index      (EekElement  *element,
+                                                gint        *group,
+                                                gint        *level);
+void         eek_element_set_group             (EekElement  *element,
+                                                gint         group);
+void         eek_element_set_level             (EekElement  *element,
+                                                gint         level);
+gint         eek_element_get_group             (EekElement  *element);
+gint         eek_element_get_level             (EekElement  *element);

 G_END_DECLS
 #endif  /* EEK_ELEMENT_H */
--- a/eek/eek-enumtypes.c.template
+++ b/eek/eek-enumtypes.c.template
@ -0,0 +1,36 @@
+/*** BEGIN file-header ***/
+#include "eek.h"
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/
--- a/eek/eek-enumtypes.h.template
+++ b/eek/eek-enumtypes.h.template
@ -0,0 +1,29 @@
+/*** BEGIN file-header ***/
+
+#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
+#error "Only <eek/eek.h> can be included directly."
+#endif
+
+#ifndef __EEK_ENUMTYPES_H__
+#define __EEK_ENUMTYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __EEK_ENUMTYPES_H__ */
+/*** END file-tail ***/
--- a/eek/eek-gtk-0.90.pc.in
+++ b/eek/eek-gtk-0.90.pc.in
@ -1,5 +1,5 @@
-# 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
@ -23,8 +23,8 @@ includedir=@includedir@

 Name: libeek-gtk
 Description: A Library to Create Keyboard-like UI (GTK Support)
-URL: http://github.com/ueno/eekboard
+URL: http://fedorahosted.org/eekboard/
 Version: @VERSION@
-Libs: -L${libdir} -leek -leek-gtk
-Libs.private: @GOBJECT2_LIBS@ @GTK2_LIBS@
+Requires: eek-@EEK_API_VERSION@ gtk+-@GTK_API_VERSION@
+Libs: -L${libdir} -leek-gtk
 Cflags: -I${includedir}/eek-@EEK_API_VERSION@
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.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
@ -17,10 +17,17 @@
 * 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"

 G_BEGIN_DECLS
@ -38,7 +45,9 @@ typedef struct _EekGtkKeyboardPrivate EekGtkKeyboardPrivate;
 struct _EekGtkKeyboard
 {
    /*< private >*/
-    EekKeyboard parent;
+    GtkDrawingArea parent;
+
+    GdkEventSequence *sequence; // unowned reference

    EekGtkKeyboardPrivate *priv;
 };
@ -46,16 +55,17 @@ struct _EekGtkKeyboard
 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);
+GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
+GtkWidget *eek_gtk_keyboard_new       (EekKeyboard    *keyboard);
+void       eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
+                                       EekTheme       *theme);

 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@ -0,0 +1,104 @@
+/* 
+ * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2011 Red Hat, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
+#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "eek-gtk-renderer.h"
+#include "eek-key.h"
+
+G_DEFINE_TYPE (EekGtkRenderer, eek_gtk_renderer, EEK_TYPE_RENDERER);
+
+static cairo_surface_t *
+pixbuf_to_cairo_surface (GdkPixbuf *pixbuf)
+{
+  cairo_surface_t *dummy_surface;
+  cairo_pattern_t *pattern;
+  cairo_surface_t *surface;
+  cairo_t *cr;
+
+  dummy_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1);
+
+  cr = cairo_create (dummy_surface);
+  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+  pattern = cairo_get_source (cr);
+  cairo_pattern_get_surface (pattern, &surface);
+  cairo_surface_reference (surface);
+  cairo_destroy (cr);
+  cairo_surface_destroy (dummy_surface);
+
+  return surface;
+}
+
+static cairo_surface_t *
+eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
+                                        const gchar *icon_name,
+                                        gint size)
+{
+    GdkPixbuf *pixbuf;
+    GError *error;
+    cairo_surface_t *surface;
+
+    error = NULL;
+    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                       icon_name,
+                                       size,
+                                       0,
+                                       &error);
+    if (pixbuf == NULL) {
+        g_warning ("can't get icon pixbuf for %s: %s",
+                   icon_name,
+                   error->message);
+        g_error_free (error);
+        return NULL;
+    }
+
+    surface = pixbuf_to_cairo_surface (pixbuf);
+    g_object_unref (pixbuf);
+    return surface;
+}
+
+static void
+eek_gtk_renderer_class_init (EekGtkRendererClass *klass)
+{
+    EekRendererClass *renderer_class = EEK_RENDERER_CLASS (klass);
+
+    renderer_class->get_icon_surface = eek_gtk_renderer_real_get_icon_surface;
+}
+
+static void
+eek_gtk_renderer_init (EekGtkRenderer *self)
+{
+}
+
+EekRenderer *
+eek_gtk_renderer_new (EekKeyboard  *keyboard,
+                      PangoContext *pcontext,
+                      GtkWidget    *widget)
+{
+    return g_object_new (EEK_TYPE_GTK_RENDERER,
+                         "keyboard", keyboard,
+                         "pango-context", pcontext,
+                         NULL);
+}
--- a/eek/eek-gtk-renderer.h
+++ b/eek/eek-gtk-renderer.h
@ -0,0 +1,61 @@
+/* 
+ * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef EEK_GTK_RENDERER_H
+#define EEK_GTK_RENDERER_H 1
+
+#include <gtk/gtk.h>
+#include "eek-renderer.h"
+
+G_BEGIN_DECLS
+
+#define EEK_TYPE_GTK_RENDERER (eek_gtk_renderer_get_type())
+#define EEK_GTK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_RENDERER, EekGtkRenderer))
+#define EEK_GTK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_RENDERER, EekGtkRendererClass))
+#define EEK_IS_GTK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_RENDERER))
+#define EEK_IS_GTK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_RENDERER))
+#define EEK_GTK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_RENDERER, EekGtkRendererClass))
+
+typedef struct _EekGtkRenderer EekGtkRenderer;
+typedef struct _EekGtkRendererClass EekGtkRendererClass;
+typedef struct _EekGtkRendererPrivate EekGtkRendererPrivate;
+
+struct _EekGtkRenderer {
+    EekRenderer parent;
+
+    EekGtkRendererPrivate *priv;
+};
+
+struct _EekGtkRendererClass
+{
+    EekRendererClass parent_class;
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[24];
+};
+
+GType        eek_gtk_renderer_get_type (void) G_GNUC_CONST;
+EekRenderer *eek_gtk_renderer_new      (EekKeyboard  *keyboard,
+                                        PangoContext *pcontext,
+                                        GtkWidget *widget);
+
+G_END_DECLS
+#endif  /* EEK_GTK_RENDERER_H */
--- a/eek/eek-gtk.h
+++ b/eek/eek-gtk.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
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@ -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
@ -25,33 +25,30 @@
 * The #EekKeyClass class represents a key.
 */

-#include <string.h>
-#define DEBUG 0
-#if DEBUG
-#include <stdio.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
+
+#include <string.h>
+
 #include "eek-key.h"
-#include "eek-keysym.h"
+#include "eek-section.h"
+#include "eek-keyboard.h"
+#include "eek-symbol.h"

 enum {
    PROP_0,
    PROP_KEYCODE,
-    PROP_KEYSYMS,
+    PROP_SYMBOL_MATRIX,
    PROP_COLUMN,
    PROP_ROW,
-    PROP_OUTLINE,
-    PROP_GROUP,
-    PROP_LEVEL,
+    PROP_OREF,
    PROP_LAST
 };

 enum {
-    PRESSED,
-    RELEASED,
+    LOCKED,
+    UNLOCKED,
    LAST_SIGNAL
 };

@ -66,182 +63,41 @@ G_DEFINE_TYPE (EekKey, eek_key, EEK_TYPE_ELEMENT);
 struct _EekKeyPrivate
 {
    guint keycode;
-    EekKeysymMatrix keysyms;
+    EekSymbolMatrix *symbol_matrix;
    gint column;
    gint row;
-    EekOutline *outline;
-    gint group;
-    gint level;
+    gulong oref; // UI outline reference
+    gboolean is_pressed;
+    gboolean is_locked;
 };

 static void
-eek_key_real_set_keycode (EekKey *self, guint keycode)
+eek_key_real_locked (EekKey *self)
 {
    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    priv->keycode = keycode;
-}
-
-static guint
-eek_key_real_get_keycode (EekKey *self)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    return priv->keycode;
-}
-
-static void
-eek_key_real_set_keysyms (EekKey *self,
-                          guint  *keysyms,
-                          gint    num_groups,
-                          gint    num_levels)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    gint num_keysyms = num_groups * num_levels;
-    
-    if (num_keysyms > 0) {
-        priv->keysyms.data =
-            g_slice_alloc (num_keysyms * sizeof(guint));
-        memcpy (priv->keysyms.data, keysyms,
-                num_keysyms * sizeof(guint));
-    }
-    priv->keysyms.num_groups = num_groups;
-    priv->keysyms.num_levels = num_levels;

+    priv->is_locked = TRUE;
 #if DEBUG
-    {
-        const gchar *name;
-        gint i;
-
-        name = eek_element_get_name (EEK_ELEMENT(self));
-        fprintf (stderr, "%s: ", name);
-        for (i = 0; i < priv->keysyms.num_groups * priv->keysyms.num_levels; i++)
-            fprintf (stderr, "\"%s\" ", eek_keysym_to_string (priv->keysyms.data[i]));
-        fprintf (stderr, "\n");
-    }
+    g_debug ("locked %X", eek_key_get_keycode (self));
 #endif
 }

 static void
-eek_key_real_get_keysyms (EekKey *self,
-                          guint **keysyms,
-                          gint   *num_groups,
-                          gint   *num_levels)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    gint num_keysyms = priv->keysyms.num_groups * priv->keysyms.num_levels;
-
-    if (num_groups)
-        *num_groups = priv->keysyms.num_groups;
-    if (num_levels)
-        *num_levels = priv->keysyms.num_levels;
-    if (keysyms && num_keysyms > 0) {
-        *keysyms = g_slice_alloc (num_keysyms * sizeof(guint));
-        memcpy (*keysyms, priv->keysyms.data, num_keysyms * sizeof(guint));
-    }
-}
-
-static guint
-eek_key_real_get_keysym (EekKey *self)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    gint num_keysyms = priv->keysyms.num_groups * priv->keysyms.num_levels;
-
-    if (num_keysyms == 0)
-        return EEK_INVALID_KEYSYM;
-    return priv->keysyms.data[priv->group * priv->keysyms.num_levels +
-                              priv->level];
-}
-
-static void
-eek_key_real_set_index (EekKey *self,
-                        gint    column,
-                        gint    row)
+eek_key_real_unlocked (EekKey *self)
 {
    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);

-    g_return_if_fail (0 <= column);
-    g_return_if_fail (0 <= row);
-    priv->column = column;
-    priv->row = row;
-}
-
-static void
-eek_key_real_get_index (EekKey *self,
-                        gint   *column,
-                        gint   *row)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-
-    if (column)
-        *column = priv->column;
-    if (row)
-        *row = priv->row;
-}
-
-static void
-eek_key_real_set_outline (EekKey *self, EekOutline *outline)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    priv->outline = outline;
-}
-
-static EekOutline *
-eek_key_real_get_outline (EekKey *self)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-    return priv->outline;
-}
-
-static void
-eek_key_real_set_keysym_index (EekKey *self,
-                               gint    group,
-                               gint    level)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-
-    g_return_if_fail (0 <= group);
-    if (group >= priv->keysyms.num_groups)
-        group = 0;
-    g_return_if_fail (0 <= level);
-    if (level >= priv->keysyms.num_levels)
-        level = 0;
-    priv->group = group;
-    priv->level = level;
-}
-
-static void
-eek_key_real_get_keysym_index (EekKey *self,
-                                      gint   *group,
-                                      gint   *level)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-
-    g_return_if_fail (group);
-    g_return_if_fail (level);
-    if (group)
-        *group = priv->group;
-    if (level)
-        *level = priv->level;
-}
-
-static void
-eek_key_real_pressed (EekKey *key)
-{
-    g_debug ("pressed %X", eek_key_get_keycode (key));
-}
-
-static void
-eek_key_real_released (EekKey *key)
-{
-    g_debug ("released %X", eek_key_get_keycode (key));
+    priv->is_locked = FALSE;
+#if DEBUG
+    g_debug ("unlocked %X", eek_key_get_keycode (self));
+#endif
 }

 static void
 eek_key_finalize (GObject *object)
 {
    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(object);
-    gint num_keysyms = priv->keysyms.num_groups * priv->keysyms.num_levels;
-
-    g_slice_free1 (num_keysyms * sizeof (guint), priv->keysyms.data);
+    eek_symbol_matrix_free (priv->symbol_matrix);
    G_OBJECT_CLASS (eek_key_parent_class)->finalize (object);
 }

@ -251,21 +107,16 @@ eek_key_set_property (GObject      *object,
                      const GValue *value,
                      GParamSpec   *pspec)
 {
-    EekKeysymMatrix *matrix;
+    EekSymbolMatrix *matrix;
    gint column, row;
-    gint group, level;

-    g_return_if_fail (EEK_IS_KEY(object));
    switch (prop_id) {
    case PROP_KEYCODE:
        eek_key_set_keycode (EEK_KEY(object), g_value_get_uint (value));
        break;
-    case PROP_KEYSYMS:
+    case PROP_SYMBOL_MATRIX:
        matrix = g_value_get_boxed (value);
-        eek_key_set_keysyms (EEK_KEY(object),
-                             matrix->data,
-                             matrix->num_groups,
-                             matrix->num_levels);
+        eek_key_set_symbol_matrix (EEK_KEY(object), matrix);
        break;
    case PROP_COLUMN:
        eek_key_get_index (EEK_KEY(object), &column, &row);
@ -275,23 +126,11 @@ eek_key_set_property (GObject      *object,
        eek_key_get_index (EEK_KEY(object), &column, &row);
        eek_key_set_index (EEK_KEY(object), column, g_value_get_int (value));
        break;
-    case PROP_OUTLINE:
-        eek_key_set_outline (EEK_KEY(object), g_value_get_pointer (value));
-        break;
-    case PROP_GROUP:
-        eek_key_get_keysym_index (EEK_KEY(object), &group, &level);
-        eek_key_set_keysym_index (EEK_KEY(object), g_value_get_int (value),
-                                  level);
-        break;
-    case PROP_LEVEL:
-        eek_key_get_keysym_index (EEK_KEY(object), &group, &level);
-        eek_key_set_keysym_index (EEK_KEY(object), group,
-                                  g_value_get_int (value));
+    case PROP_OREF:
+        eek_key_set_oref (EEK_KEY(object), g_value_get_uint (value));
        break;
    default:
-        g_object_set_property (object,
-                               g_param_spec_get_name (pspec),
-                               value);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
@ -302,19 +141,15 @@ eek_key_get_property (GObject    *object,
                      GValue     *value,
                      GParamSpec *pspec)
 {
-    EekKeysymMatrix matrix;
    gint column, row;
-    gint group, level;

-    g_return_if_fail (EEK_IS_KEY(object));
    switch (prop_id) {
    case PROP_KEYCODE:
        g_value_set_uint (value, eek_key_get_keycode (EEK_KEY(object)));
        break;
-    case PROP_KEYSYMS:
-        eek_key_get_keysyms (EEK_KEY(object), &matrix.data, &matrix.num_groups,
-                             &matrix.num_levels);
-        g_value_set_boxed (value, &matrix);
+    case PROP_SYMBOL_MATRIX:
+        g_value_set_boxed (value,
+                           eek_key_get_symbol_matrix (EEK_KEY(object)));
        break;
    case PROP_COLUMN:
        eek_key_get_index (EEK_KEY(object), &column, &row);
@ -324,21 +159,11 @@ eek_key_get_property (GObject    *object,
        eek_key_get_index (EEK_KEY(object), &column, &row);
        g_value_set_int (value, row);
        break;
-    case PROP_OUTLINE:
-        g_value_set_pointer (value, eek_key_get_outline (EEK_KEY(object)));
-        break;
-    case PROP_GROUP:
-        eek_key_get_keysym_index (EEK_KEY(object), &group, &level);
-        g_value_set_int (value, group);
-        break;
-    case PROP_LEVEL:
-        eek_key_get_keysym_index (EEK_KEY(object), &group, &level);
-        g_value_set_int (value, level);
+    case PROP_OREF:
+        g_value_set_uint (value, eek_key_get_oref (EEK_KEY(object)));
        break;
    default:
-        g_object_get_property (object,
-                               g_param_spec_get_name (pspec),
-                               value);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
    }
 }
@ -352,25 +177,13 @@ eek_key_class_init (EekKeyClass *klass)
    g_type_class_add_private (gobject_class,
                              sizeof (EekKeyPrivate));

-    klass->get_keycode = eek_key_real_get_keycode;
-    klass->set_keycode = eek_key_real_set_keycode;
-    klass->set_keysyms = eek_key_real_set_keysyms;
-    klass->get_keysyms = eek_key_real_get_keysyms;
-    klass->get_keysym = eek_key_real_get_keysym;
-    klass->set_index = eek_key_real_set_index;
-    klass->get_index = eek_key_real_get_index;
-    klass->set_outline = eek_key_real_set_outline;
-    klass->get_outline = eek_key_real_get_outline;
-    klass->set_keysym_index = eek_key_real_set_keysym_index;
-    klass->get_keysym_index = eek_key_real_get_keysym_index;
-
    gobject_class->set_property = eek_key_set_property;
    gobject_class->get_property = eek_key_get_property;
    gobject_class->finalize     = eek_key_finalize;

    /* signals */
-    klass->pressed = eek_key_real_pressed;
-    klass->released = eek_key_real_released;
+    klass->locked = eek_key_real_locked;
+    klass->unlocked = eek_key_real_unlocked;

    /**
     * EekKey:keycode:
@ -385,16 +198,16 @@ eek_key_class_init (EekKeyClass *klass)
    g_object_class_install_property (gobject_class, PROP_KEYCODE, pspec);

    /**
-     * EekKey:keysyms:
+     * EekKey:symbol-matrix:
     *
     * The symbol matrix of #EekKey.
     */
-    pspec = g_param_spec_boxed ("keysyms",
-                                "Keysyms",
+    pspec = g_param_spec_boxed ("symbol-matrix",
+                                "Symbol matrix",
                                "Symbol matrix of the key",
-                                EEK_TYPE_KEYSYM_MATRIX,
+                                EEK_TYPE_SYMBOL_MATRIX,
                                G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_KEYSYMS, pspec);
+    g_object_class_install_property (gobject_class, PROP_SYMBOL_MATRIX, pspec);

    /**
     * EekKey:column:
@ -421,72 +234,48 @@ eek_key_class_init (EekKeyClass *klass)
    g_object_class_install_property (gobject_class, PROP_ROW, pspec);

    /**
-     * EekKey:outline:
+     * EekKey:oref:
     *
-     * The pointer to the outline shape of #EekKey.
+     * The outline id of #EekKey.
     */
-    /* Use pointer instead of boxed to avoid copy, since we can
-       assume that only a few outline shapes are used in a whole
-       keyboard (unlike keysyms and bounds). */
-    pspec = g_param_spec_pointer ("outline",
-                                  "Outline",
-                                  "Pointer to outline shape of the key",
-                                  G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_OUTLINE, pspec);
+    pspec = g_param_spec_ulong ("oref",
+                                "Oref",
+                                "Outline id of the key",
+                                0, G_MAXULONG, 0,
+                                G_PARAM_READWRITE);
+    g_object_class_install_property (gobject_class, PROP_OREF, pspec);

    /**
-     * EekKey:group:
-     *
-     * The column index of #EekKey in the symbol matrix #EekKey:keysyms.
-     */
-    pspec = g_param_spec_int ("group",
-                              "Group",
-                              "Current group of the key",
-                              0, 64, 0,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_GROUP, pspec);
-
-    /**
-     * EekKey:level:
-     *
-     * The row index of #EekKey in the symbol matrix #EekKey:keysyms.
-     */
-    pspec = g_param_spec_int ("level",
-                              "Level",
-                              "Current level of the key",
-                              0, 3, 0,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_LEVEL, pspec);
-
-    /**
-     * EekKey::pressed:
+     * EekKey::locked:
     * @key: an #EekKey
     *
-     * The ::pressed signal is emitted each time @key is shifted to
-     * the pressed state.
+     * The ::locked signal is emitted each time @key is shifted to
+     * the locked state.  The class handler runs before signal
+     * handlers to allow signal handlers to read the status of @key
+     * with eek_key_is_locked().
     */
-    signals[PRESSED] =
-        g_signal_new ("pressed",
+    signals[LOCKED] =
+        g_signal_new (I_("locked"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekKeyClass, pressed),
+                      G_STRUCT_OFFSET(EekKeyClass, locked),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE, 0);

    /**
-     * EekKey::released:
+     * EekKey::unlocked:
     * @key: an #EekKey
     *
-     * The ::released signal is emitted each time @key is shifted to
-     * the released state.
+     * The ::unlocked signal is emitted each time @key is shifted to
+     * the unlocked state.
     */
-   signals[RELEASED] =
-        g_signal_new ("released",
+   signals[UNLOCKED] =
+        g_signal_new (I_("unlocked"),
                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekKeyClass, released),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET(EekKeyClass, unlocked),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
@ -499,11 +288,7 @@ eek_key_init (EekKey *self)
    EekKeyPrivate *priv;

    priv = self->priv = EEK_KEY_GET_PRIVATE(self);
-    priv->keycode = 0;
-    memset (&priv->keysyms, 0, sizeof priv->keysyms);
-    priv->column = priv->row = 0;
-    priv->outline = NULL;
-    priv->group = priv->level = 0;
+    priv->symbol_matrix = eek_symbol_matrix_new (0, 0);
 }

 /**
@ -511,14 +296,18 @@ eek_key_init (EekKey *self)
 * @key: an #EekKey
 * @keycode: keycode
 *
- * Set keycode of @key to @keycode.
+ * Set the keycode of @key to @keycode.  Since typically the keycode
+ * value is used to find a key in a keyboard by calling
+ * eek_keyboard_find_key_by_keycode, it is not necessarily the same as
+ * the X keycode but it should be unique in the keyboard @key belongs
+ * to.
 */
 void
 eek_key_set_keycode (EekKey *key,
                     guint   keycode)
 {
    g_return_if_fail (EEK_IS_KEY (key));
-    EEK_KEY_GET_CLASS(key)->set_keycode (key, keycode);
+    key->priv->keycode = keycode;
 }

 /**
@ -532,63 +321,158 @@ guint
 eek_key_get_keycode (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY (key), EEK_INVALID_KEYCODE);
-    return EEK_KEY_GET_CLASS(key)->get_keycode (key);
+    return key->priv->keycode;
 }

 /**
- * eek_key_set_keysyms:
+ * eek_key_set_symbol_matrix:
 * @key: an #EekKey
- * @keysyms: symbol matrix of @key
- * @num_groups: number of groups (rows) of @keysyms
- * @num_levels: number of levels (columns) of @keysyms
+ * @matrix: an #EekSymbolMatrix
 *
- * Set the symbol matrix of @key to @keysyms.  The length of @keysyms
- * is @num_groups * @num_levels.
+ * Set the symbol matrix of @key to @matrix.
 */
 void
-eek_key_set_keysyms (EekKey *key,
-                     guint  *keysyms,
-                     gint    num_groups,
-                     gint    num_levels)
+eek_key_set_symbol_matrix (EekKey          *key,
+                           EekSymbolMatrix *matrix)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->set_keysyms (key, keysyms, num_groups, num_levels);
+
+    eek_symbol_matrix_free (key->priv->symbol_matrix);
+    key->priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
 }

 /**
- * eek_key_get_keysyms:
+ * eek_key_get_symbol_matrix:
 * @key: an #EekKey
- * @keysyms: pointer where symbol matrix of @key will be stored
- * @num_groups: pointer where the number of groups (rows) of @keysyms
- * will be stored
- * @num_levels: pointer where the number of levels (columns) of
- * @keysyms will be stored
 *
- * Get the symbol matrix of @key.  If either @keysyms, @num_groups, or
- * @num_levels are NULL, this function does not try to get the value.
+ * Get the symbol matrix of @key.
+ * Returns: (transfer none): #EekSymbolMatrix or %NULL
 */
-void
-eek_key_get_keysyms (EekKey *key,
-                     guint **keysyms,
-                     gint   *num_groups,
-                     gint   *num_levels)
+EekSymbolMatrix *
+eek_key_get_symbol_matrix (EekKey *key)
 {
-    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->get_keysyms (key, keysyms, num_groups, num_levels);
+    g_return_val_if_fail (EEK_IS_KEY(key), NULL);
+    return key->priv->symbol_matrix;
 }

 /**
- * eek_key_get_keysym:
+ * eek_key_get_symbol:
 * @key: an #EekKey
 *
 * Get the current symbol of @key.
- * Returns: a symbol or %EEK_INVALID_KEYSYM on failure
+ * Return value: (transfer none): the current #EekSymbol or %NULL on failure
 */
-guint
-eek_key_get_keysym (EekKey *key)
+EekSymbol *
+eek_key_get_symbol (EekKey *key)
 {
-    g_return_val_if_fail (EEK_IS_KEY(key), EEK_INVALID_KEYSYM);
-    return EEK_KEY_GET_CLASS(key)->get_keysym (key);
+    return eek_key_get_symbol_with_fallback (key, 0, 0);
+}
+
+/**
+ * eek_key_get_symbol_with_fallback:
+ * @key: an #EekKey
+ * @fallback_group: fallback group index
+ * @fallback_level: fallback level index
+ *
+ * Get the current symbol of @key.
+ * Return value: (transfer none): the current #EekSymbol or %NULL on failure
+ */
+EekSymbol *
+eek_key_get_symbol_with_fallback (EekKey *key,
+                                  gint    fallback_group,
+                                  gint    fallback_level)
+{
+    gint group, level;
+
+    g_return_val_if_fail (EEK_IS_KEY (key), NULL);
+    g_return_val_if_fail (fallback_group >= 0, NULL);
+    g_return_val_if_fail (fallback_level >= 0, NULL);
+
+    eek_element_get_symbol_index (EEK_ELEMENT(key), &group, &level);
+
+    if (group < 0 || level < 0) {
+        EekElement *section;
+
+        section = eek_element_get_parent (EEK_ELEMENT(key));
+        g_return_val_if_fail (EEK_IS_SECTION (section), NULL);
+
+        if (group < 0)
+            group = eek_element_get_group (section);
+
+        if (level < 0)
+            level = eek_element_get_level (section);
+
+        if (group < 0 || level < 0) {
+            EekElement *keyboard;
+
+            keyboard = eek_element_get_parent (section);
+            g_return_val_if_fail (EEK_IS_KEYBOARD (keyboard), NULL);
+
+            if (group < 0)
+                group = eek_element_get_group (keyboard);
+            if (level < 0)
+                level = eek_element_get_level (keyboard);
+        }
+    }
+
+    return eek_key_get_symbol_at_index (key,
+                                        group,
+                                        level,
+                                        fallback_group,
+                                        fallback_level);
+}
+
+/**
+ * eek_key_get_symbol_at_index:
+ * @key: an #EekKey
+ * @group: group index of the symbol matrix
+ * @level: level index of the symbol matrix
+ * @fallback_group: fallback group index
+ * @fallback_level: fallback level index
+ *
+ * Get the symbol at (@group, @level) in the symbol matrix of @key.
+ * Return value: (transfer none): an #EekSymbol at (@group, @level), or %NULL
+ */
+EekSymbol *
+eek_key_get_symbol_at_index (EekKey *key,
+                             gint    group,
+                             gint    level,
+                             gint    fallback_group,
+                             gint    fallback_level)
+{
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(key);
+    gint num_symbols;
+
+    g_return_val_if_fail (fallback_group >= 0, NULL);
+    g_return_val_if_fail (fallback_level >= 0, NULL);
+
+    if (group < 0)
+        group = fallback_group;
+    if (level < 0)
+        level = fallback_level;
+
+    if (!priv->symbol_matrix)
+        return NULL;
+
+    num_symbols = priv->symbol_matrix->num_groups *
+        priv->symbol_matrix->num_levels;
+    if (num_symbols == 0)
+        return NULL;
+
+    if (group >= priv->symbol_matrix->num_groups) {
+        if (fallback_group < 0)
+            return NULL;
+        group = fallback_group;
+    }
+
+    if (level >= priv->symbol_matrix->num_levels) {
+        if (fallback_level < 0)
+            return NULL;
+        level = fallback_level;
+    }
+
+    return priv->symbol_matrix->data[group * priv->symbol_matrix->num_levels +
+                                     level];
 }

 /**
@ -597,8 +481,7 @@ eek_key_get_keysym (EekKey *key)
 * @column: column index of @key in #EekSection
 * @row: row index of @key in #EekSection
 *
- * Set the index of @key (i.e. logical location of @key in
- * #EekSection) to @column and @row.
+ * Set the location of @key in #EekSection with @column and @row.
 */
 void
 eek_key_set_index (EekKey *key,
@ -606,17 +489,26 @@ eek_key_set_index (EekKey *key,
                   gint    row)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->set_index (key, column, row);
+    g_return_if_fail (0 <= column);
+    g_return_if_fail (0 <= row);
+
+    if (key->priv->column != column) {
+        key->priv->column = column;
+        g_object_notify (G_OBJECT(key), "column");
+    }
+    if (key->priv->row != row) {
+        key->priv->row = row;
+        g_object_notify (G_OBJECT(key), "row");
+    }
 }

 /**
 * eek_key_get_index:
 * @key: an #EekKey
- * @column: pointer where the column index of @key in #EekSection will be stored
- * @row: pointer where the row index of @key in #EekSection will be stored
+ * @column: (allow-none): pointer where the column index of @key in #EekSection will be stored
+ * @row: (allow-none): pointer where the row index of @key in #EekSection will be stored
 *
- * Get the index of @key (i.e. logical location of @key in
- * #EekSection).
+ * Get the location of @key in #EekSection.
 */
 void
 eek_key_get_index (EekKey *key,
@ -624,70 +516,74 @@ eek_key_get_index (EekKey *key,
                   gint   *row)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->get_index (key, column, row);
+    g_return_if_fail (column != NULL || row != NULL);
+
+    if (column != NULL)
+        *column = key->priv->column;
+    if (row != NULL)
+        *row = key->priv->row;
 }

 /**
- * eek_key_set_outline:
+ * eek_key_set_oref:
 * @key: an #EekKey
- * @outline: outline of @key
+ * @oref: outline id of @key
 *
- * Set the outline shape of @key to @outline.
+ * Set the outline id of @key to @oref.
 */
 void
-eek_key_set_outline (EekKey     *key,
-                     EekOutline *outline)
+eek_key_set_oref (EekKey *key,
+                  guint   oref)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->set_outline (key, outline);
+    if (key->priv->oref != oref) {
+        key->priv->oref = oref;
+        g_object_notify (G_OBJECT(key), "oref");
+    }
 }

 /**
- * eek_key_get_outline:
+ * eek_key_get_oref:
 * @key: an #EekKey
 *
- * Get the outline shape of @key.
- * Returns: an #EekOutline pointer or NULL on failure
+ * Get the outline id of @key.
+ * Returns: unsigned integer
 */
-EekOutline *
-eek_key_get_outline (EekKey *key)
+guint
+eek_key_get_oref (EekKey *key)
 {
-    g_return_val_if_fail (EEK_IS_KEY (key), NULL);
-    return EEK_KEY_GET_CLASS(key)->get_outline (key);
+    g_return_val_if_fail (EEK_IS_KEY (key), 0);
+    return key->priv->oref;
 }

 /**
- * eek_key_set_keysym_index:
+ * eek_key_is_pressed:
 * @key: an #EekKey
- * @group: group (row) index of @key
- * @level: level (column) index of @key
 *
- * Set the current group and/or level index of @key in its symbol
- * matrix to @group and @level.
+ * Return %TRUE if key is marked as pressed.
 */
-void
-eek_key_set_keysym_index (EekKey *key,
-                          gint    group,
-                          gint    level)
+gboolean
+eek_key_is_pressed (EekKey *key)
 {
-    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->set_keysym_index (key, group, level);
+    g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
+    return key->priv->is_pressed;
 }

 /**
- * eek_key_get_keysym_index:
+ * eek_key_is_locked:
 * @key: an #EekKey
- * @group: pointer where group (row) index of @key will be stored
- * @level: pointer where level (column) index of @key will be stored
 *
- * Get the current group and/or level index of @key in its symbol
- * matrix.
+ * Return %TRUE if key is marked as locked.
 */
-void
-eek_key_get_keysym_index (EekKey *key,
-                          gint   *group,
-                          gint   *level)
+gboolean
+eek_key_is_locked (EekKey *key)
+{
+    g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
+    return key->priv->is_locked;
+}
+
+void eek_key_set_pressed(EekKey *key, gboolean value)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-    EEK_KEY_GET_CLASS(key)->get_keysym_index (key, group, level);
+    key->priv->is_pressed = value;
 }
--- a/eek/eek-key.h
+++ b/eek/eek-key.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
@ -17,12 +17,16 @@
 * 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_KEY_H
 #define EEK_KEY_H 1

-#include <glib-object.h>
 #include "eek-element.h"
-#include "eek-types.h"
+#include "eek-symbol-matrix.h"

 G_BEGIN_DECLS

@ -36,6 +40,15 @@ G_BEGIN_DECLS
 typedef struct _EekKeyClass EekKeyClass;
 typedef struct _EekKeyPrivate EekKeyPrivate;

+/**
+ * EekKey:
+ *
+ * Contains information about the state of a key.
+ * TODO: rewrite as a plain struct
+ *
+ * The #EekKey structure contains only private data and should only be
+ * accessed using the provided API.
+ */
 struct _EekKey
 {
    /*< private >*/
@ -46,21 +59,13 @@ struct _EekKey

 /**
 * EekKeyClass:
- * @set_keycode: virtual function for setting keycode of the key
- * @get_keycode: virtual function for getting keycode of the key
- * @set_keysyms: virtual function for setting symbol matrix of the key
- * @get_keysyms: virtual function for getting symbol matrix of the key
- * @get_keysym: virtual function for getting the current symbol of the key
- * @set_index: virtual function for setting position of the key in the
- * section
- * @get_index: virtual function for getting position of the key in the
- * section
- * @set_outline: virtual function for setting outline shape of the key
- * @get_outline: virtual function for getting outline shape of the key
- * @set_keysym_index: virtual function for setting group and level of the key
- * @get_keysym_index: virtual function for getting group and level of the key
 * @pressed: class handler for #EekKey::pressed signal
 * @released: class handler for #EekKey::released signal
+ * @locked: class handler for #EekKey::locked signal
+ * @unlocked: class handler for #EekKey::unlocked signal
+ * @cancelled: class handler for #EekKey::cancelled signal
+ * @is_pressed: virtual function for getting whether the key is pressed
+ * @is_locked: virtual function for getting whether the key is locked
 */
 struct _EekKeyClass
 {
@ -68,74 +73,45 @@ struct _EekKeyClass
    EekElementClass parent_class;

    /*< public >*/
-    void        (* set_keycode)      (EekKey     *self,
-                                      guint       keycode);
-    guint       (* get_keycode)      (EekKey     *self);
-    void        (* set_keysyms)      (EekKey     *self,
-                                      guint      *keysyms,
-                                      gint        num_groups,
-                                      gint        num_levels);
-    void        (* get_keysyms)      (EekKey     *self,
-                                      guint     **keysyms,
-                                      gint       *num_groups,
-                                      gint       *num_levels);
-    guint       (* get_keysym)       (EekKey     *self);
-
-    void        (* set_index)        (EekKey     *self,
-                                      gint        column,
-                                      gint        row);
-    void        (* get_index)        (EekKey     *self,
-                                      gint       *column,
-                                      gint       *row);
-
-    void        (* set_outline)      (EekKey     *self,
-                                      EekOutline *outline);
-    EekOutline *(* get_outline)      (EekKey     *self);
-
-    void        (* set_keysym_index) (EekKey     *self,
-                                      gint        group,
-                                      gint        level);
-    void        (* get_keysym_index) (EekKey     *self,
-                                      gint       *group,
-                                      gint       *level);
-
    /* signals */
-    void        (* pressed)          (EekKey     *key);
-    void        (* released)         (EekKey     *key);
+    void (* locked)    (EekKey *key);
+    void (* unlocked)  (EekKey *key);
 };

-GType       eek_key_get_type         (void) G_GNUC_CONST;
+GType            eek_key_get_type            (void) G_GNUC_CONST;

-void        eek_key_set_keycode      (EekKey     *key,
-                                      guint       keycode);
-guint       eek_key_get_keycode      (EekKey     *key);
-void        eek_key_set_keysyms      (EekKey     *key,
-                                      guint      *keysyms,
-                                      gint        num_groups,
-                                      gint        num_levels);
-void        eek_key_get_keysyms      (EekKey     *key,
-                                      guint     **keysyms,
-                                      gint       *num_groups,
-                                      gint       *num_levels);
-guint       eek_key_get_keysym       (EekKey     *key);
+void             eek_key_set_keycode         (EekKey          *key,
+                                              guint            keycode);
+guint            eek_key_get_keycode         (EekKey          *key);
+void             eek_key_set_symbol_matrix   (EekKey          *key,
+                                              EekSymbolMatrix *matrix);
+EekSymbolMatrix *eek_key_get_symbol_matrix   (EekKey          *key);
+EekSymbol       *eek_key_get_symbol          (EekKey          *key);
+EekSymbol       *eek_key_get_symbol_with_fallback
+                                             (EekKey          *key,
+                                              gint             fallback_group,
+                                              gint             fallback_level);
+EekSymbol       *eek_key_get_symbol_at_index (EekKey          *key,
+                                              gint             group,
+                                              gint             level,
+                                              gint             fallback_group,
+                                              gint             fallback_level);

-void        eek_key_set_index        (EekKey     *key,
-                                      gint        column,
-                                      gint        row);
-void        eek_key_get_index        (EekKey     *key,
-                                      gint       *column,
-                                      gint       *row);
+void             eek_key_set_index           (EekKey          *key,
+                                              gint             column,
+                                              gint             row);
+void             eek_key_get_index           (EekKey          *key,
+                                              gint            *column,
+                                              gint            *row);

-void        eek_key_set_outline      (EekKey     *key,
-                                      EekOutline *outline);
-EekOutline *eek_key_get_outline      (EekKey     *key);
+void             eek_key_set_oref            (EekKey          *key,
+                                              guint            oref);
+guint            eek_key_get_oref            (EekKey          *key);

-void        eek_key_set_keysym_index (EekKey     *key,
-                                      gint        group,
-                                      gint        level);
-void        eek_key_get_keysym_index (EekKey     *key,
-                                      gint       *group,
-                                      gint       *level);
+gboolean         eek_key_is_pressed          (EekKey          *key);
+gboolean         eek_key_is_locked           (EekKey          *key);
+void             eek_key_set_pressed         (EekKey          *key,
+                                              gboolean         value);

 G_END_DECLS
 #endif  /* EEK_KEY_H */
--- a/eek/eek-keyboard-drawing.c
+++ b/eek/eek-keyboard-drawing.c
@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
+ *
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
+#include <math.h>
+#include <pango/pangocairo.h>
+
+#include "eek-types.h"
+
+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);
+}
+
+/* renamed from rounded_polygon, use EekPoint instead of GdkPoint not
+   to depend on GTK+, and exported */
+void
+_eek_rounded_polygon (cairo_t  *cr,
+                      gdouble   radius,
+                      EekPoint *points,
+                      guint     num_points)
+{
+    cairo_move_to (cr,
+                   (gdouble) (points[num_points - 1].x +
+                              points[0].x) / 2,
+                   (gdouble) (points[num_points - 1].y +
+                              points[0].y) / 2);
+
+    for (guint i = 0; i < num_points; i++) {
+        guint 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);
+    }
+    cairo_close_path (cr);
+}
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -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
@ -32,19 +32,24 @@
 #endif  /* HAVE_CONFIG_H */

 #include "eek-keyboard.h"
+#include "eek-marshalers.h"
 #include "eek-section.h"
 #include "eek-key.h"
+#include "eek-symbol.h"
+#include "eek-enumtypes.h"
+#include "eekboard/key-emitter.h"

 enum {
    PROP_0,
-    PROP_GROUP,
-    PROP_LEVEL,
+    PROP_LAYOUT,
+    PROP_MODIFIER_BEHAVIOR,
    PROP_LAST
 };

 enum {
-    KEY_PRESSED,
    KEY_RELEASED,
+    KEY_LOCKED,
+    KEY_UNLOCKED,
    LAST_SIGNAL
 };

@ -55,85 +60,81 @@ G_DEFINE_TYPE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
 #define EEK_KEYBOARD_GET_PRIVATE(obj)                                  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYBOARD, EekKeyboardPrivate))

-
 struct _EekKeyboardPrivate
 {
-    gint group;
-    gint level;
    EekLayout *layout;
-    gboolean is_realized;
+    EekModifierBehavior modifier_behavior;
+    EekModifierType modifiers;
+    GList *pressed_keys;
+    GList *locked_keys;
+    GArray *outline_array;
+    GHashTable *keycodes;
+
+    /* modifiers dynamically assigned at run time */
+    EekModifierType num_lock_mask;
+    EekModifierType alt_gr_mask;
 };

-struct keysym_index {
-    gint group;
-    gint level;
-};
+G_DEFINE_BOXED_TYPE(EekModifierKey, eek_modifier_key,
+                    eek_modifier_key_copy, eek_modifier_key_free);

-static void
-set_keysym_index_for_key (EekElement *element,
-                          gpointer    user_data)
+EekModifierKey *
+eek_modifier_key_copy (EekModifierKey *modkey)
 {
-    struct keysym_index *ki;
-
-    g_return_if_fail (EEK_IS_KEY(element));
-
-    ki = user_data;
-    eek_key_set_keysym_index (EEK_KEY(element), ki->group, ki->level);
-}
-
-static void
-set_keysym_index_for_section (EekElement *element,
-                              gpointer user_data)
-{
-    eek_container_foreach_child (EEK_CONTAINER(element),
-                                 set_keysym_index_for_key,
-                                 user_data);
-}
-
-static void
-eek_keyboard_real_set_keysym_index (EekKeyboard *self,
-                                    gint         group,
-                                    gint         level)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    struct keysym_index ki;
-
-    ki.group = priv->group = group;
-    ki.level = priv->level = level;
-
-    eek_container_foreach_child (EEK_CONTAINER(self),
-                                 set_keysym_index_for_section,
-                                 &ki);
+    return g_slice_dup (EekModifierKey, modkey);
 }

 void
-eek_keyboard_real_get_keysym_index (EekKeyboard *self,
-                                    gint        *group,
-                                    gint        *level)
+eek_modifier_key_free (EekModifierKey *modkey)
 {
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-
-    g_return_if_fail (group || level);
-    if (group)
-        *group = priv->group;
-    if (level)
-        *level = priv->level;
+    g_object_unref (modkey->key);
+    g_slice_free (EekModifierKey, modkey);
 }

 static void
-key_pressed_event (EekSection  *section,
-                   EekKey      *key,
-                   EekKeyboard *keyboard)
+on_key_locked (EekSection  *section,
+                EekKey      *key,
+                EekKeyboard *keyboard)
 {
-    g_signal_emit_by_name (keyboard, "key-pressed", key);
+    g_signal_emit (keyboard, signals[KEY_LOCKED], 0, key);
 }

 static void
-key_released_event (EekSection  *section,
-                    EekKey      *key,
-                    EekKeyboard *keyboard)
+on_key_unlocked (EekSection  *section,
+                 EekKey      *key,
+                 EekKeyboard *keyboard)
 {
-    g_signal_emit_by_name (keyboard, "key-released", key);
+    g_signal_emit (keyboard, signals[KEY_UNLOCKED], 0, key);
+}
+
+static void
+on_symbol_index_changed (EekSection *section,
+                         gint group,
+                         gint level,
+                         EekKeyboard *keyboard)
+{
+    g_signal_emit_by_name (keyboard, "symbol-index-changed", group, level);
+}
+
+static void
+section_child_added_cb (EekContainer *container,
+                        EekElement   *element,
+                        EekKeyboard  *keyboard)
+{
+    guint keycode = eek_key_get_keycode (EEK_KEY(element));
+    g_hash_table_insert (keyboard->priv->keycodes,
+                         GUINT_TO_POINTER(keycode),
+                         element);
+}
+
+static void
+section_child_removed_cb (EekContainer *container,
+                          EekElement   *element,
+                          EekKeyboard  *keyboard)
+{
+    guint keycode = eek_key_get_keycode (EEK_KEY(element));
+    g_hash_table_remove (keyboard->priv->keycodes,
+                         GUINT_TO_POINTER(keycode));
 }

 static EekSection *
@ -144,10 +145,11 @@ eek_keyboard_real_create_section (EekKeyboard *self)
    section = g_object_new (EEK_TYPE_SECTION, NULL);
    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);
+    g_signal_connect (G_OBJECT(section), "child-added",
+                      G_CALLBACK(section_child_added_cb), self);
+
+    g_signal_connect (G_OBJECT(section), "child-removed",
+                      G_CALLBACK(section_child_removed_cb), self);

    EEK_CONTAINER_GET_CLASS(self)->add_child (EEK_CONTAINER(self),
                                              EEK_ELEMENT(section));
@ -155,73 +157,173 @@ eek_keyboard_real_create_section (EekKeyboard *self)
 }

 static void
-on_group_changed (EekLayout *layout,
-                  gint       new_group,
-                  gpointer   user_data)
+eek_keyboard_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
 {
-    EekKeyboard *keyboard = user_data;
-    gint group, level;
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);

-    eek_keyboard_get_keysym_index (keyboard, &group, &level);
-    eek_keyboard_set_keysym_index (keyboard, new_group, level);
+    switch (prop_id) {
+    case PROP_LAYOUT:
+        priv->layout = g_value_get_object (value);
+        if (priv->layout)
+            g_object_ref (priv->layout);
+        break;
+    case PROP_MODIFIER_BEHAVIOR:
+        eek_keyboard_set_modifier_behavior (EEK_KEYBOARD(object),
+                                            g_value_get_enum (value));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
 }

 static void
-eek_keyboard_real_set_layout (EekKeyboard *self,
-                              EekLayout   *layout)
+eek_keyboard_get_property (GObject    *object,
+                           guint       prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
 {
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);

-    g_return_if_fail (EEK_IS_LAYOUT(layout));
-    priv->layout = layout;
-    g_object_ref_sink (priv->layout);
-    g_signal_connect (priv->layout, "group_changed",
-                      G_CALLBACK(on_group_changed), self);
+    switch (prop_id) {
+    case PROP_LAYOUT:
+        g_value_set_object (value, priv->layout);
+        break;
+    case PROP_MODIFIER_BEHAVIOR:
+        g_value_set_enum (value,
+                          eek_keyboard_get_modifier_behavior (EEK_KEYBOARD(object)));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
 }

 static void
-eek_keyboard_real_realize (EekKeyboard *self)
+set_level_from_modifiers (EekKeyboard *self)
 {
    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
+    gint level = 0;

-    g_return_if_fail (priv->layout);
-    g_return_if_fail (!priv->is_realized);
-    EEK_LAYOUT_GET_IFACE(priv->layout)->apply (priv->layout, self);
-    /* apply the initial group setting */
-    on_group_changed (priv->layout, eek_layout_get_group (priv->layout), self);
-    priv->is_realized = TRUE;
+    if (priv->modifiers & priv->alt_gr_mask)
+        level |= 2;
+    if (priv->modifiers & EEK_SHIFT_MASK)
+        level |= 1;
+    eek_element_set_level (EEK_ELEMENT(self), level);
 }

-struct _FkbkData {
-    EekKey *key;
-    guint keycode;
-};
-typedef struct _FkbkData FkbkData;
-
-static gint
-compare_section_by_keycode (EekElement *element, gpointer user_data)
+static void
+set_modifiers_with_key (EekKeyboard    *self,
+                        EekKey         *key,
+                        EekModifierType modifiers)
 {
-    FkbkData *data = user_data;
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
+    EekModifierType enabled = (priv->modifiers ^ modifiers) & modifiers;
+    EekModifierType disabled = (priv->modifiers ^ modifiers) & priv->modifiers;

-    data->key = eek_section_find_key_by_keycode (EEK_SECTION(element),
-                                                 data->keycode);
-    if (data->key)
-        return 0;
-    return -1;
+    if (enabled != 0) {
+        if (priv->modifier_behavior != EEK_MODIFIER_BEHAVIOR_NONE) {
+            EekModifierKey *modifier_key = g_slice_new (EekModifierKey);
+            modifier_key->modifiers = enabled;
+            modifier_key->key = g_object_ref (key);
+            priv->locked_keys =
+                g_list_prepend (priv->locked_keys, modifier_key);
+            g_signal_emit_by_name (modifier_key->key, "locked");
+        }
+    } else {
+        if (priv->modifier_behavior != EEK_MODIFIER_BEHAVIOR_NONE) {
+            GList *head;
+            for (head = priv->locked_keys; head; ) {
+                EekModifierKey *modifier_key = head->data;
+                if (modifier_key->modifiers & disabled) {
+                    GList *next = g_list_next (head);
+                    priv->locked_keys =
+                        g_list_remove_link (priv->locked_keys, head);
+                    g_signal_emit_by_name (modifier_key->key, "unlocked");
+                    g_list_free1 (head);
+                    head = next;
+                } else
+                    head = g_list_next (head);
+            }
+        }
+    }
+
+    priv->modifiers = modifiers;
 }

-static EekKey *
-eek_keyboard_real_find_key_by_keycode (EekKeyboard *self,
-                                       guint        keycode)
-{
-    FkbkData data;
+void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp) {
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(keyboard);

-    data.keycode = keycode;
-    if (eek_container_find (EEK_CONTAINER(self),
-                            compare_section_by_keycode,
-                            &data))
-        return data.key;
-    return NULL;
+    eek_key_set_pressed(key, TRUE);
+    priv->pressed_keys = g_list_prepend (priv->pressed_keys, key);
+
+    EekSymbol *symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
+    if (!symbol)
+        return;
+
+    EekModifierType modifier = eek_symbol_get_modifier_mask (symbol);
+    if (priv->modifier_behavior == EEK_MODIFIER_BEHAVIOR_NONE) {
+        set_modifiers_with_key (keyboard, key, priv->modifiers | modifier);
+        set_level_from_modifiers (keyboard);
+    }
+
+    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event
+
+    guint keycode = eek_key_get_keycode (key);
+    EekModifierType modifiers = eek_keyboard_get_modifiers (keyboard);
+
+    emit_key_activated(keyboard->manager, keyboard, keycode, symbol, modifiers, TRUE, timestamp);
+}
+
+void eek_keyboard_release_key( EekKeyboard *keyboard,
+                               EekKey      *key,
+                               guint32      timestamp) {
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(keyboard);
+
+    for (GList *head = priv->pressed_keys; head; head = g_list_next (head)) {
+        if (head->data == key) {
+            priv->pressed_keys = g_list_remove_link (priv->pressed_keys, head);
+            g_list_free1 (head);
+            break;
+        }
+    }
+
+    EekSymbol *symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
+    if (!symbol)
+        return;
+
+    EekModifierType modifier = eek_symbol_get_modifier_mask (symbol);
+
+    if (!symbol)
+        return;
+
+    modifier = eek_symbol_get_modifier_mask (symbol);
+    switch (priv->modifier_behavior) {
+    case EEK_MODIFIER_BEHAVIOR_NONE:
+        set_modifiers_with_key (keyboard, key, priv->modifiers & ~modifier);
+        break;
+    case EEK_MODIFIER_BEHAVIOR_LOCK:
+        priv->modifiers ^= modifier;
+        break;
+    case EEK_MODIFIER_BEHAVIOR_LATCH:
+        if (modifier)
+            set_modifiers_with_key (keyboard, key, priv->modifiers ^ modifier);
+        else
+            set_modifiers_with_key (keyboard, key,
+                                    (priv->modifiers ^ modifier) & modifier);
+        break;
+    }
+    set_level_from_modifiers (keyboard);
+
+    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event
+
+    guint keycode = eek_key_get_keycode (key);
+    guint modifiers = eek_keyboard_get_modifiers (keyboard);
+
+    emit_key_activated(keyboard->manager, keyboard, keycode, symbol, modifiers, FALSE, timestamp);
 }

 static void
@ -233,126 +335,117 @@ eek_keyboard_dispose (GObject *object)
        g_object_unref (priv->layout);
        priv->layout = NULL;
    }
-    G_OBJECT_CLASS(eek_keyboard_parent_class)->dispose (object);
+
+    G_OBJECT_CLASS (eek_keyboard_parent_class)->dispose (object);
 }

 static void
-eek_keyboard_set_property (GObject    *object,
-                           guint       prop_id,
-                           const GValue     *value,
-                           GParamSpec *pspec)
+eek_keyboard_finalize (GObject *object)
 {
-    gint group, level;
+    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
+    guint i;

-    g_return_if_fail (EEK_IS_KEYBOARD(object));
-    switch (prop_id) {
-    case PROP_GROUP:
-        eek_keyboard_get_keysym_index (EEK_KEYBOARD(object), &group, &level);
-        eek_keyboard_set_keysym_index (EEK_KEYBOARD(object),
-                                       g_value_get_int (value),
-                                       level);
-        break;
-    case PROP_LEVEL:
-        eek_keyboard_get_keysym_index (EEK_KEYBOARD(object), &group, &level);
-        eek_keyboard_set_keysym_index (EEK_KEYBOARD(object),
-                                       group,
-                                       g_value_get_int (value));
-        break;
-    default:
-        g_object_set_property (object,
-                               g_param_spec_get_name (pspec),
-                               value);
-        break;
+    g_list_free (priv->pressed_keys);
+    g_list_free_full (priv->locked_keys,
+                      (GDestroyNotify) eek_modifier_key_free);
+
+    g_hash_table_destroy (priv->keycodes);
+
+    for (i = 0; i < priv->outline_array->len; i++) {
+        EekOutline *outline = &g_array_index (priv->outline_array,
+                                              EekOutline,
+                                              i);
+        g_slice_free1 (sizeof (EekPoint) * outline->num_points,
+                       outline->points);
    }
+    g_array_free (priv->outline_array, TRUE);
+        
+    G_OBJECT_CLASS (eek_keyboard_parent_class)->finalize (object);
 }

 static void
-eek_keyboard_get_property (GObject    *object,
-                           guint       prop_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
+eek_keyboard_real_child_added (EekContainer *self,
+                               EekElement   *element)
 {
-    gint group, level;
+    g_signal_connect (element, "key-locked",
+                      G_CALLBACK(on_key_locked), self);
+    g_signal_connect (element, "key-unlocked",
+                      G_CALLBACK(on_key_unlocked), self);
+    g_signal_connect (element, "symbol-index-changed",
+                      G_CALLBACK(on_symbol_index_changed), self);
+}

-    g_return_if_fail (EEK_IS_KEYBOARD(object));
-    switch (prop_id) {
-    case PROP_GROUP:
-        eek_keyboard_get_keysym_index (EEK_KEYBOARD(object), &group, &level);
-        g_value_set_int (value, group);
-        break;
-    case PROP_LEVEL:
-        eek_keyboard_get_keysym_index (EEK_KEYBOARD(object), &level, &level);
-        g_value_set_int (value, level);
-        break;
-    default:
-        g_object_get_property (object,
-                               g_param_spec_get_name (pspec),
-                               value);
-        break;
-    }
+static void
+eek_keyboard_real_child_removed (EekContainer *self,
+                                 EekElement   *element)
+{
+    g_signal_handlers_disconnect_by_func (element, on_key_locked, self);
+    g_signal_handlers_disconnect_by_func (element, on_key_unlocked, self);
 }

 static void
 eek_keyboard_class_init (EekKeyboardClass *klass)
 {
+    EekContainerClass *container_class = EEK_CONTAINER_CLASS (klass);
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

    g_type_class_add_private (gobject_class,
                              sizeof (EekKeyboardPrivate));

-    klass->set_keysym_index = eek_keyboard_real_set_keysym_index;
-    klass->get_keysym_index = eek_keyboard_real_get_keysym_index;
    klass->create_section = eek_keyboard_real_create_section;
-    klass->set_layout = eek_keyboard_real_set_layout;
-    klass->realize = eek_keyboard_real_realize;
-    klass->find_key_by_keycode = eek_keyboard_real_find_key_by_keycode;
+
+    /* signals */
+    container_class->child_added = eek_keyboard_real_child_added;
+    container_class->child_removed = eek_keyboard_real_child_removed;

    gobject_class->get_property = eek_keyboard_get_property;
    gobject_class->set_property = eek_keyboard_set_property;
    gobject_class->dispose = eek_keyboard_dispose;
+    gobject_class->finalize = eek_keyboard_finalize;

    /**
-     * EekKeyboard:group:
+     * EekKeyboard:layout:
     *
-     * The group (row) index of symbol matrix of #EekKeyboard.
+     * The layout used to create this #EekKeyboard.
     */
-    pspec = g_param_spec_int ("group",
-                              "Group",
-                              "Group index of symbol matrix of the keyboard",
-                              0, G_MAXINT, 0,
-                              G_PARAM_READWRITE);
+    pspec = g_param_spec_object ("layout",
+                                 "Layout",
+                                 "Layout used to create the keyboard",
+                                 EEK_TYPE_LAYOUT,
+                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
-                                     PROP_GROUP,
+                                     PROP_LAYOUT,
                                     pspec);

    /**
-     * EekKeyboard:level:
+     * EekKeyboard:modifier-behavior:
     *
-     * The level (row) index of symbol matrix of #EekKeyboard.
+     * The modifier handling mode of #EekKeyboard.
     */
-    pspec = g_param_spec_int ("level",
-                              "Level",
-                              "Level index of symbol matrix of the keyboard",
-                              0, G_MAXINT, 0,
-                              G_PARAM_READWRITE);
+    pspec = g_param_spec_enum ("modifier-behavior",
+                               "Modifier behavior",
+                               "Modifier handling mode of the keyboard",
+                               EEK_TYPE_MODIFIER_BEHAVIOR,
+                               EEK_MODIFIER_BEHAVIOR_NONE,
+                               G_PARAM_READWRITE);
    g_object_class_install_property (gobject_class,
-                                     PROP_LEVEL,
+                                     PROP_MODIFIER_BEHAVIOR,
                                     pspec);

    /**
-     * EekKeyboard::key-pressed:
+     * EekKeyboard::key-locked:
     * @keyboard: an #EekKeyboard
     * @key: an #EekKey
     *
-     * The ::key-pressed signal is emitted each time a key in @keyboard
-     * is shifted to the pressed state.
+     * The ::key-locked signal is emitted each time a key in @keyboard
+     * is shifted to the locked state.
     */
-    signals[KEY_PRESSED] =
-        g_signal_new ("key-pressed",
+    signals[KEY_LOCKED] =
+        g_signal_new (I_("key-locked"),
                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      0,
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET(EekKeyboardClass, key_locked),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__OBJECT,
@ -361,18 +454,18 @@ eek_keyboard_class_init (EekKeyboardClass *klass)
                      EEK_TYPE_KEY);

    /**
-     * EekKeyboard::key-released:
+     * EekKeyboard::key-unlocked:
     * @keyboard: an #EekKeyboard
     * @key: an #EekKey
     *
-     * The ::key-released signal is emitted each time a key in @keyboard
-     * is shifted to the released state.
+     * The ::key-unlocked signal is emitted each time a key in @keyboard
+     * is shifted to the unlocked state.
     */
-    signals[KEY_RELEASED] =
-        g_signal_new ("key-released",
+    signals[KEY_UNLOCKED] =
+        g_signal_new (I_("key-unlocked"),
                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      0,
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET(EekKeyboardClass, key_unlocked),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__OBJECT,
@ -384,48 +477,11 @@ eek_keyboard_class_init (EekKeyboardClass *klass)
 static void
 eek_keyboard_init (EekKeyboard *self)
 {
-    EekKeyboardPrivate *priv;
-
-    priv = self->priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    priv->group = priv->level = 0;
-    priv->layout = NULL;
-    priv->is_realized = FALSE;
-}
-
-/**
- * eek_keyboard_set_keysym_index:
- * @keyboard: an #EekKeyboard
- * @group: row index of the symbol matrix of keys on @keyboard
- * @level: column index of the symbol matrix of keys on @keyboard
- *
- * Select a cell of the symbol matrix of each key on @keyboard.
- */
-void
-eek_keyboard_set_keysym_index (EekKeyboard *keyboard,
-                               gint         group,
-                               gint         level)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    EEK_KEYBOARD_GET_CLASS(keyboard)->set_keysym_index (keyboard, group, level);
-}
-
-/**
- * eek_keyboard_get_keysym_index:
- * @keyboard: an #EekKeyboard
- * @group: a pointer where row index of the symbol matrix of keys on
- * @keyboard will be stored
- * @level: a pointer where column index of the symbol matrix of keys
- * on @keyboard will be stored
- *
- * Get the current cell position of the symbol matrix of each key on @keyboard.
- */
-void
-eek_keyboard_get_keysym_index (EekKeyboard *keyboard,
-                               gint        *group,
-                               gint        *level)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    EEK_KEYBOARD_GET_CLASS(keyboard)->get_keysym_index (keyboard, group, level);
+    self->priv = EEK_KEYBOARD_GET_PRIVATE(self);
+    self->priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_NONE;
+    self->priv->outline_array = g_array_new (FALSE, TRUE, sizeof (EekOutline));
+    self->priv->keycodes = g_hash_table_new (g_direct_hash, g_direct_equal);
+    eek_element_set_symbol_index (EEK_ELEMENT(self), 0, 0);
 }

 /**
@ -439,33 +495,8 @@ eek_keyboard_get_keysym_index (EekKeyboard *keyboard,
 EekSection *
 eek_keyboard_create_section (EekKeyboard *keyboard)
 {
-    EekSection *section;
    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
-    section = EEK_KEYBOARD_GET_CLASS(keyboard)->create_section (keyboard);
-    return section;
-}
-
-/**
- * eek_keyboard_set_layout:
- * @keyboard: an #EekKeyboard
- * @layout: an #EekLayout
- *
- * Set the layout of @keyboard to @layout.  This actually turns
- * @keyboard to be ready to be drawn on the screen.
- */
-void
-eek_keyboard_set_layout (EekKeyboard *keyboard,
-                         EekLayout   *layout)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    EEK_KEYBOARD_GET_CLASS(keyboard)->set_layout (keyboard, layout);
-}
-
-void
-eek_keyboard_realize (EekKeyboard *keyboard)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    EEK_KEYBOARD_GET_CLASS(keyboard)->realize (keyboard);
+    return EEK_KEYBOARD_GET_CLASS(keyboard)->create_section (keyboard);
 }

 /**
@ -474,13 +505,245 @@ eek_keyboard_realize (EekKeyboard *keyboard)
 * @keycode: a keycode
 *
 * Find an #EekKey whose keycode is @keycode.
- * Returns: an #EekKey or NULL (if not found)
+ * Return value: (transfer none): #EekKey whose keycode is @keycode
 */
 EekKey *
 eek_keyboard_find_key_by_keycode (EekKeyboard *keyboard,
                                  guint        keycode)
 {
    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
-    return EEK_KEYBOARD_GET_CLASS(keyboard)->find_key_by_keycode (keyboard,
-                                                                  keycode);
+    return g_hash_table_lookup (keyboard->priv->keycodes,
+                                GUINT_TO_POINTER(keycode));
+}
+
+/**
+ * eek_keyboard_get_layout:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get the layout used to create @keyboard.
+ * Returns: an #EekLayout
+ */
+EekLayout *
+eek_keyboard_get_layout (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
+    return keyboard->priv->layout;
+}
+
+/**
+ * eek_keyboard_get_size:
+ * @keyboard: an #EekKeyboard
+ * @width: width of @keyboard
+ * @height: height of @keyboard
+ *
+ * Get the size of @keyboard.
+ */
+void
+eek_keyboard_get_size (EekKeyboard *keyboard,
+                       gdouble     *width,
+                       gdouble     *height)
+{
+    EekBounds bounds;
+
+    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
+    *width = bounds.width;
+    *height = bounds.height;
+}
+
+/**
+ * eek_keyboard_set_modifier_behavior:
+ * @keyboard: an #EekKeyboard
+ * @modifier_behavior: modifier behavior of @keyboard
+ *
+ * Set the modifier handling mode of @keyboard.
+ */
+void
+eek_keyboard_set_modifier_behavior (EekKeyboard        *keyboard,
+                                    EekModifierBehavior modifier_behavior)
+{
+    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
+    keyboard->priv->modifier_behavior = modifier_behavior;
+}
+
+/**
+ * eek_keyboard_get_modifier_behavior:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get the modifier handling mode of @keyboard.
+ * Returns: #EekModifierBehavior
+ */
+EekModifierBehavior
+eek_keyboard_get_modifier_behavior (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+    return keyboard->priv->modifier_behavior;
+}
+
+void
+eek_keyboard_set_modifiers (EekKeyboard    *keyboard,
+                            EekModifierType modifiers)
+{
+    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
+    keyboard->priv->modifiers = modifiers;
+    set_level_from_modifiers (keyboard);
+}
+
+/**
+ * eek_keyboard_get_modifiers:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get the current modifier status of @keyboard.
+ * Returns: #EekModifierType
+ */
+EekModifierType
+eek_keyboard_get_modifiers (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+    return keyboard->priv->modifiers;
+}
+
+/**
+ * eek_keyboard_add_outline:
+ * @keyboard: an #EekKeyboard
+ * @outline: an #EekOutline
+ *
+ * Register an outline of @keyboard.
+ * Returns: an unsigned integer ID of the registered outline, for
+ * later reference
+ */
+guint
+eek_keyboard_add_outline (EekKeyboard *keyboard,
+                          EekOutline  *outline)
+{
+    EekOutline *_outline;
+
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+
+    _outline = eek_outline_copy (outline);
+    g_array_append_val (keyboard->priv->outline_array, *_outline);
+    /* don't use eek_outline_free here, so as to keep _outline->points */
+    g_slice_free (EekOutline, _outline);
+    return keyboard->priv->outline_array->len - 1;
+}
+
+/**
+ * eek_keyboard_get_outline:
+ * @keyboard: an #EekKeyboard
+ * @oref: ID of the outline
+ *
+ * Get an outline associated with @oref in @keyboard.
+ * Returns: an #EekOutline, which should not be released
+ */
+EekOutline *
+eek_keyboard_get_outline (EekKeyboard *keyboard,
+                          guint        oref)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
+
+    if (oref > keyboard->priv->outline_array->len)
+        return NULL;
+
+    return &g_array_index (keyboard->priv->outline_array, EekOutline, oref);
+}
+
+/**
+ * eek_keyboard_get_n_outlines:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get the number of outlines defined in @keyboard.
+ * Returns: integer
+ */
+gsize
+eek_keyboard_get_n_outlines (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+    return keyboard->priv->outline_array->len;
+}
+
+/**
+ * eek_keyboard_set_num_lock_mask:
+ * @keyboard: an #EekKeyboard
+ * @num_lock_mask: an #EekModifierType
+ *
+ * Set modifier mask used as Num_Lock.
+ */
+void
+eek_keyboard_set_num_lock_mask (EekKeyboard    *keyboard,
+                                EekModifierType num_lock_mask)
+{
+    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
+    keyboard->priv->num_lock_mask = num_lock_mask;
+}
+
+/**
+ * eek_keyboard_get_num_lock_mask:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get modifier mask used as Num_Lock.
+ * Returns: an #EekModifierType
+ */
+EekModifierType
+eek_keyboard_get_num_lock_mask (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+    return keyboard->priv->num_lock_mask;
+}
+
+/**
+ * eek_keyboard_set_alt_gr_mask:
+ * @keyboard: an #EekKeyboard
+ * @alt_gr_mask: an #EekModifierType
+ *
+ * Set modifier mask used as Alt_Gr.
+ */
+void
+eek_keyboard_set_alt_gr_mask (EekKeyboard    *keyboard,
+                              EekModifierType alt_gr_mask)
+{
+    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
+    keyboard->priv->alt_gr_mask = alt_gr_mask;
+}
+
+/**
+ * eek_keyboard_get_alt_gr_mask:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get modifier mask used as Alt_Gr.
+ * Returns: an #EekModifierType
+ */
+EekModifierType
+eek_keyboard_get_alt_gr_mask (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
+    return keyboard->priv->alt_gr_mask;
+}
+
+/**
+ * eek_keyboard_get_pressed_keys:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get pressed keys.
+ * Returns: (transfer container) (element-type EekKey): A list of
+ * pressed keys.
+ */
+GList *
+eek_keyboard_get_pressed_keys (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
+    return g_list_copy (keyboard->priv->pressed_keys);
+}
+
+/**
+ * eek_keyboard_get_locked_keys:
+ * @keyboard: an #EekKeyboard
+ *
+ * Get locked keys.
+ * Returns: (transfer container) (element-type Eek.ModifierKey): A list
+ * of locked keys.
+ */
+GList *
+eek_keyboard_get_locked_keys (EekKeyboard *keyboard)
+{
+    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
+    return g_list_copy (keyboard->priv->locked_keys);
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.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
@ -17,10 +17,16 @@
 * 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_KEYBOARD_H
 #define EEK_KEYBOARD_H 1

 #include <glib-object.h>
+#include <xkbcommon/xkbcommon.h>
 #include "eek-container.h"
 #include "eek-types.h"
 #include "eek-layout.h"
@ -37,68 +43,156 @@ G_BEGIN_DECLS
 typedef struct _EekKeyboardClass EekKeyboardClass;
 typedef struct _EekKeyboardPrivate EekKeyboardPrivate;

+/**
+ * EekKeyboard:
+ *
+ * Contains the state of the physical keyboard.
+ *
+ * Is also a graphical element...
+ *
+ * The #EekKeyboard structure contains only private data and should
+ * only be accessed using the provided API.
+ */
 struct _EekKeyboard
 {
    /*< private >*/
    EekContainer parent;

    EekKeyboardPrivate *priv;
+    struct xkb_keymap *keymap;
+    int keymap_fd; // keymap formatted as XKB string
+    size_t keymap_len; // length of the data inside keymap_fd
+
+    EekboardContextService *manager; // unowned reference
 };

 /**
 * EekKeyboardClass:
- * @set_keysym_index: virtual function for setting group and level of
- * the entire keyboard
- * @get_keysym_index: virtual function for getting group and level of
- * the entire keyboard
 * @create_section: virtual function for creating a section
- * @set_layout: virtual function for setting layout engine
 * @find_key_by_keycode: virtual function for finding a key in the
 * keyboard by keycode
- * @realize: virtual function for applying a layout to the keyboard
+ * @key_pressed: class handler for #EekKeyboard::key-pressed signal
+ * @key_released: class handler for #EekKeyboard::key-released signal
+ * @key_locked: class handler for #EekKeyboard::key-locked signal
+ * @key_unlocked: class handler for #EekKeyboard::key-unlocked signal
+ * @key_cancelled: class handler for #EekKeyboard::key-cancelled signal
 */
 struct _EekKeyboardClass
 {
    /*< private >*/
    EekContainerClass parent_class;

-    /*< public >*/
-    void        (* set_keysym_index)    (EekKeyboard *self,
-                                         gint         group,
-                                         gint         level);
-    void        (* get_keysym_index)    (EekKeyboard *self,
-                                         gint        *group,
-                                         gint        *level);
+    /* obsolete members moved to EekElement */
+    gpointer set_symbol_index;
+    gpointer get_symbol_index;

+    /*< public >*/
    EekSection *(* create_section)      (EekKeyboard *self);

-    void        (* set_layout)          (EekKeyboard *self,
-                                         EekLayout   *layout);
    EekKey     *(* find_key_by_keycode) (EekKeyboard *self,
                                         guint        keycode);
-    void        (* realize)             (EekKeyboard *self);
+
+    /*< private >*/
+    /* obsolete members moved to EekElement */
+    gpointer symbol_index_changed;
+
+    /*< public >*/
+    /* signals */
+    void        (* key_locked)          (EekKeyboard *self,
+                                         EekKey      *key);
+    void        (* key_unlocked)        (EekKeyboard *self,
+                                         EekKey      *key);

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

-GType       eek_keyboard_get_type            (void) G_GNUC_CONST;
+/**
+ * EekModifierKey:
+ * @modifiers: an #EekModifierType which @key triggers
+ * @key: an #EekKey
+ *
+ * Entry which associates modifier mask to a key.  This is returned by
+ * eek_keyboard_get_locked_keys().
+ */
+struct _EekModifierKey {
+    /*< public >*/
+    EekModifierType modifiers;
+    EekKey *key;
+};
+typedef struct _EekModifierKey EekModifierKey;

-void        eek_keyboard_set_keysym_index    (EekKeyboard *keyboard,
-                                              gint         group,
-                                              gint         level);
-void        eek_keyboard_get_keysym_index    (EekKeyboard *keyboard,
-                                              gint        *group,
-                                              gint        *level);

-EekSection *eek_keyboard_create_section      (EekKeyboard *keyboard);
+EekKeyboard        *eek_keyboard_new (EekboardContextService *manager,
+                                      EekLayout          *layout,
+                                      gdouble             initial_width,
+                                      gdouble             initial_height);
+GType               eek_keyboard_get_type
+                                     (void) G_GNUC_CONST;
+EekLayout          *eek_keyboard_get_layout
+                                     (EekKeyboard        *keyboard);
+void                eek_keyboard_get_size
+                                     (EekKeyboard        *keyboard,
+                                      gdouble            *width,
+                                      gdouble            *height);
+void                eek_keyboard_set_size
+                                     (EekKeyboard        *keyboard,
+                                      gdouble             width,
+                                      gdouble             height);

-void        eek_keyboard_set_layout          (EekKeyboard *keyboard,
-                                              EekLayout   *layout);
-void        eek_keyboard_realize             (EekKeyboard *keyboard);
-EekKey     *eek_keyboard_find_key_by_keycode (EekKeyboard *keyboard,
-                                              guint        keycode);
+void                eek_keyboard_set_modifier_behavior
+                                     (EekKeyboard        *keyboard,
+                                      EekModifierBehavior modifier_behavior);
+EekModifierBehavior eek_keyboard_get_modifier_behavior
+                                     (EekKeyboard        *keyboard);
+void                eek_keyboard_set_modifiers
+                                     (EekKeyboard        *keyboard,
+                                      EekModifierType     modifiers);
+EekModifierType     eek_keyboard_get_modifiers
+                                     (EekKeyboard        *keyboard);
+
+EekSection         *eek_keyboard_create_section
+                                     (EekKeyboard        *keyboard);
+
+EekKey             *eek_keyboard_find_key_by_keycode
+                                     (EekKeyboard        *keyboard,
+                                      guint               keycode);
+
+guint               eek_keyboard_add_outline
+                                     (EekKeyboard        *keyboard,
+                                      EekOutline         *outline);
+
+EekOutline         *eek_keyboard_get_outline
+                                     (EekKeyboard        *keyboard,
+                                      guint               oref);
+gsize               eek_keyboard_get_n_outlines
+                                     (EekKeyboard        *keyboard);
+
+void                eek_keyboard_set_num_lock_mask
+                                     (EekKeyboard        *keyboard,
+                                      EekModifierType     num_lock_mask);
+EekModifierType     eek_keyboard_get_num_lock_mask
+                                     (EekKeyboard        *keyboard);
+
+void                eek_keyboard_set_alt_gr_mask
+                                     (EekKeyboard        *keyboard,
+                                      EekModifierType     alt_gr_mask);
+EekModifierType     eek_keyboard_get_alt_gr_mask
+                                     (EekKeyboard        *keyboard);
+
+GList              *eek_keyboard_get_pressed_keys
+                                     (EekKeyboard        *keyboard);
+GList              *eek_keyboard_get_locked_keys
+                                     (EekKeyboard        *keyboard);
+
+EekModifierKey     *eek_modifier_key_copy
+                                     (EekModifierKey     *modkey);
+void                eek_modifier_key_free
+                                     (EekModifierKey      *modkey);
+
+void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp);
+void eek_keyboard_release_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp);

 G_END_DECLS
 #endif  /* EEK_KEYBOARD_H */
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@ -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
@ -20,28 +20,101 @@

 /**
 * SECTION:eek-keysym
- * @short_description: Keysym conversion utilities
+ * @short_description: an #EekSymbol represents an X keysym
 */

-#include <glib.h>
-#include <stdlib.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
-#include "eek-keysym.h"

-struct eek_keysym_label {
-    guint keysym;
-    const gchar *label;
-    EekKeysymCategory category;
+#include <string.h>
+#include <stdlib.h>
+
+#include "eek-keysym.h"
+#include "eek-serializable.h"
+
+/* modifier keys */
+#define EEK_KEYSYM_Shift_L 0xffe1
+#define EEK_KEYSYM_Shift_R 0xffe2
+#define EEK_KEYSYM_ISO_Level3_Shift 0xfe03
+#define EEK_KEYSYM_Caps_Lock 0xffe5
+#define EEK_KEYSYM_Shift_Lock 0xffe6
+#define EEK_KEYSYM_Control_L 0xffe3
+#define EEK_KEYSYM_Control_R 0xffe4
+#define EEK_KEYSYM_Alt_L 0xffe9
+#define EEK_KEYSYM_Alt_R 0xffea
+#define EEK_KEYSYM_Meta_L 0xffe7
+#define EEK_KEYSYM_Meta_R 0xffe8
+#define EEK_KEYSYM_Super_L 0xffeb
+#define EEK_KEYSYM_Super_R 0xffec
+#define EEK_KEYSYM_Hyper_L 0xffed
+#define EEK_KEYSYM_Hyper_R 0xffee
+
+struct _EekKeysymPrivate {
+    guint xkeysym;
 };

-#include "eek-special-keysym-labels.h"
-#include "eek-unicode-keysym-labels.h"
-#include "eek-keyname-keysym-labels.h"
+struct _EekKeysymEntry {
+    guint xkeysym;
+    const gchar *name;
+    EekSymbolCategory category;
+};

-static G_CONST_RETURN gchar *
+typedef struct _EekKeysymEntry EekKeysymEntry;
+
+#include "eek-special-keysym-entries.h"
+#include "eek-unicode-keysym-entries.h"
+#include "eek-xkeysym-keysym-entries.h"
+
+static void eek_serializable_iface_init (EekSerializableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (EekKeysym, eek_keysym, EEK_TYPE_SYMBOL,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+                                                eek_serializable_iface_init));
+
+#define EEK_KEYSYM_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYSYM, EekKeysymPrivate))
+
+static EekSerializableIface *eek_keysym_parent_serializable_iface;
+
+static void
+eek_keysym_real_serialize (EekSerializable *self,
+                           GVariantBuilder *builder)
+{
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);
+
+    eek_keysym_parent_serializable_iface->serialize (self, builder);
+
+    g_variant_builder_add (builder, "u", priv->xkeysym);
+}
+
+static gsize
+eek_keysym_real_deserialize (EekSerializable *self,
+                             GVariant        *variant,
+                             gsize            index)
+{
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);
+
+    index = eek_keysym_parent_serializable_iface->deserialize (self,
+                                                               variant,
+                                                               index);
+
+    g_variant_get_child (variant, index++, "u", &priv->xkeysym);
+
+    return index;
+}
+
+static void
+eek_serializable_iface_init (EekSerializableIface *iface)
+{
+    eek_keysym_parent_serializable_iface =
+        g_type_interface_peek_parent (iface);
+
+    iface->serialize = eek_keysym_real_serialize;
+    iface->deserialize = eek_keysym_real_deserialize;
+}
+
+static gchar *
 unichar_to_utf8 (gunichar uc)
 {
    if (g_unichar_isgraph (uc)) {
@ -57,115 +130,221 @@ unichar_to_utf8 (gunichar uc)
 }

 static int
-keysym_label_compare (const void *key0, const void *key1)
+keysym_entry_compare_by_xkeysym (const void *key0, const void *key1)
 {
-    const struct eek_keysym_label *entry0 = key0, *entry1 = key1;
-    return (gint)entry0->keysym - (gint)entry1->keysym;
+    const EekKeysymEntry *entry0 = key0, *entry1 = key1;
+    return (gint) (entry0->xkeysym - entry1->xkeysym);
+}
+
+static EekKeysymEntry *
+find_keysym_entry_by_xkeysym (guint xkeysym,
+                              const EekKeysymEntry *entries,
+                              gint num_entries)
+{
+    EekKeysymEntry key;
+
+    key.xkeysym = xkeysym;
+    return bsearch (&key, entries, num_entries, sizeof (EekKeysymEntry),
+                    keysym_entry_compare_by_xkeysym);
 }

 static gboolean
-find_keysym (guint              keysym,
-             const gchar      **label,
-             EekKeysymCategory *category)
-{
-    struct eek_keysym_label bsearch_key, *bsearch_val;
-
-    /* First, search special keysyms. */
-    bsearch_key.keysym = keysym;
-    bsearch_val = bsearch (&bsearch_key,
-                           special_keysym_labels,
-                           G_N_ELEMENTS(special_keysym_labels),
-                           sizeof (struct eek_keysym_label),
-                           keysym_label_compare);
-    if (bsearch_val) {
-        if (label)
-            *label = g_strdup (bsearch_val->label);
-        if (category)
-            *category = bsearch_val->category;
-        return TRUE;
-    }
-  
+get_unichar (guint xkeysym, gunichar *uc) {
    /* Check for Latin-1 characters (1:1 mapping) */
-    if ((keysym >= 0x0020 && keysym <= 0x007e) ||
-        (keysym >= 0x00a0 && keysym <= 0x00ff)) {
-        if (label)
-            *label = unichar_to_utf8 (keysym);
-        if (category)
-            *category = EEK_KEYSYM_CATEGORY_LETTER;
+    if ((xkeysym >= 0x0020 && xkeysym <= 0x007e) ||
+        (xkeysym >= 0x00a0 && xkeysym <= 0x00ff)) {
+        *uc = xkeysym;
        return TRUE;
    }

    /* Also check for directly encoded 24-bit UCS characters:
     */
-    if ((keysym & 0xff000000) == 0x01000000) {
-        if (label)
-            *label = unichar_to_utf8 (keysym & 0x00ffffff);
-        if (category)
-            *category = EEK_KEYSYM_CATEGORY_LETTER;
-        return TRUE;
-    }
-
-    /* Search known unicode keysyms. */
-    bsearch_key.keysym = keysym;
-    bsearch_val = bsearch (&bsearch_key,
-                           unicode_keysym_labels,
-                           G_N_ELEMENTS(unicode_keysym_labels),
-                           sizeof (struct eek_keysym_label),
-                           keysym_label_compare);
-    if (bsearch_val) {
-        if (label)
-            *label = g_strdup (bsearch_val->label);
-        if (category)
-            *category = bsearch_val->category;
-        return TRUE;
-    }
-
-    /* Finally, search keynames. */
-    bsearch_key.keysym = keysym;
-    bsearch_val = bsearch (&bsearch_key,
-                           keyname_keysym_labels,
-                           G_N_ELEMENTS(keyname_keysym_labels),
-                           sizeof (struct eek_keysym_label),
-                           keysym_label_compare);
-    if (bsearch_val) {
-        if (label)
-            *label = g_strdup (bsearch_val->label);
-        if (category)
-            *category = bsearch_val->category;
+    if ((xkeysym & 0xff000000) == 0x01000000) {
+        *uc = xkeysym & 0x00ffffff;
        return TRUE;
    }

    return FALSE;
 }

-/**
- * eek_keysym_to_string:
- * @keysym: keysym ID
- *
- * Return a string representation of @keysym.
- */
-G_CONST_RETURN gchar *
-eek_keysym_to_string (guint keysym)
+G_INLINE_FUNC EekModifierType
+get_modifier_mask (guint xkeysym)
 {
-    const gchar *label;
+    switch (xkeysym) {
+    case EEK_KEYSYM_Shift_L:
+    case EEK_KEYSYM_Shift_R:
+    case EEK_KEYSYM_Caps_Lock:
+    case EEK_KEYSYM_Shift_Lock:
+        return EEK_SHIFT_MASK;
+    case EEK_KEYSYM_ISO_Level3_Shift:
+        return EEK_BUTTON1_MASK;
+    case EEK_KEYSYM_Control_L:
+    case EEK_KEYSYM_Control_R:
+        return EEK_CONTROL_MASK;
+    case EEK_KEYSYM_Alt_L:
+    case EEK_KEYSYM_Alt_R:
+        return EEK_MOD1_MASK;
+    case EEK_KEYSYM_Meta_L:
+    case EEK_KEYSYM_Meta_R:
+        return EEK_META_MASK;
+    case EEK_KEYSYM_Super_L:
+    case EEK_KEYSYM_Super_R:
+        return EEK_SUPER_MASK;
+    case EEK_KEYSYM_Hyper_L:
+    case EEK_KEYSYM_Hyper_R:
+        return EEK_HYPER_MASK;
+    }
+    return 0;
+}

-    if (find_keysym (keysym, &label, NULL))
-        return label;
-    return g_strdup ("");
+static void
+eek_keysym_class_init (EekKeysymClass *klass)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (gobject_class, sizeof (EekKeysymPrivate));
+}
+
+static void
+eek_keysym_init (EekKeysym *self)
+{
+    self->priv = EEK_KEYSYM_GET_PRIVATE(self);
 }

 /**
- * eek_keysym_get_category:
- * @keysym: keysym ID
+ * eek_keysym_new_with_modifier:
+ * @xkeysym: an X keysym value
+ * @modifier_mask: modifier assigned to @xkeysym
 *
- * Return a string representation of @keysym.
+ * Create an #EekKeysym with given X keysym value @xkeysym and
+ * modifier @modifier_mask.
 */
-EekKeysymCategory
-eek_keysym_get_category (guint keysym)
+EekKeysym *
+eek_keysym_new_with_modifier (guint           xkeysym,
+                              EekModifierType modifier_mask)
 {
-    EekKeysymCategory category;
+    EekKeysym *keysym;
+    EekKeysymPrivate *priv;
+    EekKeysymEntry *special_entry, *xkeysym_entry, *unicode_entry,
+        *unichar_entry;
+    gchar *name, *label;
+    EekSymbolCategory category;
+    gunichar uc;

-    if (find_keysym (keysym, NULL, &category))
-        return category;
-    return EEK_KEYSYM_CATEGORY_UNKNOWN;
+    special_entry =
+        find_keysym_entry_by_xkeysym (xkeysym,
+                                      special_keysym_entries,
+                                      G_N_ELEMENTS(special_keysym_entries));
+    xkeysym_entry =
+        find_keysym_entry_by_xkeysym (xkeysym,
+                                      xkeysym_keysym_entries,
+                                      G_N_ELEMENTS(xkeysym_keysym_entries));
+    unicode_entry =
+        find_keysym_entry_by_xkeysym (xkeysym,
+                                      unicode_keysym_entries,
+                                      G_N_ELEMENTS(unicode_keysym_entries));
+    unichar_entry = NULL;
+    if (get_unichar (xkeysym, &uc)) {
+        unichar_entry = g_slice_new (EekKeysymEntry);
+        unichar_entry->xkeysym = xkeysym;
+        unichar_entry->name = unichar_to_utf8 (uc);
+        unichar_entry->category = EEK_SYMBOL_CATEGORY_LETTER;
+    }
+
+    /* name and category */
+    name = NULL;
+    if (xkeysym_entry) {
+        name = g_strdup (xkeysym_entry->name);
+        category = xkeysym_entry->category;
+    } else if (unichar_entry) {
+        name = g_strdup (unichar_entry->name);
+        category = unichar_entry->category;
+    } else if (unicode_entry) {
+        name = g_strdup (unicode_entry->name);
+        category = unicode_entry->category;
+    } else {
+        name = g_strdup ("");
+        category = EEK_SYMBOL_CATEGORY_UNKNOWN;
+    }
+
+    /* label */
+    if (special_entry)
+        label = g_strdup (special_entry->name);
+    else if (unichar_entry)
+        label = g_strdup (unichar_entry->name);
+    else if (unicode_entry)
+        label = g_strdup (unicode_entry->name);
+    else
+        label = g_strdup (name);
+
+    keysym = g_object_new (EEK_TYPE_KEYSYM,
+                           "name", name,
+                           "label", label,
+                           "category", category,
+                           "modifier-mask", modifier_mask,
+                           NULL);
+    g_free (name);
+    g_free (label);
+
+    if (unichar_entry) {
+        g_free ((gpointer) unichar_entry->name);
+        g_slice_free (EekKeysymEntry, unichar_entry);
+    }
+
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
+    priv->xkeysym = xkeysym;
+
+    return keysym;
+}
+
+/**
+ * eek_keysym_new:
+ * @xkeysym: an X keysym value
+ *
+ * Create an #EekKeysym with given X keysym value @xkeysym.
+ */
+EekKeysym *
+eek_keysym_new (guint xkeysym)
+{
+    return eek_keysym_new_with_modifier (xkeysym, get_modifier_mask (xkeysym));
+}
+
+/**
+ * eek_keysym_new_from_name:
+ * @name: an X keysym name
+ *
+ * Create an #EekKeysym with an X keysym value looked up by @name.
+ */
+EekKeysym *
+eek_keysym_new_from_name (const gchar *name)
+{
+    gint i;
+
+    for (i = 0; i < G_N_ELEMENTS(xkeysym_keysym_entries); i++)
+        if (g_strcmp0 (xkeysym_keysym_entries[i].name, name) == 0)
+            return eek_keysym_new (xkeysym_keysym_entries[i].xkeysym);
+
+    // g_warning ("can't find keysym entry for %s", name);
+    return g_object_new (EEK_TYPE_KEYSYM,
+                         "name", name,
+                         "label", name,
+                         "category", EEK_SYMBOL_CATEGORY_UNKNOWN,
+                         "modifier-mask", 0,
+                         NULL);
+}
+
+/**
+ * eek_keysym_get_xkeysym:
+ * @keysym: an #EekKeysym
+ *
+ * Get an X keysym value associated with @keysym
+ */
+guint
+eek_keysym_get_xkeysym (EekKeysym *keysym)
+{
+    EekKeysymPrivate *priv;
+
+    g_assert (EEK_IS_KEYSYM(keysym));
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
+    return priv->xkeysym;
 }
--- a/Show More
+++ b/Show More