Bump version number

ci: Build .deb

Closes #108

See merge request Librem5/squeekboard!169

.gitignore

@@ -0,0 +1,9 @@
+.zanata-cache/
+_build
+TAGS
+tags
+vgdump
+*.swp
+*~
+\#*#
+.\#*

.gitlab-ci.yml

@@ -2,18 +2,54 @@ image: debian:buster
 
 stages:
   - build
+  - test
+
+.tags: &tags
+  tags:
+    - librem5
 
 before_script:
+  - apt-get -y update
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
   - apt-get -y update
   - apt-get -y build-dep .
 
 build_meson:
+  <<: *tags
   stage: build
-  tags:
-    - librem5
+  artifacts:
+    paths:
+      - _build
   script:
-    - mkdir -p ../build
-    - meson ../build/
-    - cd ../build
-    - ninja install
+    - meson . _build/ -Ddepdatadir=/usr/share
+    - ninja -C _build install
 
+build_deb:
+    <<: *tags
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+test_lintian:
+    <<: *tags
+    stage: test
+    dependencies:
+        - build_deb
+    script:
+        - apt-get -y install lintian
+        - lintian *.deb
+
+test:
+  <<: *tags
+  stage: test
+  dependencies:
+    - build_meson
+  script:
+    - ninja -C _build test

Cargo.lock

@@ -0,0 +1,162 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "dtoa"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "memmap"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rs"
+version = "0.1.0"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "xkbcommon"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
+"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
+"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"

Cargo.toml

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

HACKING.md

@@ -0,0 +1,58 @@
+Hacking
+=======
+
+This document describes the standards for modifying and maintaining the *squeekboard* project.
+
+Testing
+-------
+
+Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
+
+- the application draws correctly
+- it shows when relevant
+- it changes layouts
+- it changes levels
+
+Testing with an application:
+
+```
+python3 tests/entry.py
+```
+
+Testing visibility:
+
+```
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
+```
+
+Testing layouts:
+
+```
+$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'ua')]"
+$ gsettings set org.gnome.desktop.input-sources current 1
+```
+
+Maintenance
+-----------
+
+Squeekboard uses Rust & Cargo for some of its dependencies.
+
+Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
+
+```
+cd build_dir
+sh /source_path/cargo.sh /source_path '' test
+```
+
+### Cargo dependencies
+
+Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.
+
+`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
+
+```
+cd build_dir
+sh /source_path/cargo.sh /source_path '' update
+ninja test
+```

Makefile.am

@@ -1,41 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = eek eekboard src tests bindings docs po data examples
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
-AUTOMAKE_OPTIONS = foreign # allow README.md to exist
-
-
-GITIGNOREFILES =				\
-	INSTALL					\
-	aclocal.m4				\
-	compile					\
-	config.guess				\
-	config.h.in				\
-	config.sub				\
-	depcomp					\
-	gtk-doc.make				\
-	install-sh				\
-	ltmain.sh				\
-	m4					\
-	missing					\
-	mkinstalldirs				\
-	$(NULL)
-
--include $(top_srcdir)/git.mk

README.md

@@ -3,14 +3,18 @@
 
 *Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.
 
+It squeaks because some Rust got inside.
+
 Features
 --------
 
 ### Present
 
 - GTK3
-- Custom xml-defined keyboards
+- Custom yaml-defined keyboards
 - DBus interface to show and hide
+- Use Wayland input method protocol to show and hide
+- Use Wayland virtual keyboard protocol
 
 ### Temporarily dropped
 
@@ -18,8 +22,6 @@ Features
 
 ### TODO
 
-- Use Wayland virtual keyboard protocol
-- Use Wayland text input protocol
 - Use Wayland input method protocol
 - Pick up DBus interface files from /usr/share
 
@@ -33,36 +35,25 @@ See `.gitlab-ci.yml`.
 ### Build from git repo
 
 ```
-$ git clone https://source.puri.sm/Librem5/eekboard.git
-$ cd eekboard
+$ git clone https://source.puri.sm/Librem5/squeekboard.git
+$ cd squeekboard
 $ mkdir ../build
 $ meson ../build/
 $ cd ../build
+$ ninja test
 $ 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
+$ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```
 
-### Testing
+Developing
+----------
 
-```
-$ 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
-```
+See `HACKING.md`

TODO

@@ -1 +0,0 @@
-See https://github.com/ueno/eekboard/wiki/TODO

autogen.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="eekboard"
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/README.md ) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
-REQUIRED_AUTOMAKE_VERSION=1.10
-REQUIRED_AUTOCONF_VERSION=2.60
-
-. gnome-autogen.sh

bindings/Makefile.am

@@ -1,21 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-SUBDIRS = vala
-
--include $(top_srcdir)/git.mk

bindings/vala/Eek-0.90.metadata

@@ -1 +0,0 @@
-Eek cheader_filename="eek/eek.h"

bindings/vala/EekGtk-0.90.metadata

@@ -1 +0,0 @@
-EekGtk cheader_filename="eek/eek-gtk.h"

bindings/vala/EekXkl-0.90.metadata

@@ -1 +0,0 @@
-EekXkl cheader_filename="eek/eek-xkl.h"

bindings/vala/Makefile.am

@@ -1,96 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-NULL =
-
-if ENABLE_VALA
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA =				\
-	eek-$(EEK_API_VERSION).vapi		\
-	eek-$(EEK_API_VERSION).deps		\
-	eek-gtk-$(EEK_API_VERSION).vapi		\
-	eek-gtk-$(EEK_API_VERSION).deps		\
-	eek-xkl-$(EEK_API_VERSION).vapi		\
-	eek-xkl-$(EEK_API_VERSION).deps		\
-	$(NULL)
-
-EXTRA_DIST =					\
-	Eek-$(EEK_API_VERSION).metadata		\
-	EekGtk-$(EEK_API_VERSION).metadata	\
-	EekXkl-$(EEK_API_VERSION).metadata	\
-	$(NULL)
-
-GITIGNOREFILES = \
-	eek-$(EEK_API_VERSION).vapi		\
-	eek-gtk-$(EEK_API_VERSION).vapi		\
-	eek-xkl-$(EEK_API_VERSION).vapi		\
-	$(NULL)
-
-maintainer-clean-local:
-	rm -f *.vapi
-
-eek_vapi_deps =						\
-	$(srcdir)/Eek-$(EEK_API_VERSION).metadata	\
-	|						\
-	$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir	\
-	$(NULL)
-
-eek-$(EEK_API_VERSION).vapi: $(eek_vapi_deps)
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--library eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		--metadatadir=$(srcdir) \
-		$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir
-
-eek_gtk_vapi_deps =					\
-	$(srcdir)/EekGtk-$(EEK_API_VERSION).metadata	\
-	|						\
-	$(top_builddir)/eek/EekGtk-$(EEK_API_VERSION).gir	\
-	$(NULL)
-
-eek-gtk-$(EEK_API_VERSION).vapi: $(eek_gtk_vapi_deps)
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-gtk-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		--pkg gtk+-3.0 \
-		--metadatadir=$(srcdir)	\
-		$(top_builddir)/eek/EekGtk-$(EEK_API_VERSION).gir
-
-eek_xkl_vapi_deps =						\
-	$(srcdir)/EekXkl-$(EEK_API_VERSION).metadata		\
-	|							\
-	$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir	\
-	$(NULL)
-
-eek-xkl-$(EEK_API_VERSION).vapi: $(eek_xkl_vapi_deps)
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--vapidir=$(builddir) \
-		--library eek-xkl-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		--metadatadir=$(srcdir) \
-		$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir
-
-# set up the verbosity rules to avoid some build noise
-VAPIGEN_V = $(VAPIGEN_V_$(V))
-VAPIGEN_V_ = $(VAPIGEN_V_$(AM_DEFAULT_VERBOSITY))
-VAPIGEN_V_0 = @echo "  VAPIG " $@;
-endif
-
--include $(top_srcdir)/git.mk

bindings/vala/eek-0.90.deps

@@ -1 +0,0 @@
-gio-2.0

bindings/vala/eek-gtk-0.90.deps

@@ -1 +0,0 @@
-eek-0.90

bindings/vala/eek-xkl-0.90.deps

@@ -1,2 +0,0 @@
-eek-0.90
-x11

cargo.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This script manages Cargo operations
+# while keeping the artifact directory within the build tree
+# instead of the source tree
+
+set -e
+
+SOURCE_DIR="$1"
+
+export CARGO_TARGET_DIR=`pwd`
+if [ ! -z ${2} ]; then
+    OUT_PATH=`realpath "${2}"`
+fi
+
+cd $SOURCE_DIR
+shift
+shift
+cargo $BUILD_ARG $@
+
+if [ ! -z ${OUT_PATH} ]; then
+    cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}"
+fi

configure.ac

@@ -1,245 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-AC_PREREQ(2.63)
-dnl AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_INIT([eekboard], [1.0.8], [ueno@unixuser.org])
-
-dnl Init automake
-AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE([enable])
-AC_GNU_SOURCE
-
-dnl Support silent build
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-dnl Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CC_STDC
-AC_PROG_INSTALL
-AC_PROG_CXX
-
-# define PACKAGE_VERSION_* variables
-AM_DISABLE_STATIC
-AC_ISC_POSIX
-AC_HEADER_STDC
-LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
-
-GTK_API_VERSION=3.0
-GTK_REQUIRED=2.91.0
-EEK_API_VERSION=0.90
-EEK_API_MAJOR_VERSION=0
-EEK_API_MINOR_VERSION=90
-EEK_API_PC_VERSION=0.90
-EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
-
-AC_SUBST([GTK_API_VERSION])
-AC_SUBST([EEK_API_VERSION])
-AC_SUBST([EEK_API_MAJOR_VERSION])
-AC_SUBST([EEK_API_MINOR_VERSION])
-AC_SUBST([EEK_API_PC_VERSION])
-AC_SUBST([EEK_LIBRARY_SUFFIX])
-AC_SUBST([EEK_LIBRARY_SUFFIX_U],[AS_TR_SH([$EEK_LIBRARY_SUFFIX])])
-
-AM_PATH_GLIB_2_0
-PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.26.0], ,
-  [AC_MSG_ERROR([GLib2 not found])])
-PKG_CHECK_MODULES([GIO2], [gio-2.0], ,
-  [AC_MSG_ERROR([Gio2 not found])])
-GLIB_GSETTINGS
-
-PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo], ,
-  [AC_MSG_ERROR([PangoCairo not found])])
-PKG_CHECK_MODULES([GTK], [
-  gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-  gdk-$GTK_API_VERSION >= $GTK_REQUIRED], ,
-  [AC_MSG_ERROR([GTK not found])])
-PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier x11], ,
-  [AC_MSG_ERROR([Libxklavier not found])])
-PKG_CHECK_MODULES([LIBCROCO], [libcroco-0.6], ,
-  [AC_MSG_ERROR([libcroco not found])])
-
-dnl use XTest to generate key events
-AC_MSG_CHECKING([whether you enable XTest])
-AC_ARG_ENABLE(xtest,
-              AS_HELP_STRING([--enable-xtest=no/yes],
-                             [Enable XTest default=yes]),
-              enable_xtest=$enableval,
-              enable_xtest=yes)
-
-if test x$enable_xtest = xyes; then
-  PKG_CHECK_MODULES([XTEST], [xtst], , enable_xtest=no)
-  if test x$enable_xtest = xyes; then
-    AC_DEFINE([HAVE_XTEST], [1], [Define if XTest is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_XTEST, [test x$enable_xtest = xyes])
-AC_MSG_RESULT($enable_xtest)
-
-dnl use X to mark the fullscreen window as dock
-AC_MSG_CHECKING([whether you enable X dock])
-AC_ARG_ENABLE(x-dock,
-              AS_HELP_STRING([--enable-x-dock=no/yes],
-                             [Enable X dock default=yes]),
-              enable_x_dock=$enableval,
-              enable_x_dock=yes)
-
-if test x$enable_x_dock = xyes; then
-  PKG_CHECK_MODULES([XDOCK], [x11], , enable_x_dock=no)
-  if test x$enable_x_dock = xyes; then
-    AC_DEFINE([HAVE_XDOCK], [1], [Define if X dock is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_XDOCK, [test x$enable_x_dock = xyes])
-AC_MSG_RESULT($enable_x_dock)
-
-focus_listeners="ibus"
-keystroke_listeners=""
-
-dnl use AT-SPI 2 to capture focus/keystroke events
-AC_MSG_CHECKING([whether you enable AT-SPI 2 event handling])
-AC_ARG_ENABLE(atspi,
-              AS_HELP_STRING([--enable-atspi=no/yes],
-                             [Enable AT-SPI 2 event handling default=yes]),
-              enable_atspi=$enableval,
-              enable_atspi=yes)
-
-if test x$enable_atspi = xyes; then
-  PKG_CHECK_MODULES([ATSPI2], [atspi-2], , enable_atspi=no)
-  if test x$enable_atspi = xyes; then
-    AC_DEFINE([HAVE_ATSPI], [1], [Define if AT-SPI 2 is found])
-    focus_listeners="atspi $focus_listeners"
-    keystroke_listeners="atspi $keystroke_listeners"
-  fi
-fi
-AC_MSG_RESULT($enable_atspi)
-AM_CONDITIONAL(ENABLE_ATSPI, [test x$enable_atspi = xyes])
-
-if test -n "$focus_listeners"; then
-  AC_DEFINE(ENABLE_FOCUS_LISTENER, [1], [Define if eekboard can follow focus changes])
-fi
-
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
-
-dnl Vala langauge binding
-AC_MSG_CHECKING([whether you enable Vala language support])
-AC_ARG_ENABLE(vala,
-              AS_HELP_STRING([--enable-vala=no/yes],
-                             [Enable Vala language binding default=yes]),
-              enable_vala=$enableval,
-              enable_vala=yes)
-if test x$enable_vala = xyes; then
-  if test "x$INTROSPECTION_SCANNER" = x; then
-    enable_vala=no
-    AC_MSG_WARN([GObject-Introspection must be enabled for Vala bindings])
-  fi
-
-  AM_PROG_VALAC([0.10.0])
-  have_vala=yes
-
-  AC_PATH_PROG(VALAC, valac, valac)
-  AC_SUBST(VALAC)
-  AC_SUBST(VALAFLAGS)
-
-  AC_PATH_PROG([VAPIGEN], [vapigen], [false])
-
-  if test "x$VAPIGEN" = "xfalse"; then
-    enable_vala=no
-    AC_MSG_WARN([vapigen not found. Was vala compiled with --enable-vapigen?])
-  fi
-
-  AC_SUBST(VAPIGEN)
-fi
-AC_MSG_RESULT($enable_vala)
-AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
-
-dnl libcanberra
-AC_MSG_CHECKING([whether you enable libcanberra])
-AC_ARG_ENABLE(libcanberra,
-              AS_HELP_STRING([--enable-libcanberra=no/yes],
-                             [Enable libcanberra user interface default=no]),
-              enable_libcanberra=$enableval,
-              enable_libcanberra=yes)
-
-if test x$enable_libcanberra = xyes; then
-  PKG_CHECK_MODULES([LIBCANBERRA], [libcanberra-gtk3], , enable_libcanberra=no)
-  if test x$enable_libcanberra = xyes; then
-    AC_DEFINE([HAVE_LIBCANBERRA], [1], [Define if libcanberra is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_LIBCANBERRA, [test x$enable_libcanberra = xyes])
-AC_MSG_RESULT($enable_libcanberra)
-
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-
-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([config.h])
-AC_CONFIG_FILES([Makefile
-eek/Makefile
-eekboard/Makefile
-src/Makefile
-tests/Makefile
-bindings/Makefile
-bindings/vala/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/eek/Makefile
-docs/reference/eekboard/Makefile
-po/Makefile.in
-data/Makefile
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/scalable/Makefile
-data/themes/Makefile
-data/keyboards/Makefile
-examples/Makefile
-examples/simple-client/Makefile
-eek/eek-${EEK_API_VERSION}.pc
-eek/eek-gtk-${EEK_API_VERSION}.pc
-eek/eek-xkl-${EEK_API_VERSION}.pc
-eekboard/eekboard-${EEK_API_VERSION}.pc])
-AC_OUTPUT
-AC_MSG_RESULT([
-Build options:
-  Version                   $VERSION
-  Install prefix            $prefix
-  Build shared libs         $enable_shared
-  Build static libs         $enable_static
-  CFLAGS                    $CFLAGS
-  Build Vala binding        $enable_vala
-  Sound support             $enable_libcanberra
-  Build document            $enable_gtk_doc
-  Focus listeners           $focus_listeners
-  Keystroke listeners       $keystroke_listeners
-])
-
-

data/Makefile.am

@@ -1,35 +0,0 @@
-SUBDIRS = icons themes keyboards
-
-@GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_schemas_in_files = org.fedorahosted.eekboard.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = eekboard-server.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = eekboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-if ENABLE_ATSPI
-autostartdir	 = $(sysconfdir)/xdg/autostart
-autostart_in_files = eekboard-autostart.desktop.in
-autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES = $(service_DATA) $(desktop_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST = $(service_in_files) $(desktop_in_files) $(gsettings_schemas_in_files)
-
-if ENABLE_ATSPI
-CLEANFILES += $(autostart_DATA)
-EXTRA_DIST += $(autostart_in_files)
-endif
-
--include $(top_srcdir)/git.mk

data/icons/16x16/Makefile.am

@@ -1,17 +0,0 @@
-size = 16x16
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/icons/22x22/Makefile.am

@@ -1,17 +0,0 @@
-size = 22x22
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/icons/24x24/Makefile.am

@@ -1,17 +0,0 @@
-size = 24x24
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/icons/32x32/Makefile.am

@@ -1,17 +0,0 @@
-size = 32x32
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/icons/48x48/Makefile.am

@@ -1,17 +0,0 @@
-size = 48x48
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/icons/Makefile.am

@@ -1,3 +0,0 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
-
--include $(top_srcdir)/git.mk

data/icons/key-enter.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
+             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
+             C 19,13 20,12 20,10 L 20,1 Z"
+          stroke="none" fill="black" />
+</svg>

data/icons/key-shift.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
+          stroke="none" fill="black" />
+</svg>

data/icons/keyboard-mode-symbolic.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4043"
+   version="1.1"
+   viewBox="0 0 4.2333331 4.2333093"
+   height="4.2333093mm"
+   width="4.2333331mm">
+  <defs
+     id="defs4037" />
+  <metadata
+     id="metadata4040">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-86.329776,-68.097636)"
+     id="layer1">
+    <g
+       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
+       id="g842">
+      <g
+         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+         id="g836">
+        <path
+           id="path5166"
+           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
+         id="circle5168" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
+         id="path5170" />
+    </g>
+  </g>
+</svg>

data/icons/scalable/Makefile.am

@@ -1,15 +0,0 @@
-icondir = $(datadir)/icons/hicolor/scalable/apps
-dist_icon_DATA = eekboard.svg
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--include $(top_srcdir)/git.mk

data/keyboards/Makefile.am

@@ -1,40 +0,0 @@
-keyboardsdir = $(pkgdatadir)/keyboards
-
-nobase_dist_keyboards_DATA =			\
-	keyboards.xml				\
-	geometry/compact.xml			\
-	symbols/ar.xml				\
-	symbols/be.xml				\
-	symbols/fa.xml				\
-	symbols/he.xml				\
-	symbols/ja-kana.xml			\
-	symbols/kk.xml				\
-	symbols/ks.xml				\
-	symbols/my.xml				\
-	symbols/ru.xml				\
-	symbols/th.xml				\
-	symbols/ua.xml				\
-	symbols/ug.xml				\
-	symbols/us.xml				\
-	symbols/zh-bopomofo.xml			\
-	$(inscript_symbols)			\
-	$(NULL)
-
-inscript_symbols =				\
-	symbols/as-inscript.xml			\
-	symbols/bn-inscript.xml			\
-	symbols/gu-inscript.xml			\
-	symbols/hi-inscript.xml			\
-	symbols/kn-inscript.xml			\
-	symbols/ks-inscript.xml			\
-	symbols/mai-inscript.xml		\
-	symbols/ml-inscript.xml			\
-	symbols/mr-inscript.xml			\
-	symbols/or-inscript.xml			\
-	symbols/pa-inscript.xml			\
-	symbols/sd-inscript.xml			\
-	symbols/ta-inscript.xml			\
-	symbols/te-inscript.xml			\
-	$(NULL)
-
--include $(top_srcdir)/git.mk

data/keyboards/geometry/compact.xml

@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-<geometry version="0.90">
-  <bounds x="0.000000" y="0.000000" width="410.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="64" name="LALT" 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>

data/keyboards/keyboards.xml

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

data/keyboards/nb.yaml

@@ -0,0 +1,179 @@
+---
+bounds: { x: 0, y: 10, width: 426, height: 229 }
+
+outlines:
+    default:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 32, height: 52 }
+    altline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
+    outline7:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
+    spaceline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p aring"
+        - "a s d f g h j k l oslash ae"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        period    Return"
+    upper:
+        - "Q W E R T Y U I O P Aring"
+        - "A S D F G H J K L Oslash AE"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        period    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        period    Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        period    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    period:
+        outline: altline
+        label: "."
+    space:
+        outline: spaceline
+        label: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+    aring:
+        label: "å"
+    Aring:
+        label: "Å"
+    oslash:
+        label: "ø"
+    Oslash:
+        label: "Ø"
+    ae:
+        label: "æ"
+    AE:
+        label: "Æ"
+    asterisk:
+        label: "*"
+    asciitilde:
+        label: "~"
+    quoteleft:
+        label: "`"
+    bar:
+        label: "|"
+    U00B7:
+        label: "·"
+    squareroot:
+        label: "√"
+    Greek_pi:
+        label: "π"
+    division:
+        label: "÷"
+    multiply:
+        label: "×"
+    paragraph:
+        label: "¶"
+    Greek_tau:
+        label: "τ"
+    copyright:
+        label: "©"
+    numbersign:
+        label: "#"
+    U00AE:
+        label: "®"
+    at:
+        label: "@"
+    dollar:
+        label: "$"
+    U00A3:
+        label: "£"
+    percent:
+        label: "%"
+    EuroSign:
+        label: "€"
+    ampersand:
+        label: "&"
+    U00A5:
+        label: "¥"
+    minus:
+        label: "-"
+    asciicircum:
+        label: "^"
+    underscore:
+        label: "_"
+    degree:
+        label: "°"
+    plus:
+        label: "+"
+    equal:
+        label: "="
+    parenleft:
+        label: "("
+    parenright:
+        label: ")"
+    braceleft:
+        label: "{"
+    braceright:
+        label: "}"
+    comma:
+        label: ","
+    backslash:
+        label: "\\"
+    slash:
+        label: "/"
+    quotedbl:
+        label: "\""
+    quoteright:
+        label: "'"
+    less:
+        label: "<"
+    greater:
+        label: ">"
+    colon:
+        label: ":"
+    semicolon:
+        label: ";"
+    exclam:
+        label: "!"
+    question:
+        label: "?"
+    bracketleft:
+        label: "["
+    bracketright:
+        label: "]"
+

data/keyboards/number.yaml

@@ -0,0 +1,47 @@
+---
+bounds: { x: 0, y: 10, width: 410, height: 229 }
+
+outlines:
+    default:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
+    altline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
+    outline7:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
+    spaceline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
+
+views:
+    base:
+        - "1 2 3 parenleft parenright"
+        - "4 5 6 numbersign asterisk"
+        - "7 8 9 plus minus"
+        - "BackSpace 0 space Return"
+
+buttons:
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+    space:
+        outline: spaceline
+        label: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+    asterisk:
+        label: "*"
+    numbersign:
+        label: "#"
+    minus:
+        label: "-"
+    plus:
+        label: "+"
+    parenleft:
+        label: "("
+    parenright:
+        label: ")"
+

data/keyboards/symbols/us.xml

@@ -1,278 +0,0 @@
-<?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>
-  </key>
-  <key keycode="25" name="AD02">
-    <keysym keyval="119">w</keysym>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <keysym keyval="101">e</keysym>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <keysym keyval="114">r</keysym>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <keysym keyval="116">t</keysym>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <keysym keyval="121">y</keysym>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <keysym keyval="117">u</keysym>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <keysym keyval="105">i</keysym>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <keysym keyval="111">o</keysym>
-    <keysym keyval="79">O</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <keysym keyval="112">p</keysym>
-    <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="66" name="CAPS">
-    <keysym keyval="65027">ISO_Level3_Shift</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <keysym keyval="97">a</keysym>
-    <keysym keyval="65">A</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <keysym keyval="115">s</keysym>
-    <keysym keyval="83">S</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <keysym keyval="100">d</keysym>
-    <keysym keyval="68">D</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <keysym keyval="102">f</keysym>
-    <keysym keyval="70">F</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="103">g</keysym>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <keysym keyval="104">h</keysym>
-    <keysym keyval="72">H</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <keysym keyval="106">j</keysym>
-    <keysym keyval="74">J</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <keysym keyval="107">k</keysym>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <keysym keyval="108">l</keysym>
-    <keysym keyval="76">L</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>
-  </key>
-  <key keycode="53" name="AB02">
-    <keysym keyval="120">x</keysym>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <keysym keyval="99">c</keysym>
-    <keysym keyval="67">C</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <keysym keyval="118">v</keysym>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <keysym keyval="98">b</keysym>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <keysym keyval="110">n</keysym>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <keysym keyval="109">m</keysym>
-    <keysym keyval="77">M</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>

data/keyboards/us.yaml

@@ -0,0 +1,81 @@
+---
+bounds: { x: 10, y: 10, width: 410, height: 229 }
+
+outlines:
+    default:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
+    altline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
+    outline7:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
+    spaceline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: altline
+    space:
+        outline: spaceline
+        label: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"

data/meson.build

@@ -1,61 +1,12 @@
+gnome = import('gnome')
 
-install_data(
-    'themes/default.css',
-    install_dir: pkgdatadir + '/themes',
+squeekboard_resources = gnome.compile_resources(
+   'squeekboard-resources',
+   'squeekboard.gresources.xml',
+
+   c_name: 'squeekboard',
 )
 
-install_data(
-    'keyboards/keyboards.xml',
-    install_dir: pkgdatadir + '/keyboards/',
-)
-
-install_data(
-    'keyboards/geometry/compact.xml',
-    install_dir: pkgdatadir + '/keyboards/geometry/',
-)
-
-install_data('dbus/sm.puri.OSK0.xml',
-    install_dir: dbusdir
-)
-
-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',

data/sm.puri.Squeekboard.desktop.in

@@ -6,4 +6,5 @@ Exec=squeekboard
 Icon=squeekboard
 Terminal=false
 Type=Application
+NoDisplay=true
 Categories=GTK;Utility;

data/squeekboard.gresources.xml

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

data/style.css

@@ -0,0 +1,39 @@
+.keyboard {
+    background-color: rgba(0, 0, 0, 255);
+    color: #ffffff;
+    font-family: cantarell, sans-serif;
+}
+
+.key {
+    color: #deddda;
+    background: #464448;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #5e5c64;
+    border-radius: 2px;
+}
+
+.key:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}
+
+#Return {
+    background: #1c71d8;
+    border-color: #1a5fb4
+}
+
+#Return:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}
+
+#Shift_L {
+    background: #2b292f;
+    border-color: #3e3a44
+}
+
+#Shift_L:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}

data/themes/Makefile.am

@@ -1,4 +0,0 @@
-themedir = $(pkgdatadir)/themes
-dist_theme_DATA = default.css
-
--include $(top_srcdir)/git.mk

data/themes/default.css

@@ -1,18 +0,0 @@
-.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;
-}

debian/cargo/config

@@ -0,0 +1,12 @@
+# When modifying this file, consider instead
+# to take advantage of the method that Cargo packagers use
+# to set up all the necessary stuff automatically:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907629#30
+
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '/usr/share/cargo/registry'
+

debian/changelog

@@ -1,3 +1,22 @@
+squeekboard (1.2.0) unstable; urgency=medium
+
+  * Use Cargo-based dependencies
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 24 Sep 2019 10:42:15 +0000
+
+squeekboard (1.1.0) unstable; urgency=medium
+
+  * Use new keyboard layout format
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Sep 2019 10:12:02 +0000
+
+
+squeekboard (1.0.10) unstable; urgency=medium
+
+  * Use a shared DBus definition
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 02 Jul 2019 20:12:02 +0000
+
 squeekboard (1.0.9) unstable; urgency=medium
 
   * Initial release.

debian/control

@@ -3,15 +3,25 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
+ cargo,
  debhelper (>= 10),
- meson (>=0.43.0),
+ meson (>=0.51.0),
+ ninja-build,
  pkg-config,
  libglib2.0-dev,
  libgtk-3-dev,
  libcroco3-dev,
+ librust-bitflags-1-dev (>= 1.0),
+ librust-maplit-1-dev (>= 1.0),
+ librust-serde-derive-1-dev (>= 1.0),
+ librust-serde-yaml-0.8-dev (>= 0.8),
+ librust-xkbcommon-0.4+wayland-dev (>= 0.4),
  libwayland-dev (>= 1.16),
  rustc,
- wayland-protocols (>= 1.14)
+ wayland-protocols (>= 1.14),
+# for running the tests
+ xvfb,
+ xauth,
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
 

debian/copyright

@@ -1,9 +1,60 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: evscript
-Source: https://source.puri.sm/david.boddie/evscript
+Upstream-Name: squeekboard
+Source: https://source.puri.sm/Librem5/squeekboard
 
 Files: *
-Copyright: 2019 Purism SPC
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+License: GPL-3+
+
+Files: eek/layersurface.c
+       src/wayland.c
+       src/key-emitter.c
+       meson.build
+       src/meson.build
+       po/meson.build
+Copyright: 2018-2019 Purism SPC
+License: GPL-3+
+
+Files: eekboard/keymap.c
+Copyright: 2000 Red Hat, Inc.
+           2019 Purism, SPC
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Files: protocols/wlr-layer-shell-unstable-v1.xml
+Copytight: Copyright © 2017 Drew DeVault
+License: X11
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice appear in all copies and fthat both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the copyright holders not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  The copyright holders make
+ no representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied warranty.
+ .
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 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

debian/rules

@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
 
+export CARGO_HOME = $(CURDIR)/debian/cargo
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --builddirectory=_build
+	dh $@ --builddirectory=_build --buildsystem=meson
+
+# The Debian version of linked-hash-map doesn't provide any hash,
+# causing Cargo to refuse to build with a crates.io copy
+build:
+	rm Cargo.lock
+	dh $@ --builddirectory=_build --buildsystem=meson
 
 override_dh_autoreconf:

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/squeekboard.lintian-overrides

@@ -0,0 +1,2 @@
+# yaml-rust 0.4.3 shares some roots with libyaml, including the string which lintian checks, creating a false positive
+squeekboard binary: embedded-library usr/bin/squeekboard: libyaml

debian/triggers

@@ -1 +0,0 @@
-activate-noawait ldconfig

docs/Makefile.am

@@ -1,21 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-SUBDIRS = reference
-
--include $(top_srcdir)/git.mk

docs/reference/Makefile.am

@@ -1,21 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-SUBDIRS = eek eekboard
-
--include $(top_srcdir)/git.mk

docs/reference/eek/Makefile.am

@@ -1,133 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-## 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=--rebuild-types --deprecated-guards="EEK_DISABLE_DEPRECATED"
-
-# 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 = \
-	config.h \
-	eek-renderer.h \
-	eek-gtk-renderer.h \
-	eek-theme.h \
-	eek-theme-node.h \
-	eek-enumtypes.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 = $(GIO2_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/eek/libeek.la \
-	$(top_builddir)/eek/libeek-gtk.la \
-	$(top_builddir)/eek/libeek-xkl.la \
-	$(GIO2_LIBS) \
-	$(GTK_LIBS) \
-	$(LIBXKLAVIER_LIBS)
-
-# 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
-
--include $(top_srcdir)/git.mk

docs/reference/eekboard/Makefile.am

@@ -1,122 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-## 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=eekboard
-
-# 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=../../../eekboard
-
-# 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)/eekboard/*.h
-CFILE_GLOB=$(top_srcdir)/eekboard/*.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=config.h eekboard.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=eekboard-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=eekboard-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 = $(GIO2_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/eekboard/libeekboard.la $(GIO2_LIBS)
-
-# 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
-
--include $(top_srcdir)/git.mk

eek/Makefile.am

@@ -1,298 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-NULL =
-
-lib_LTLIBRARIES =				\
-	libeek.la				\
-	libeek-gtk.la				\
-	libeek-xkl.la				\
-	$(NULL)
-
-libeek_public_headers =				\
-	$(srcdir)/eek-layout.h			\
-	$(srcdir)/eek-element.h			\
-	$(srcdir)/eek-container.h		\
-	$(srcdir)/eek-keyboard.h		\
-	$(srcdir)/eek-section.h			\
-	$(srcdir)/eek-key.h			\
-	$(srcdir)/eek-symbol.h			\
-	$(srcdir)/eek-keysym.h			\
-	$(srcdir)/eek-text.h			\
-	$(srcdir)/eek-symbol-matrix.h		\
-	$(srcdir)/eek-types.h			\
-	$(srcdir)/eek-xml.h			\
-	$(srcdir)/eek-xml-layout.h		\
-	$(srcdir)/eek-serializable.h		\
-	$(srcdir)/eek-theme.h			\
-	$(srcdir)/eek.h				\
-	$(NULL)
-
-libeek_private_headers =			\
-	$(srcdir)/eek-renderer.h		\
-	$(libeek_keysym_headers)		\
-	$(builddir)/eek-marshalers.h		\
-	$(srcdir)/eek-theme-context.h		\
-	$(srcdir)/eek-theme-private.h		\
-	$(srcdir)/eek-theme-node.h		\
-	$(NULL)
-
-libeek_sources =				\
-	$(srcdir)/eek.c				\
-	$(srcdir)/eek-layout.c			\
-	$(srcdir)/eek-element.c			\
-	$(srcdir)/eek-container.c		\
-	$(srcdir)/eek-keyboard.c		\
-	$(srcdir)/eek-section.c			\
-	$(srcdir)/eek-key.c			\
-	$(srcdir)/eek-symbol-matrix.c		\
-	$(srcdir)/eek-symbol.c			\
-	$(srcdir)/eek-keysym.c			\
-	$(srcdir)/eek-text.c			\
-	$(srcdir)/eek-types.c			\
-	$(srcdir)/eek-serializable.c		\
-	$(srcdir)/eek-xml.c			\
-	$(srcdir)/eek-xml-layout.c		\
-	$(srcdir)/eek-renderer.c		\
-	$(srcdir)/eek-keyboard-drawing.c	\
-	$(srcdir)/eek-theme.c			\
-	$(srcdir)/eek-theme-context.c		\
-	$(srcdir)/eek-theme-node.c		\
-	$(NULL)
-
-libeek_keysym_headers =					\
-	$(builddir)/eek-special-keysym-entries.h	\
-	$(builddir)/eek-unicode-keysym-entries.h	\
-	$(builddir)/eek-xkeysym-keysym-entries.h	\
-	$(NULL)
-
-libeek_enumtypes_sources =			\
-	$(builddir)/eek-enumtypes.c		\
-	$(builddir)/eek-enumtypes.h		\
-	$(NULL)
-
-libeek_marshalers_sources =			\
-	$(builddir)/eek-marshalers.c		\
-	$(builddir)/eek-marshalers.h		\
-	$(NULL)
-
-BUILT_SOURCES =					\
-	$(libeek_keysym_headers)		\
-	$(libeek_enumtypes_sources)		\
-	$(libeek_marshalers_sources)		\
-	$(NULL)
-
-libeek_la_SOURCES =				\
-	$(libeek_sources)			\
-	$(builddir)/eek-enumtypes.c		\
-	$(builddir)/eek-marshalers.c		\
-	$(NULL)
-
-libeek_la_CFLAGS =					\
-	-DEEK_COMPILATION=1				\
-	-DKEYBOARDSDIR=\"$(pkgdatadir)/keyboards\"	\
-	$(GIO2_CFLAGS)					\
-	$(PANGOCAIRO_CFLAGS)				\
-	$(LIBCROCO_CFLAGS)				\
-	$(NULL)
-
-libeek_la_LIBADD =				\
-	$(GIO2_LIBS)				\
-	$(PANGOCAIRO_LIBS)			\
-	$(LIBCROCO_LIBS)			\
-	-lm					\
-	$(NULL)
-
-libeek_gtk_public_headers =			\
-	$(srcdir)/eek-gtk-keyboard.h		\
-	$(srcdir)/eek-gtk.h			\
-	$(NULL)
-libeek_gtk_private_headers =			\
-	$(srcdir)/eek-gtk-renderer.h		\
-	$(NULL)
-libeek_gtk_sources =				\
-	$(srcdir)/eek-gtk-keyboard.c		\
-	$(srcdir)/eek-gtk-renderer.c		\
-	$(NULL)
-
-libeek_gtk_la_SOURCES = $(libeek_gtk_sources)
-libeek_gtk_la_CFLAGS = -DEEK_COMPILATION=1 $(GTK_CFLAGS) $(LIBCANBERRA_CFLAGS)
-libeek_gtk_la_LIBADD = libeek.la $(GTK_LIBS) $(LIBCANBERRA_LIBS)
-
-libeek_xkl_public_headers =			\
-	$(srcdir)/eek-xkl-layout.h		\
-	$(srcdir)/eek-xkl.h			\
-	$(srcdir)/eek-xkb-layout.h		\
-	$(srcdir)/eek-xkb.h			\
-	$(NULL)
-
-libeek_xkl_sources =				\
-	$(srcdir)/eek-xkb-layout.c		\
-	$(srcdir)/eek-xkl-layout.c		\
-	$(NULL)
-
-libeek_xkl_la_SOURCES = $(libeek_xkl_sources)
-libeek_xkl_la_CFLAGS = -DEEK_COMPILATION=1 $(LIBXKLAVIER_CFLAGS)
-libeek_xkl_la_LIBADD = libeek.la $(LIBXKLAVIER_LIBS)
-
-eekdir = $(includedir)/eek-$(EEK_API_VERSION)/eek
-eek_HEADERS =					\
-	$(libeek_public_headers)		\
-	$(builddir)/eek-enumtypes.h		\
-	$(libeek_gtk_public_headers)		\
-	$(libeek_xkl_public_headers)		\
-	$(NULL)
-
-noinst_HEADERS =				\
-	$(libeek_private_headers)		\
-	$(libeek_gtk_private_headers)		\
-	$(libeek_xkl_private_headers)		\
-	$(NULL)
-
-eek-special-keysym-entries.h: special-keysym-entries.txt
-	$(AM_V_GEN) $(PYTHON) $(srcdir)/gen-keysym-entries.py \
-		special_keysym_entries \
-		< $< > $@
-eek-unicode-keysym-entries.h: unicode-keysym-entries.txt
-	$(AM_V_GEN) $(PYTHON) $(srcdir)/gen-keysym-entries.py \
-		unicode_keysym_entries \
-		< $< > $@
-eek-xkeysym-keysym-entries.h: xkeysym-keysym-entries.txt
-	$(AM_V_GEN) $(PYTHON) $(srcdir)/gen-keysym-entries.py \
-		xkeysym_keysym_entries \
-		< $< > $@
-
-eek-enumtypes.h: $(libeek_public_headers) eek-enumtypes.h.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--template $(srcdir)/eek-enumtypes.h.template \
-		$(libeek_public_headers) > eek-enumtypes.h.tmp && \
-		mv eek-enumtypes.h.tmp eek-enumtypes.h
-
-eek-enumtypes.c: $(libeek_public_headers) eek-enumtypes.c.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--template $(srcdir)/eek-enumtypes.c.template \
-		$(libeek_public_headers) > eek-enumtypes.c.tmp && \
-		mv eek-enumtypes.c.tmp eek-enumtypes.c
-
-# gen marshal
-eek-marshalers.h: eek-marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--prefix=_eek_marshal $(srcdir)/eek-marshalers.list \
-		--header --internal > $@.tmp && \
-	mv $@.tmp $@
-
-eek-marshalers.c: eek-marshalers.list eek-marshalers.h
-	$(AM_V_GEN) (echo "#include \"eek-marshalers.h\""; \
-	$(GLIB_GENMARSHAL) --prefix=_eek_marshal \
-		$(srcdir)/eek-marshalers.list --body --internal) > $@.tmp && \
-	mv $@.tmp $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =				\
-	eek-$(EEK_API_VERSION).pc		\
-	eek-gtk-$(EEK_API_VERSION).pc		\
-	eek-xkl-$(EEK_API_VERSION).pc		\
-	$(NULL)
-
-CLEANFILES =
-
-DISTCLEANFILES =				\
-	$(BUILT_SOURCES)			\
-	$(pkgconfig_DATA)			\
-	$(NULL)
-
-EXTRA_DIST =					\
-	gen-keysym-entries.py			\
-	special-keysym-entries.txt		\
-	unicode-keysym-entries.txt		\
-	xkeysym-keysym-entries.txt		\
-	eek-enumtypes.h.template		\
-	eek-enumtypes.c.template		\
-	eek-marshalers.list			\
-	$(NULL)
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(builddir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-Eek@EEK_LIBRARY_SUFFIX@.gir: libeek.la
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS =	\
-	--identifier-prefix=Eek			\
-	--symbol-prefix=eek			\
-	--pkg=glib-2.0				\
-	--pkg-export=eek-$(EEK_API_VERSION)	\
-	$(NULL)
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_CFLAGS = $(libeek_la_CFLAGS)
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_LIBS = libeek.la
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_FILES =		\
-	$(libeek_sources)			\
-	$(libeek_public_headers)		\
-	$(builddir)/eek-enumtypes.h		\
-	$(NULL)
-
-EekGtk@EEK_LIBRARY_SUFFIX@.gir: libeek-gtk.la Eek@EEK_LIBRARY_SUFFIX@.gir
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS =	\
-	--identifier-prefix=Eek			\
-	--symbol-prefix=eek			\
-	--pkg-export=eek-gtk-$(EEK_API_VERSION)	\
-	$(NULL)
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_INCLUDES =	\
-	GObject-2.0				\
-	Gtk-@GTK_API_VERSION@			\
-	Eek@EEK_LIBRARY_SUFFIX@			\
-	$(NULL)
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_CFLAGS = $(libeek_gtk_la_CFLAGS)
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_LIBS = libeek-gtk.la
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_FILES =	\
-	$(libeek_gtk_sources)			\
-	$(libeek_gtk_public_headers)		\
-	$(NULL)
-
-EekXkl@EEK_LIBRARY_SUFFIX@.gir: libeek-xkl.la Eek@EEK_LIBRARY_SUFFIX@.gir
-EekXkl@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS = \
-	--identifier-prefix=Eek			\
-	--symbol-prefix=eek			\
-	$(NULL)
-EekXkl@EEK_LIBRARY_SUFFIX_U@_gir_INCLUDES = GObject-2.0 Eek@EEK_LIBRARY_SUFFIX@
-EekXkl@EEK_LIBRARY_SUFFIX_U@_gir_CFLAGS = $(libeek_xkl_la_CFLAGS)
-EekXkl@EEK_LIBRARY_SUFFIX_U@_gir_LIBS = libeek-xkl.la
-EekXkl@EEK_LIBRARY_SUFFIX_U@_gir_FILES =	\
-	$(libeek_xkl_sources)			\
-	$(libeek_xkl_public_headers)		\
-	$(NULL)
-
-INTROSPECTION_GIRS +=				\
-	Eek@EEK_LIBRARY_SUFFIX@.gir		\
-	EekGtk@EEK_LIBRARY_SUFFIX@.gir		\
-	EekXkl@EEK_LIBRARY_SUFFIX@.gir		\
-	$(NULL)
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
-
--include $(top_srcdir)/git.mk

eek/eek-container.c

@@ -1,240 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-container
- * @short_description: Base class of a keyboard container
- *
- * The #EekContainerClass class represents a keyboard container, which
- * shall be used to implement #EekKeyboard and #EekSection.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-container.h"
-
-enum {
-    CHILD_ADDED,
-    CHILD_REMOVED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_ABSTRACT_TYPE (EekContainer, eek_container, EEK_TYPE_ELEMENT);
-
-#define EEK_CONTAINER_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CONTAINER, EekContainerPrivate))
-
-
-struct _EekContainerPrivate
-{
-    GList *head;
-    GList *last;
-};
-
-static void
-eek_container_real_add_child (EekContainer *self,
-                              EekElement   *child)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    g_object_ref (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
-eek_container_real_remove_child (EekContainer *self,
-                                 EekElement   *child)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GList *head;
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    head = g_list_find (priv->head, child);
-    g_return_if_fail (head);
-    g_object_unref (child);
-    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
-eek_container_real_foreach_child (EekContainer *self,
-                                  EekCallback   callback,
-                                  gpointer      user_data)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GList *head;
-
-    for (head = priv->head; head; head = g_list_next (head))
-        (*callback) (EEK_ELEMENT(head->data), user_data);
-}
-
-static EekElement *
-eek_container_real_find (EekContainer *self,
-                         EekCompareFunc func,
-                         gpointer user_data)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
-    GList *head;
-
-    head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
-    if (head)
-        return head->data;
-    return NULL;
-}
-
-static void
-eek_container_dispose (GObject *object)
-{
-    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
-    GList *head;
-
-    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_class_init (EekContainerClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekContainerPrivate));
-
-    klass->add_child = eek_container_real_add_child;
-    klass->remove_child = eek_container_real_remove_child;
-    klass->foreach_child = eek_container_real_foreach_child;
-    klass->find = eek_container_real_find;
-
-    /* signals */
-    klass->child_added = NULL;
-    klass->child_removed = NULL;
-
-    gobject_class->dispose = eek_container_dispose;
-
-    /**
-     * EekContainer::child-added:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-added signal is emitted each time an element is
-     * added to @container.
-     */
-    signals[CHILD_ADDED] =
-        g_signal_new (I_("child-added"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_added),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-
-    /**
-     * EekContainer::child-removed:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-removed signal is emitted each time an element is
-     * removed from @container.
-     */
-    signals[CHILD_REMOVED] =
-        g_signal_new (I_("child-removed"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_removed),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-}
-
-static void
-eek_container_init (EekContainer *self)
-{
-    self->priv = EEK_CONTAINER_GET_PRIVATE(self);
-}
-
-/**
- * eek_container_foreach_child:
- * @container: an #EekContainer
- * @callback: (scope call): an #EekCallback
- * @user_data: additional data passed to @callback
- *
- * Enumerate children of @container and run @callback with each child.
- */
-void
-eek_container_foreach_child (EekContainer *container,
-                             EekCallback   callback,
-                             gpointer      user_data)
-{
-    g_return_if_fail (EEK_IS_CONTAINER(container));
-    EEK_CONTAINER_GET_CLASS(container)->foreach_child (container,
-                                                       callback,
-                                                       user_data);
-}
-
-/**
- * eek_container_find:
- * @container: an #EekContainer
- * @func: function to be used to compare two children
- * @user_data: additional data passed to @func
- *
- * Find a child which matches the criteria supplied as @func, in @container.
- * Returns: an #EekElement or NULL on failure
- */
-EekElement *
-eek_container_find (EekContainer  *container,
-                    EekCompareFunc func,
-                    gpointer       user_data)
-{
-    g_return_val_if_fail (EEK_IS_CONTAINER(container), NULL);
-    return EEK_CONTAINER_GET_CLASS(container)->find (container,
-                                                     func,
-                                                     user_data);
-}
-
-void
-eek_container_add_child (EekContainer *container, EekElement *element)
-{
-    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);
-}

eek/eek-container.h

@@ -1,109 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_CONTAINER_H
-#define EEK_CONTAINER_H 1
-
-#include "eek-element.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_CONTAINER (eek_container_get_type())
-#define EEK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CONTAINER, EekContainer))
-#define EEK_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CONTAINER, EekContainerClass))
-#define EEK_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CONTAINER))
-#define EEK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CONTAINER))
-#define EEK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CONTAINER, EekContainerClass))
-
-typedef struct _EekContainerClass EekContainerClass;
-typedef struct _EekContainerPrivate EekContainerPrivate;
-
-/**
- * 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);
-
-struct _EekContainer
-{
-    /*< private >*/
-    EekElement parent;
-
-    EekContainerPrivate *priv;
-};
-
-/**
- * EekContainerClass:
- * @foreach_child: virtual function for iterating over the container's children
- * @find: virtual function for looking up a child
- * @child_added: class handler for #EekContainer::child-added
- * @child_removed: class handler for #EekContainer::child-added
- */
-struct _EekContainerClass
-{
-    /*< private >*/
-    EekElementClass parent_class;
-
-    void        (* add_child)      (EekContainer      *self,
-                                    EekElement        *element);
-
-    void        (* remove_child)   (EekContainer      *self,
-                                    EekElement        *element);
-
-    /*< public >*/
-    void        (* foreach_child)  (EekContainer      *self,
-                                    EekCallback        callback,
-                                    gpointer           user_data);
-    EekElement *(* find)           (EekContainer      *self,
-                                    EekCompareFunc     func,
-                                    gpointer           data);
-
-    /* signals */
-    void        (* child_added)    (EekContainer      *self,
-                                    EekElement        *element);
-    void        (* child_removed)  (EekContainer      *self,
-                                    EekElement        *element);
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType       eek_container_get_type      (void) G_GNUC_CONST;
-
-void        eek_container_foreach_child (EekContainer  *container,
-                                         EekCallback    callback,
-                                         gpointer       user_data);
-EekElement *eek_container_find          (EekContainer  *container,
-                                         EekCompareFunc func,
-                                         gpointer       user_data);
-void        eek_container_add_child     (EekContainer  *container,
-                                         EekElement    *element);
-
-G_END_DECLS
-#endif  /* EEK_CONTAINER_H */

eek/eek-element.c

@@ -26,61 +26,28 @@
  * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
  */
 
-#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
 };
 
-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))
-
-
-struct _EekElementPrivate
+typedef struct _EekElementPrivate
 {
-    gchar *name;
     EekBounds bounds;
-    EekElement *parent;
-    gint group;
-    gint level;
-};
+} EekElementPrivate;
 
-static void
-eek_element_real_symbol_index_changed (EekElement *self,
-                                       gint        group,
-                                       gint        level)
-{
-    // g_debug ("symbol-index-changed");
-}
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)
 
 static void
 eek_element_finalize (GObject *object)
 {
-    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(object);
-
-    g_free (priv->name);
     G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
 }
 
@@ -93,18 +60,9 @@ eek_element_set_property (GObject      *object,
     EekElement *element = EEK_ELEMENT(object);
 
     switch (prop_id) {
-    case PROP_NAME:
-        eek_element_set_name (element,
-                              g_value_dup_string (value));
-        break;
     case PROP_BOUNDS:
         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;
@@ -121,19 +79,10 @@ eek_element_get_property (GObject    *object,
     EekBounds bounds;
 
     switch (prop_id) {
-    case PROP_NAME:
-        g_value_set_string (value, eek_element_get_name (element));
-        break;
     case PROP_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;
@@ -146,30 +95,11 @@ eek_element_class_init (EekElementClass *klass)
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekElementPrivate));
-
     /* 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;
     gobject_class->finalize     = eek_element_finalize;
 
-    /**
-     * EekElement:name:
-     *
-     * The name of #EekElement.
-     */
-    pspec = g_param_spec_string ("name",
-                                 "Name",
-                                 "Name",
-                                 NULL,
-                                 G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_NAME,
-                                     pspec);
-
     /**
      * EekElement:bounds:
      *
@@ -183,139 +113,12 @@ 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
 eek_element_init (EekElement *self)
 {
-    EekElementPrivate *priv;
-
-    priv = self->priv = EEK_ELEMENT_GET_PRIVATE(self);
-    priv->group = -1;
-    priv->level = -1;
-}
-
-/**
- * eek_element_set_parent:
- * @element: an #EekElement
- * @parent: (allow-none): an #EekElement or %NULL
- *
- * Set the parent of @element to @parent.
- */
-void
-eek_element_set_parent (EekElement *element,
-                        EekElement *parent)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (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;
-}
-
-/**
- * eek_element_get_parent:
- * @element: an #EekElement
- *
- * Get the parent of @element.
- * Returns: an #EekElement if the parent is set
- */
-EekElement *
-eek_element_get_parent (EekElement *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-    return element->priv->parent;
-}
-
-/**
- * eek_element_set_name:
- * @element: an #EekElement
- * @name: name of @element
- *
- * Set the name of @element to @name.
- */
-void
-eek_element_set_name (EekElement  *element,
-                      const gchar *name)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_free (element->priv->name);
-    element->priv->name = g_strdup (name);
-}
-
-/**
- * eek_element_get_name:
- * @element: an #EekElement
- *
- * Get the name of @element.
- * Returns: the name of @element or NULL when the name is not set
- */
-const gchar *
-eek_element_get_name (EekElement  *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-    return element->priv->name;
+    (void)self;
 }
 
 /**
@@ -332,7 +135,10 @@ eek_element_set_bounds (EekElement  *element,
                         EekBounds   *bounds)
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
-    memcpy (&element->priv->bounds, bounds, sizeof(EekBounds));
+
+    EekElementPrivate *priv = eek_element_get_instance_private (element);
+
+    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
 }
 
 /**
@@ -350,201 +156,8 @@ eek_element_get_bounds (EekElement  *element,
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
     g_return_if_fail (bounds != NULL);
-    memcpy (bounds, &element->priv->bounds, sizeof(EekBounds));
-}
-
-/**
- * eek_element_get_absolute_position:
- * @element: an #EekElement
- * @x: pointer where the X coordinate of @element will be stored
- * @y: pointer where the Y coordinate of @element will be stored
- *
- * Compute the absolute position of @element.
- */
-void
-eek_element_get_absolute_position (EekElement *element,
-                                   gdouble    *x,
-                                   gdouble    *y)
-{
-    EekBounds bounds;
-    gdouble ax = 0.0, ay = 0.0;
-
-    do {
-        eek_element_get_bounds (element, &bounds);
-        ax += bounds.x;
-        ay += bounds.y;
-    } while ((element = eek_element_get_parent (element)) != NULL);
-    *x = ax;
-    *y = ay;
-}
-
-/**
- * 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;
+
+    EekElementPrivate *priv = eek_element_get_instance_private (element);
+
+    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
 }

eek/eek-element.h

@@ -30,39 +30,16 @@
 
 G_BEGIN_DECLS
 #define EEK_TYPE_ELEMENT (eek_element_get_type())
-#define EEK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_ELEMENT, EekElement))
-#define EEK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_ELEMENT, EekElementClass))
-#define EEK_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_ELEMENT))
-#define EEK_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_ELEMENT))
-#define EEK_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_ELEMENT, EekElementClass))
-
-typedef struct _EekElementClass   EekElementClass;
-typedef struct _EekElementPrivate EekElementPrivate;
-
-struct _EekElement
-{
-    /*< private >*/
-    GObject parent;
-
-    EekElementPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)
 
 struct _EekElementClass
 {
     /*< private >*/
     GObjectClass parent_class;
-
-    /* signals */
-    void                  (* symbol_index_changed) (EekElement  *self,
-                                                    gint         group,
-                                                    gint         level);
 };
 
 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);
 
@@ -74,29 +51,5 @@ void         eek_element_set_bounds            (EekElement  *element,
 void         eek_element_get_bounds            (EekElement  *element,
                                                 EekBounds   *bounds);
 
-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 */

eek/eek-gtk-keyboard.c

@@ -23,70 +23,53 @@
  * @short_description: a #GtkWidget displaying #EekKeyboard
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
 
+#include <math.h>
 #include <string.h>
 
-#include "eek-gtk-keyboard.h"
-#include "eek-gtk-renderer.h"
+#include "eek-renderer.h"
 #include "eek-keyboard.h"
-#include "eek-section.h"
-#include "eek-key.h"
-#include "eek-symbol.h"
+
+#include "eek-gtk-keyboard.h"
 
 enum {
     PROP_0,
-    PROP_KEYBOARD,
     PROP_LAST
 };
 
-G_DEFINE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA);
-
-#define EEK_GTK_KEYBOARD_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardPrivate))
-
 /* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
    GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif
 
-struct _EekGtkKeyboardPrivate
+typedef struct _EekGtkKeyboardPrivate
 {
     EekRenderer *renderer;
-    EekKeyboard *keyboard;
-    gulong key_locked_handler;
-    gulong key_unlocked_handler;
-    gulong symbol_index_changed_handler;
-    EekTheme *theme;
-};
+    LevelKeyboard *keyboard;
+    GtkCssProvider *css_provider;
+    GtkStyleContext *scontext;
 
-static void       on_key_pressed          (EekKey      *key,
-                                           EekGtkKeyboard *self);
-static void       on_key_released         (EekKey      *key,
-                                           EekGtkKeyboard *self);
-static void       on_key_locked          (EekKeyboard *keyboard,
-                                           EekKey      *key,
-                                           gpointer     user_data);
-static void       on_key_unlocked         (EekKeyboard *keyboard,
-                                           EekKey      *key,
-                                           gpointer     user_data);
-static void       on_symbol_index_changed (EekKeyboard *keyboard,
-                                           gint         group,
-                                           gint         level,
-                                           gpointer     user_data);
-static void       render_pressed_key      (GtkWidget   *widget,
-                                           EekKey      *key);
-static void       render_locked_key       (GtkWidget   *widget,
-                                           EekKey      *key);
-static void       render_released_key     (GtkWidget   *widget,
-                                           EekKey      *key);
+    GdkEventSequence *sequence; // unowned reference
+} EekGtkKeyboardPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
+
+static void       on_button_pressed          (struct squeek_button *button, struct squeek_view *view,
+                                              EekGtkKeyboard *self);
+static void       on_button_released         (const struct squeek_button *button,
+                                              struct squeek_view *view,
+                                              EekGtkKeyboard *self);
+static void       render_pressed_button      (GtkWidget *widget, struct button_place *place);
+static void       render_locked_button       (GtkWidget *widget,
+                                              struct button_place *place);
+static void       render_released_button     (GtkWidget *widget,
+                                              const struct squeek_button *button);
 
 static void
 eek_gtk_keyboard_real_realize (GtkWidget      *self)
@@ -97,7 +80,8 @@ eek_gtk_keyboard_real_realize (GtkWidget      *self)
                            GDK_KEY_RELEASE_MASK |
                            GDK_BUTTON_PRESS_MASK |
                            GDK_BUTTON_RELEASE_MASK |
-                           GDK_BUTTON_MOTION_MASK);
+                           GDK_BUTTON_MOTION_MASK |
+                           GDK_TOUCH_MASK);
 
     GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
 }
@@ -106,40 +90,46 @@ static gboolean
 eek_gtk_keyboard_real_draw (GtkWidget *self,
                             cairo_t   *cr)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    EekGtkKeyboardPrivate *priv =
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
     GtkAllocation allocation;
-    GList *list, *head;
-
     gtk_widget_get_allocation (self, &allocation);
 
     if (!priv->renderer) {
-        PangoContext *pcontext;
+        PangoContext *pcontext = gtk_widget_get_pango_context (self);
 
-        pcontext = gtk_widget_get_pango_context (self);
-        priv->renderer = eek_gtk_renderer_new (priv->keyboard, pcontext, self);
-        if (priv->theme)
-            eek_renderer_set_theme (priv->renderer, priv->theme);
+        priv->renderer = eek_renderer_new (priv->keyboard, pcontext, priv->scontext);
 
         eek_renderer_set_allocation_size (priv->renderer,
                                           allocation.width,
                                           allocation.height);
+        eek_renderer_set_scale_factor (priv->renderer,
+                                       gtk_widget_get_scale_factor (self));
     }
 
     eek_renderer_render_keyboard (priv->renderer, cr);
 
+    struct squeek_view *view = squeek_layout_get_current_view(priv->keyboard->layout);
+
     /* redraw pressed key */
-    list = eek_keyboard_get_pressed_keys (priv->keyboard);
-    for (head = list; head; head = g_list_next (head)) {
-        render_pressed_key (self, head->data);
+    const GList *list = priv->keyboard->pressed_keys;
+    for (const GList *head = list; head; head = g_list_next (head)) {
+        struct button_place place = squeek_view_find_key(
+            view, head->data
+        );
+        if (place.button)
+            render_pressed_button (self, &place);
     }
-    g_list_free (list);
 
     /* redraw locked key */
-    list = eek_keyboard_get_locked_keys (priv->keyboard);
-    for (head = list; head; head = g_list_next (head)) {
-        render_locked_key (self, ((EekModifierKey *)head->data)->key);
+    list = priv->keyboard->locked_keys;
+    for (const GList *head = list; head; head = g_list_next (head)) {
+        struct button_place place = squeek_view_find_key(
+            view, ((EekModifierKey *)head->data)->key
+        );
+        if (place.button)
+            render_locked_button (self, &place);
     }
-    g_list_free (list);
 
     return FALSE;
 }
@@ -148,7 +138,8 @@ static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                      GtkAllocation *allocation)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    EekGtkKeyboardPrivate *priv =
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
 
     if (priv->renderer)
         eek_renderer_set_allocation_size (priv->renderer,
@@ -160,50 +151,85 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
 }
 
 static void depress(EekGtkKeyboard *self,
-                    gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
-    if (key) {
-        eek_keyboard_press_key(priv->keyboard, key, time);
-        on_key_pressed(key, self);
+                    gdouble x, gdouble y, guint32 time)
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    struct squeek_view *view = level_keyboard_current(priv->keyboard);
+    struct squeek_button *button = eek_renderer_find_button_by_position (priv->renderer, view, x, y);
+
+    if (button) {
+        eek_keyboard_press_key(
+            priv->keyboard,
+            squeek_button_get_key(button),
+            time
+        );
+        on_button_pressed(button, view, self);
     }
 }
 
 static void drag(EekGtkKeyboard *self,
-                 gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
+                 gdouble x, gdouble y, guint32 time)
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    struct squeek_view *view = level_keyboard_current(priv->keyboard);
+    struct squeek_button *button = eek_renderer_find_button_by_position (priv->renderer, view, x, y);
+    GList *list, *head;
 
-    if (key) {
-        GList *list, *head;
+    list = g_list_copy(priv->keyboard->pressed_keys);
+
+    if (button) {
         gboolean found = FALSE;
 
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
         for (head = list; head; head = g_list_next (head)) {
-            if (head->data == key)
+            struct squeek_key *key = head->data;
+            if (squeek_button_has_key(button, key)) {
                 found = TRUE;
-            else {
-                eek_keyboard_release_key(priv->keyboard, EEK_KEY(head->data), time);
-                on_key_released(key, self);
+            } else {
+                eek_keyboard_release_key(priv->keyboard, key, time);
+                // The released handler proceeds to ignore this info...
+                // let's do this for consistency nevertheless
+                struct button_place place = squeek_view_find_key(view, key);
+                on_button_released(place.button, view, self);
             }
         }
         g_list_free (list);
 
         if (!found) {
-            eek_keyboard_press_key(priv->keyboard, key, time);
-            on_key_pressed(key, self);
+            eek_keyboard_press_key(
+                priv->keyboard,
+                squeek_button_get_key(button),
+                time
+            );
+
+            on_button_pressed(button, view, self);
         }
+    } else {
+        for (head = list; head; head = g_list_next (head)) {
+            struct squeek_key *key = head->data;
+            eek_keyboard_release_key(priv->keyboard, key, time);
+            // The released handler proceeds to ignore this info...
+            // let's do this for consistency nevertheless
+            struct button_place place = squeek_view_find_key(view, key);
+            on_button_released(place.button, view, self);
+        }
+        g_list_free (list);
     }
 }
 
-static void release(EekGtkKeyboard *self, guint32 time) {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+static void release(EekGtkKeyboard *self, guint32 time)
+{
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
-    GList *list = eek_keyboard_get_pressed_keys (priv->keyboard);
+    struct squeek_view *view = level_keyboard_current(priv->keyboard);
+
+    GList *list = g_list_copy(priv->keyboard->pressed_keys);
     for (GList *head = list; head; head = g_list_next (head)) {
-        EekKey *key = EEK_KEY(head->data);
+        struct squeek_key *key = head->data;
         eek_keyboard_release_key(priv->keyboard, key, time);
-        on_key_released(key, self);
+        // The released handler proceeds to ignore this info...
+        // let's do this for consistency nevertheless
+        struct button_place place = squeek_view_find_key(view, key);
+        on_button_released(place.button, view, self);
     }
     g_list_free (list);
 }
@@ -242,113 +268,65 @@ eek_gtk_keyboard_real_motion_notify_event (GtkWidget      *self,
 
 // Only one touch stream at a time allowed. Others will be completely ignored.
 static gboolean
-handle_touch_event (GtkWidget      *widget,
-                    GdkEventTouch *event) {
-    EekGtkKeyboard *self = EEK_GTK_KEYBOARD(widget);
+handle_touch_event (GtkWidget     *widget,
+                    GdkEventTouch *event)
+{
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+
+    /* For each new touch, release the previous one and record the new event
+       sequence. */
     if (event->type == GDK_TOUCH_BEGIN) {
-        if (self->sequence) {
-            // Ignore second and following touch points
-            return FALSE;
-        }
-        self->sequence = event->sequence;
+        release(self, event->time);
+        priv->sequence = event->sequence;
         depress(self, event->x, event->y, event->time);
         return TRUE;
     }
 
-    if (self->sequence != event->sequence) {
-        return FALSE;
-    }
-
-    if (event->type == GDK_TOUCH_UPDATE) {
+    /* Only allow the latest touch point to be dragged. */
+    if (event->type == GDK_TOUCH_UPDATE && event->sequence == priv->sequence) {
         drag(self, event->x, event->y, event->time);
     }
-    if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
+    else if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
         // TODO: can the event have different coords than the previous update event?
-        release(self, event->time);
-        self->sequence = NULL;
+        /* Only respond to the release of the latest touch point. Previous
+           touches have already been released. */
+        if (event->sequence == priv->sequence) {
+            release(self, event->time);
+            priv->sequence = NULL;
+        }
     }
     return TRUE;
 }
 
-
 static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    EekGtkKeyboardPrivate *priv =
+	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
 
     if (priv->keyboard) {
-        GList *list, *head;
+        GList *head;
 
-        /* Make a copy of HEAD before sending "released" signal on
-           elements, so that the default handler of
-           EekKeyboard::key-released signal can remove elements from its
-           internal copy */
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
-        for (head = list; head; head = g_list_next (head)) {
-            g_log("squeek", G_LOG_LEVEL_DEBUG, "emit EekKey released");
-            g_signal_emit_by_name (head->data, "released");
+        for (head = priv->keyboard->pressed_keys; head; head = g_list_next (head)) {
+            /* Unlike other places where we call this, we don't call
+               on_button_released afterwards since we don't want to queue a
+               redraw. */
+            eek_keyboard_release_key(priv->keyboard, head->data,
+                                        gdk_event_get_time(NULL));
         }
-        g_list_free (list);
     }
 
     GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->unmap (self);
 }
 
-static gboolean
-eek_gtk_keyboard_real_query_tooltip (GtkWidget  *widget,
-                                     gint        x,
-                                     gint        y,
-                                     gboolean    keyboard_tooltip,
-                                     GtkTooltip *tooltip)
-{
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekKey *key;
-
-    key = eek_renderer_find_key_by_position (priv->renderer,
-                                             (gdouble)x,
-                                             (gdouble)y);
-    if (key) {
-        EekSymbol *symbol = eek_key_get_symbol (key);
-        const gchar *text = eek_symbol_get_tooltip (symbol);
-        if (text) {
-            gtk_tooltip_set_text (tooltip, text);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-static void
-eek_gtk_keyboard_set_keyboard (EekGtkKeyboard *self,
-                               EekKeyboard    *keyboard)
-{
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-    priv->keyboard = g_object_ref (keyboard);
-
-    priv->key_locked_handler =
-        g_signal_connect (priv->keyboard, "key-locked",
-                          G_CALLBACK(on_key_locked), self);
-    priv->key_unlocked_handler =
-        g_signal_connect (priv->keyboard, "key-unlocked",
-                          G_CALLBACK(on_key_unlocked), self);
-    priv->symbol_index_changed_handler =
-        g_signal_connect (priv->keyboard, "symbol-index-changed",
-                          G_CALLBACK(on_symbol_index_changed), self);
-}
-
 static void
 eek_gtk_keyboard_set_property (GObject      *object,
                                guint         prop_id,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
-    EekKeyboard *keyboard;
-
     switch (prop_id) {
-    case PROP_KEYBOARD:
-        keyboard = g_value_get_object (value);
-        eek_gtk_keyboard_set_keyboard (EEK_GTK_KEYBOARD(object), keyboard);
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -358,45 +336,26 @@ eek_gtk_keyboard_set_property (GObject      *object,
 static void
 eek_gtk_keyboard_dispose (GObject *object)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(object);
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (object);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
     if (priv->renderer) {
         g_object_unref (priv->renderer);
         priv->renderer = NULL;
+        priv->renderer = NULL;
     }
 
     if (priv->keyboard) {
-        if (g_signal_handler_is_connected (priv->keyboard,
-                                           priv->key_locked_handler))
-            g_signal_handler_disconnect (priv->keyboard,
-                                         priv->key_locked_handler);
-        if (g_signal_handler_is_connected (priv->keyboard,
-                                           priv->key_unlocked_handler))
-            g_signal_handler_disconnect (priv->keyboard,
-                                         priv->key_unlocked_handler);
-        if (g_signal_handler_is_connected (priv->keyboard,
-                                           priv->symbol_index_changed_handler))
-            g_signal_handler_disconnect (priv->keyboard,
-                                         priv->symbol_index_changed_handler);
+        GList *head;
 
-        GList *list, *head;
-
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
-        for (head = list; head; head = g_list_next (head)) {
-            g_log("squeek", G_LOG_LEVEL_DEBUG, "emit EekKey pressed");
-            g_signal_emit_by_name (head->data, "released", priv->keyboard);
+        for (head = priv->keyboard->pressed_keys; head; head = g_list_next (head)) {
+            eek_keyboard_release_key(priv->keyboard, head->data,
+                                        gdk_event_get_time(NULL));
         }
-        g_list_free (list);
 
-        g_object_unref (priv->keyboard);
         priv->keyboard = NULL;
     }
 
-    if (priv->theme) {
-        g_object_unref (priv->theme);
-        priv->theme = NULL;
-    }
-
     G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }
 
@@ -405,10 +364,6 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 {
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec *pspec;
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekGtkKeyboardPrivate));
 
     widget_class->realize = eek_gtk_keyboard_real_realize;
     widget_class->unmap = eek_gtk_keyboard_real_unmap;
@@ -420,27 +375,29 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
         eek_gtk_keyboard_real_button_release_event;
     widget_class->motion_notify_event =
         eek_gtk_keyboard_real_motion_notify_event;
-    widget_class->query_tooltip =
-        eek_gtk_keyboard_real_query_tooltip;
     widget_class->touch_event = handle_touch_event;
 
     gobject_class->set_property = eek_gtk_keyboard_set_property;
     gobject_class->dispose = eek_gtk_keyboard_dispose;
-
-    pspec = g_param_spec_object ("keyboard",
-                                 "Keyboard",
-                                 "Keyboard",
-                                 EEK_TYPE_KEYBOARD,
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_KEYBOARD,
-                                     pspec);
 }
 
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    self->priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+
+    /* Create a default CSS provider and load a style sheet */
+    priv->css_provider = gtk_css_provider_new ();
+    gtk_css_provider_load_from_resource (priv->css_provider,
+        "/sm/puri/squeekboard/style.css");
+
+    /* Apply the style to the widget */
+    priv->scontext = gtk_widget_get_style_context (GTK_WIDGET(self));
+    gtk_style_context_add_class (priv->scontext, "keyboard");
+    gtk_style_context_add_provider (priv->scontext,
+        GTK_STYLE_PROVIDER(priv->css_provider),
+        GTK_STYLE_PROVIDER_PRIORITY_USER);
+    gtk_style_context_set_state (priv->scontext, GTK_STATE_FLAG_NORMAL);
 }
 
 /**
@@ -451,121 +408,94 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
  * Returns: a #GtkWidget
  */
 GtkWidget *
-eek_gtk_keyboard_new (EekKeyboard *keyboard)
+eek_gtk_keyboard_new (LevelKeyboard *keyboard)
 {
-    return g_object_new (EEK_TYPE_GTK_KEYBOARD, "keyboard", keyboard, NULL);
+    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
+    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
+    priv->keyboard = keyboard;
+    return GTK_WIDGET(ret);
 }
 
 static void
-magnify_bounds (GtkWidget *self,
-                EekBounds *bounds,
-                EekBounds *large_bounds,
-                gdouble    scale)
+render_pressed_button (GtkWidget *widget,
+                       struct button_place *place)
 {
-    GtkAllocation allocation;
-    gdouble x, y;
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
-    g_assert (scale >= 1.0);
+    GdkWindow         *window  = gtk_widget_get_window (widget);
+    cairo_region_t    *region  = gdk_window_get_clip_region (window);
+    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
+    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
 
-    gtk_widget_get_allocation (self, &allocation);
-
-    large_bounds->width = bounds->width * scale;
-    large_bounds->height = bounds->height * scale;
-
-    x = bounds->x - (large_bounds->width - bounds->width) / 2;
-    y = bounds->y - large_bounds->height;
-
-    large_bounds->x = CLAMP(x, 0, allocation.width - large_bounds->width);
-    large_bounds->y = CLAMP(y, 0, allocation.height - large_bounds->height);
-}
-
-static void
-render_pressed_key (GtkWidget *widget,
-                    EekKey    *key)
-{
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekBounds bounds, large_bounds;
-
-    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (widget, &bounds, &large_bounds, 1.5);
-
-    GdkWindow *window = GDK_DRAWABLE (gtk_widget_get_window (widget));
-    cairo_region_t *region = gdk_window_get_clip_region (window);
-
-    GdkDrawingContext *context = gdk_window_begin_draw_frame(
-        window, region
-    );
-    cairo_t *cr = gdk_drawing_context_get_cairo_context(context);
-    cairo_save (cr);
-    cairo_translate (cr, bounds.x, bounds.y);
-    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
-    cairo_restore (cr);
-
-    cairo_save (cr);
-    cairo_translate (cr, large_bounds.x, large_bounds.y);
+    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
+/*
     eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
-    cairo_restore (cr);
+*/
+    gdk_window_end_draw_frame (window, context);
 
-    gdk_window_end_draw_frame(window, context);
-    cairo_region_destroy(region);
+    cairo_region_destroy (region);
 }
 
 static void
-render_locked_key (GtkWidget *widget,
-                   EekKey    *key)
+render_locked_button (GtkWidget *widget, struct button_place *place)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekBounds bounds;
-    cairo_t *cr;
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
-    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
+    GdkWindow         *window  = gtk_widget_get_window (widget);
+    cairo_region_t    *region  = gdk_window_get_clip_region (window);
+    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
+    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
 
-    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    cairo_translate (cr, bounds.x, bounds.y);
-    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
+    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
 
-    cairo_destroy (cr);
+    gdk_window_end_draw_frame (window, context);
+
+    cairo_region_destroy (region);
 }
 
+// TODO: does it really redraw the entire keyboard?
 static void
-render_released_key (GtkWidget *widget,
-                     EekKey    *key)
+render_released_button (GtkWidget *widget,
+                        const struct squeek_button *button)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekBounds bounds, large_bounds;
-    cairo_t *cr;
+    (void)button;
+    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
-    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
-
-    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (widget, &bounds, &large_bounds, 2.0);
-    cairo_rectangle (cr,
-                     large_bounds.x,
-                     large_bounds.y,
-                     large_bounds.width,
-                     large_bounds.height);
-    cairo_rectangle (cr,
-                     bounds.x,
-                     bounds.y,
-                     bounds.width,
-                     bounds.height);
-    cairo_clip (cr);
+    GdkWindow         *window  = gtk_widget_get_window (widget);
+    cairo_region_t    *region  = gdk_window_get_clip_region (window);
+    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
+    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
 
     eek_renderer_render_keyboard (priv->renderer, cr);
-    cairo_destroy (cr);
+
+    gdk_window_end_draw_frame (window, context);
+
+    cairo_region_destroy (region);
 }
 
 static void
-on_key_pressed (EekKey      *key,
-                EekGtkKeyboard *self)
+on_button_pressed (struct squeek_button *button,
+                   struct squeek_view *view,
+                   EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
         return;
 
-    render_pressed_key (GTK_WIDGET(self), key);
+    struct button_place place = {
+        .button = button,
+        .row = squeek_view_get_row(view, button),
+    };
+    if (!place.row) {
+        return;
+    }
+    render_pressed_button (GTK_WIDGET(self), &place);
+    gtk_widget_queue_draw (GTK_WIDGET(self));
 
 #if HAVE_LIBCANBERRA
     ca_gtk_play_for_widget (widget, 0,
@@ -577,16 +507,19 @@ on_key_pressed (EekKey      *key,
 }
 
 static void
-on_key_released (EekKey      *key,
-                 EekGtkKeyboard *self)
+on_button_released (const struct squeek_button *button,
+                    struct squeek_view *view,
+                    EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
+    (void)view;
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
         return;
 
-    render_released_key (GTK_WIDGET(self), key);
+    render_released_button (GTK_WIDGET(self), button);
+    gtk_widget_queue_draw (GTK_WIDGET(self));
 
 #if HAVE_LIBCANBERRA
     ca_gtk_play_for_widget (widget, 0,
@@ -596,57 +529,3 @@ on_key_released (EekKey      *key,
                             NULL);
 #endif
 }
-
-static void
-on_key_locked (EekKeyboard *keyboard,
-               EekKey      *key,
-               gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_locked_key (widget, key);
-}
-
-static void
-on_key_unlocked (EekKeyboard *keyboard,
-                 EekKey      *key,
-                 gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_released_key (widget, key);
-}
-
-static void
-on_symbol_index_changed (EekKeyboard *keyboard,
-                         gint         group,
-                         gint         level,
-                         gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-
-    gtk_widget_queue_draw (widget);
-}
-
-void
-eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
-                            EekTheme       *theme)
-{
-    EekGtkKeyboardPrivate *priv;
-
-    g_return_if_fail (EEK_IS_GTK_KEYBOARD(keyboard));
-    g_return_if_fail (EEK_IS_THEME(theme));
-
-    priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
-    priv->theme = g_object_ref (theme);
-}

eek/eek-gtk-keyboard.h

@@ -32,25 +32,7 @@
 
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
-#define EEK_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboard))
-#define EEK_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
-#define EEK_IS_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_KEYBOARD))
-#define EEK_IS_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_KEYBOARD))
-#define EEK_GTK_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
-
-typedef struct _EekGtkKeyboard EekGtkKeyboard;
-typedef struct _EekGtkKeyboardClass EekGtkKeyboardClass;
-typedef struct _EekGtkKeyboardPrivate EekGtkKeyboardPrivate;
-
-struct _EekGtkKeyboard
-{
-    /*< private >*/
-    GtkDrawingArea parent;
-
-    GdkEventSequence *sequence; // unowned reference
-
-    EekGtkKeyboardPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK, GTK_KEYBOARD, GtkDrawingArea)
 
 struct _EekGtkKeyboardClass
 {
@@ -63,9 +45,7 @@ struct _EekGtkKeyboardClass
 };
 
 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);
+GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard);
 
 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */

eek/eek-gtk-renderer.c

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

eek/eek-gtk-renderer.h

@@ -1,61 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#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 */

eek/eek-key.c

@@ -1,589 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-key
- * @short_description: Base class of a key
- *
- * The #EekKeyClass class represents a key.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include <string.h>
-
-#include "eek-key.h"
-#include "eek-section.h"
-#include "eek-keyboard.h"
-#include "eek-symbol.h"
-
-enum {
-    PROP_0,
-    PROP_KEYCODE,
-    PROP_SYMBOL_MATRIX,
-    PROP_COLUMN,
-    PROP_ROW,
-    PROP_OREF,
-    PROP_LAST
-};
-
-enum {
-    LOCKED,
-    UNLOCKED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (EekKey, eek_key, EEK_TYPE_ELEMENT);
-
-#define EEK_KEY_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEY, EekKeyPrivate))
-
-
-struct _EekKeyPrivate
-{
-    guint keycode;
-    EekSymbolMatrix *symbol_matrix;
-    gint column;
-    gint row;
-    gulong oref; // UI outline reference
-    gboolean is_pressed;
-    gboolean is_locked;
-};
-
-static void
-eek_key_real_locked (EekKey *self)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-
-    priv->is_locked = TRUE;
-#if DEBUG
-    g_debug ("locked %X", eek_key_get_keycode (self));
-#endif
-}
-
-static void
-eek_key_real_unlocked (EekKey *self)
-{
-    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
-
-    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);
-    eek_symbol_matrix_free (priv->symbol_matrix);
-    G_OBJECT_CLASS (eek_key_parent_class)->finalize (object);
-}
-
-static void
-eek_key_set_property (GObject      *object,
-                      guint         prop_id,
-                      const GValue *value,
-                      GParamSpec   *pspec)
-{
-    EekSymbolMatrix *matrix;
-    gint column, row;
-
-    switch (prop_id) {
-    case PROP_KEYCODE:
-        eek_key_set_keycode (EEK_KEY(object), g_value_get_uint (value));
-        break;
-    case PROP_SYMBOL_MATRIX:
-        matrix = g_value_get_boxed (value);
-        eek_key_set_symbol_matrix (EEK_KEY(object), matrix);
-        break;
-    case PROP_COLUMN:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        eek_key_set_index (EEK_KEY(object), g_value_get_int (value), row);
-        break;
-    case PROP_ROW:
-        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_OREF:
-        eek_key_set_oref (EEK_KEY(object), g_value_get_uint (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_key_get_property (GObject    *object,
-                      guint       prop_id,
-                      GValue     *value,
-                      GParamSpec *pspec)
-{
-    gint column, row;
-
-    switch (prop_id) {
-    case PROP_KEYCODE:
-        g_value_set_uint (value, eek_key_get_keycode (EEK_KEY(object)));
-        break;
-    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);
-        g_value_set_int (value, column);
-        break;
-    case PROP_ROW:
-        eek_key_get_index (EEK_KEY(object), &column, &row);
-        g_value_set_int (value, row);
-        break;
-    case PROP_OREF:
-        g_value_set_uint (value, eek_key_get_oref (EEK_KEY(object)));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_key_class_init (EekKeyClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec        *pspec;
-
-    g_type_class_add_private (gobject_class,
-                              sizeof (EekKeyPrivate));
-
-    gobject_class->set_property = eek_key_set_property;
-    gobject_class->get_property = eek_key_get_property;
-    gobject_class->finalize     = eek_key_finalize;
-
-    /* signals */
-    klass->locked = eek_key_real_locked;
-    klass->unlocked = eek_key_real_unlocked;
-
-    /**
-     * EekKey:keycode:
-     *
-     * The keycode of #EekKey.
-     */
-    pspec = g_param_spec_uint ("keycode",
-                               "Keycode",
-                               "Keycode of the key",
-                               0, G_MAXUINT, 0,
-                               G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_KEYCODE, pspec);
-
-    /**
-     * EekKey:symbol-matrix:
-     *
-     * The symbol matrix of #EekKey.
-     */
-    pspec = g_param_spec_boxed ("symbol-matrix",
-                                "Symbol matrix",
-                                "Symbol matrix of the key",
-                                EEK_TYPE_SYMBOL_MATRIX,
-                                G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_SYMBOL_MATRIX, pspec);
-
-    /**
-     * EekKey:column:
-     *
-     * The column index of #EekKey in the parent #EekSection.
-     */
-    pspec = g_param_spec_int ("column",
-                              "Column",
-                              "Column index of the key in section",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_COLUMN, pspec);
-
-    /**
-     * EekKey:row:
-     *
-     * The row index of #EekKey in the parent #EekSection.
-     */
-    pspec = g_param_spec_int ("row",
-                              "Row",
-                              "Row index of the key in section",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_ROW, pspec);
-
-    /**
-     * EekKey:oref:
-     *
-     * The outline id of #EekKey.
-     */
-    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::locked:
-     * @key: an #EekKey
-     *
-     * 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[LOCKED] =
-        g_signal_new (I_("locked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekKeyClass, locked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-
-    /**
-     * EekKey::unlocked:
-     * @key: an #EekKey
-     *
-     * The ::unlocked signal is emitted each time @key is shifted to
-     * the unlocked state.
-     */
-   signals[UNLOCKED] =
-        g_signal_new (I_("unlocked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekKeyClass, unlocked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__VOID,
-                      G_TYPE_NONE, 0);
-}
-
-static void
-eek_key_init (EekKey *self)
-{
-    EekKeyPrivate *priv;
-
-    priv = self->priv = EEK_KEY_GET_PRIVATE(self);
-    priv->symbol_matrix = eek_symbol_matrix_new (0, 0);
-}
-
-/**
- * eek_key_set_keycode:
- * @key: an #EekKey
- * @keycode: 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));
-    key->priv->keycode = keycode;
-}
-
-/**
- * eek_key_get_keycode:
- * @key: an #EekKey
- *
- * Get keycode of @key.
- * Returns: keycode or %EEK_INVALID_KEYCODE on failure
- */
-guint
-eek_key_get_keycode (EekKey *key)
-{
-    g_return_val_if_fail (EEK_IS_KEY (key), EEK_INVALID_KEYCODE);
-    return key->priv->keycode;
-}
-
-/**
- * eek_key_set_symbol_matrix:
- * @key: an #EekKey
- * @matrix: an #EekSymbolMatrix
- *
- * Set the symbol matrix of @key to @matrix.
- */
-void
-eek_key_set_symbol_matrix (EekKey          *key,
-                           EekSymbolMatrix *matrix)
-{
-    g_return_if_fail (EEK_IS_KEY(key));
-
-    eek_symbol_matrix_free (key->priv->symbol_matrix);
-    key->priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
-}
-
-/**
- * eek_key_get_symbol_matrix:
- * @key: an #EekKey
- *
- * Get the symbol matrix of @key.
- * Returns: (transfer none): #EekSymbolMatrix or %NULL
- */
-EekSymbolMatrix *
-eek_key_get_symbol_matrix (EekKey *key)
-{
-    g_return_val_if_fail (EEK_IS_KEY(key), NULL);
-    return key->priv->symbol_matrix;
-}
-
-/**
- * eek_key_get_symbol:
- * @key: an #EekKey
- *
- * Get the current symbol of @key.
- * Return value: (transfer none): the current #EekSymbol or %NULL on failure
- */
-EekSymbol *
-eek_key_get_symbol (EekKey *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];
-}
-
-/**
- * eek_key_set_index:
- * @key: an #EekKey
- * @column: column index of @key in #EekSection
- * @row: row index of @key in #EekSection
- *
- * Set the location of @key in #EekSection with @column and @row.
- */
-void
-eek_key_set_index (EekKey *key,
-                   gint    column,
-                   gint    row)
-{
-    g_return_if_fail (EEK_IS_KEY(key));
-    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: (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 location of @key in #EekSection.
- */
-void
-eek_key_get_index (EekKey *key,
-                   gint   *column,
-                   gint   *row)
-{
-    g_return_if_fail (EEK_IS_KEY(key));
-    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_oref:
- * @key: an #EekKey
- * @oref: outline id of @key
- *
- * Set the outline id of @key to @oref.
- */
-void
-eek_key_set_oref (EekKey *key,
-                  guint   oref)
-{
-    g_return_if_fail (EEK_IS_KEY(key));
-    if (key->priv->oref != oref) {
-        key->priv->oref = oref;
-        g_object_notify (G_OBJECT(key), "oref");
-    }
-}
-
-/**
- * eek_key_get_oref:
- * @key: an #EekKey
- *
- * Get the outline id of @key.
- * Returns: unsigned integer
- */
-guint
-eek_key_get_oref (EekKey *key)
-{
-    g_return_val_if_fail (EEK_IS_KEY (key), 0);
-    return key->priv->oref;
-}
-
-/**
- * eek_key_is_pressed:
- * @key: an #EekKey
- *
- * Return %TRUE if key is marked as pressed.
- */
-gboolean
-eek_key_is_pressed (EekKey *key)
-{
-    g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
-    return key->priv->is_pressed;
-}
-
-/**
- * eek_key_is_locked:
- * @key: an #EekKey
- *
- * Return %TRUE if key is marked as locked.
- */
-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));
-    key->priv->is_pressed = value;
-}

eek/eek-key.h

@@ -1,117 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_KEY_H
-#define EEK_KEY_H 1
-
-#include "eek-element.h"
-#include "eek-symbol-matrix.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_KEY (eek_key_get_type())
-#define EEK_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEY, EekKey))
-#define EEK_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEY, EekKeyClass))
-#define EEK_IS_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEY))
-#define EEK_IS_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEY))
-#define EEK_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEY, EekKeyClass))
-
-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 >*/
-    EekElement parent;
-
-    EekKeyPrivate *priv;
-};
-
-/**
- * EekKeyClass:
- * @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
-{
-    /*< private >*/
-    EekElementClass parent_class;
-
-    /*< public >*/
-    /* signals */
-    void (* locked)    (EekKey *key);
-    void (* unlocked)  (EekKey *key);
-};
-
-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_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_oref            (EekKey          *key,
-                                              guint            oref);
-guint            eek_key_get_oref            (EekKey          *key);
-
-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 */

eek/eek-keyboard-drawing.c

@@ -17,9 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <math.h>
 #include <pango/pangocairo.h>

eek/eek-keyboard.c

@@ -27,56 +27,15 @@
  * of one or more sections of the #EekSectionClass class.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
+#include <glib/gprintf.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"
+#include "keymap.h"
+#include "src/keyboard.h"
 
-enum {
-    PROP_0,
-    PROP_LAYOUT,
-    PROP_MODIFIER_BEHAVIOR,
-    PROP_LAST
-};
-
-enum {
-    KEY_RELEASED,
-    KEY_LOCKED,
-    KEY_UNLOCKED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-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
-{
-    EekLayout *layout;
-    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;
-};
-
-G_DEFINE_BOXED_TYPE(EekModifierKey, eek_modifier_key,
-                    eek_modifier_key_copy, eek_modifier_key_free);
+#include "eek-keyboard.h"
 
 EekModifierKey *
 eek_modifier_key_copy (EekModifierKey *modkey)
@@ -87,663 +46,107 @@ eek_modifier_key_copy (EekModifierKey *modkey)
 void
 eek_modifier_key_free (EekModifierKey *modkey)
 {
-    g_object_unref (modkey->key);
     g_slice_free (EekModifierKey, modkey);
 }
 
-static void
-on_key_locked (EekSection  *section,
-                EekKey      *key,
-                EekKeyboard *keyboard)
+void
+eek_keyboard_set_key_locked (LevelKeyboard    *keyboard,
+                            struct squeek_key *key)
 {
-    g_signal_emit (keyboard, signals[KEY_LOCKED], 0, key);
+    EekModifierKey *modifier_key = g_slice_new (EekModifierKey);
+    modifier_key->modifiers = 0;
+    modifier_key->key = key;
+    keyboard->locked_keys =
+            g_list_prepend (keyboard->locked_keys, modifier_key);
+}
+
+/// Unlock all locked keys.
+/// All locked keys will unlock at the next keypress (should be called "stuck")
+/// Returns the number of handled keys
+/// TODO: may need to check key type in order to chain locks
+/// before pressing an "emitting" key
+static int unlock_keys(LevelKeyboard *keyboard) {
+    int handled = 0;
+    for (GList *head = keyboard->locked_keys; head; ) {
+        EekModifierKey *modifier_key = head->data;
+        GList *next = g_list_next (head);
+        keyboard->locked_keys =
+                g_list_remove_link (keyboard->locked_keys, head);
+        //squeek_key_set_locked(squeek_button_get_key(modifier_key->button), false);
+
+        squeek_layout_set_state_from_press(keyboard->layout, keyboard, modifier_key->key);
+        g_list_free1 (head);
+        head = next;
+        handled++;
+    }
+    return handled;
 }
 
 static void
-on_key_unlocked (EekSection  *section,
-                 EekKey      *key,
-                 EekKeyboard *keyboard)
+set_level_from_press (LevelKeyboard *keyboard, struct squeek_key *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 *
-eek_keyboard_real_create_section (EekKeyboard *self)
-{
-    EekSection *section;
-
-    section = g_object_new (EEK_TYPE_SECTION, NULL);
-    g_return_val_if_fail (section, NULL);
-
-    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));
-    return section;
-}
-
-static void
-eek_keyboard_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
-
-    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;
+    // If the currently locked key was already handled in the unlock phase,
+    // then skip
+    if (unlock_keys(keyboard) == 0) {
+        squeek_layout_set_state_from_press(keyboard->layout, keyboard, key);
     }
 }
 
-static void
-eek_keyboard_get_property (GObject    *object,
-                           guint       prop_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
+void eek_keyboard_press_key(LevelKeyboard *keyboard, struct squeek_key *key, guint32 timestamp) {
+    squeek_key_set_pressed(key, TRUE);
+    keyboard->pressed_keys = g_list_prepend (keyboard->pressed_keys, key);
 
-    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
-set_level_from_modifiers (EekKeyboard *self)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    gint level = 0;
-
-    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);
-}
-
-static void
-set_modifiers_with_key (EekKeyboard    *self,
-                        EekKey         *key,
-                        EekModifierType modifiers)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    EekModifierType enabled = (priv->modifiers ^ modifiers) & modifiers;
-    EekModifierType disabled = (priv->modifiers ^ modifiers) & priv->modifiers;
-
-    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;
-}
-
-void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp) {
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(keyboard);
-
-    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);
-    }
+    // Only take action about setting level *after* the key has taken effect, i.e. on release
+    //set_level_from_press (keyboard, key);
 
     // "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);
+    guint keycode = squeek_key_get_keycode (key);
 
-    emit_key_activated(keyboard->manager, keyboard, keycode, symbol, modifiers, TRUE, timestamp);
+    emit_key_activated(keyboard->manager, keyboard, keycode, 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);
+void eek_keyboard_release_key(LevelKeyboard *keyboard,
+                              struct squeek_key *key,
+                              guint32 timestamp) {
+    for (GList *head = keyboard->pressed_keys; head; head = g_list_next (head)) {
+        if (squeek_key_equal(head->data, key)) {
+            keyboard->pressed_keys = g_list_remove_link (keyboard->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);
+    set_level_from_press (keyboard, key);
 
     // "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);
+    guint keycode = squeek_key_get_keycode (key);
 
-    emit_key_activated(keyboard->manager, keyboard, keycode, symbol, modifiers, FALSE, timestamp);
+    emit_key_activated(keyboard->manager, keyboard, keycode, FALSE, timestamp);
 }
 
-static void
-eek_keyboard_dispose (GObject *object)
+void level_keyboard_deinit(LevelKeyboard *self) {
+    squeek_layout_free(self->layout);
+}
+
+void level_keyboard_free(LevelKeyboard *self) {
+    level_keyboard_deinit(self);
+    g_free(self);
+}
+
+void level_keyboard_init(LevelKeyboard *self, struct squeek_layout *layout) {
+    self->layout = layout;
+}
+
+LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout) {
+    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
+    level_keyboard_init(keyboard, layout);
+    keyboard->manager = manager;
+    return keyboard;
+}
+
+struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard)
 {
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
-
-    if (priv->layout) {
-        g_object_unref (priv->layout);
-        priv->layout = NULL;
-    }
-
-    G_OBJECT_CLASS (eek_keyboard_parent_class)->dispose (object);
-}
-
-static void
-eek_keyboard_finalize (GObject *object)
-{
-    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(object);
-    guint i;
-
-    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_real_child_added (EekContainer *self,
-                               EekElement   *element)
-{
-    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);
-}
-
-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->create_section = eek_keyboard_real_create_section;
-
-    /* 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:layout:
-     *
-     * The layout used to create this #EekKeyboard.
-     */
-    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_LAYOUT,
-                                     pspec);
-
-    /**
-     * EekKeyboard:modifier-behavior:
-     *
-     * The modifier handling mode of #EekKeyboard.
-     */
-    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_MODIFIER_BEHAVIOR,
-                                     pspec);
-
-    /**
-     * EekKeyboard::key-locked:
-     * @keyboard: an #EekKeyboard
-     * @key: an #EekKey
-     *
-     * The ::key-locked signal is emitted each time a key in @keyboard
-     * is shifted to the locked state.
-     */
-    signals[KEY_LOCKED] =
-        g_signal_new (I_("key-locked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekKeyboardClass, key_locked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE,
-                      1,
-                      EEK_TYPE_KEY);
-
-    /**
-     * EekKeyboard::key-unlocked:
-     * @keyboard: an #EekKeyboard
-     * @key: an #EekKey
-     *
-     * The ::key-unlocked signal is emitted each time a key in @keyboard
-     * is shifted to the unlocked state.
-     */
-    signals[KEY_UNLOCKED] =
-        g_signal_new (I_("key-unlocked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekKeyboardClass, key_unlocked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE,
-                      1,
-                      EEK_TYPE_KEY);
-}
-
-static void
-eek_keyboard_init (EekKeyboard *self)
-{
-    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);
-}
-
-/**
- * eek_keyboard_create_section:
- * @keyboard: an #EekKeyboard
- *
- * Create an #EekSection instance and append it to @keyboard.  This
- * function is rarely called by application but called by #EekLayout
- * implementation.
- */
-EekSection *
-eek_keyboard_create_section (EekKeyboard *keyboard)
-{
-    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
-    return EEK_KEYBOARD_GET_CLASS(keyboard)->create_section (keyboard);
-}
-
-/**
- * eek_keyboard_find_key_by_keycode:
- * @keyboard: an #EekKeyboard
- * @keycode: a keycode
- *
- * Find an #EekKey whose keycode is @keycode.
- * 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 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);
+    return squeek_layout_get_current_view(keyboard->layout);
 }

eek/eek-keyboard.h

@@ -27,172 +27,56 @@
 
 #include <glib-object.h>
 #include <xkbcommon/xkbcommon.h>
-#include "eek-container.h"
 #include "eek-types.h"
 #include "eek-layout.h"
+#include "src/layout.h"
 
 G_BEGIN_DECLS
 
-#define EEK_TYPE_KEYBOARD (eek_keyboard_get_type())
-#define EEK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEYBOARD, EekKeyboard))
-#define EEK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEYBOARD, EekKeyboardClass))
-#define EEK_IS_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEYBOARD))
-#define EEK_IS_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEYBOARD))
-#define EEK_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEYBOARD, EekKeyboardClass))
+struct _EekModifierKey {
+    /*< public >*/
+    EekModifierType modifiers;
+    struct squeek_key *key;
+};
+typedef struct _EekModifierKey EekModifierKey;
 
-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;
+/// Keyboard state holder
+struct _LevelKeyboard {
+    struct squeek_layout *layout;
     struct xkb_keymap *keymap;
     int keymap_fd; // keymap formatted as XKB string
     size_t keymap_len; // length of the data inside keymap_fd
 
+    GList *pressed_keys; // struct squeek_key*
+    GList *locked_keys; // struct EekModifierKey*
+
+    guint id; // as a key to layout choices
+
     EekboardContextService *manager; // unowned reference
 };
+typedef struct _LevelKeyboard LevelKeyboard;
 
-/**
- * EekKeyboardClass:
- * @create_section: virtual function for creating a section
- * @find_key_by_keycode: virtual function for finding a key in the
- * keyboard by keycode
- * @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;
-
-    /* obsolete members moved to EekElement */
-    gpointer set_symbol_index;
-    gpointer get_symbol_index;
-
-    /*< public >*/
-    EekSection *(* create_section)      (EekKeyboard *self);
-
-    EekKey     *(* find_key_by_keycode) (EekKeyboard *self,
-                                         guint        keycode);
-
-    /*< 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[21];
+/// Represents the path to the button within a view
+struct button_place {
+    const struct squeek_row *row;
+    const struct squeek_button *button;
 };
 
-/**
- * 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;
-
-
-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_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);
+void eek_keyboard_press_key(LevelKeyboard *keyboard, struct squeek_key *key, guint32 timestamp);
+void eek_keyboard_release_key(LevelKeyboard *keyboard, struct squeek_key *key, guint32 timestamp);
+
+gchar *             eek_keyboard_get_keymap
+                                     (LevelKeyboard *keyboard);
+
+struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard);
+LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
+void level_keyboard_deinit(LevelKeyboard *self);
+void level_keyboard_free(LevelKeyboard *self);
 
 G_END_DECLS
 #endif  /* EEK_KEYBOARD_H */

eek/eek-keysym.c

@@ -1,350 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-keysym
- * @short_description: an #EekSymbol represents an X keysym
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#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;
-};
-
-struct _EekKeysymEntry {
-    guint xkeysym;
-    const gchar *name;
-    EekSymbolCategory category;
-};
-
-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)) {
-        gchar *buf;
-        gint len;
-
-        len = g_unichar_to_utf8 (uc, NULL);
-        buf = g_malloc0 (len + 1);
-        g_unichar_to_utf8 (uc, buf);
-        return buf;
-    }
-    return g_strdup ("");
-}
-
-static int
-keysym_entry_compare_by_xkeysym (const void *key0, const void *key1)
-{
-    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
-get_unichar (guint xkeysym, gunichar *uc) {
-    /* Check for Latin-1 characters (1:1 mapping) */
-    if ((xkeysym >= 0x0020 && xkeysym <= 0x007e) ||
-        (xkeysym >= 0x00a0 && xkeysym <= 0x00ff)) {
-        *uc = xkeysym;
-        return TRUE;
-    }
-
-    /* Also check for directly encoded 24-bit UCS characters:
-     */
-    if ((xkeysym & 0xff000000) == 0x01000000) {
-        *uc = xkeysym & 0x00ffffff;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-G_INLINE_FUNC EekModifierType
-get_modifier_mask (guint xkeysym)
-{
-    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_MOD5_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;
-}
-
-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_new_with_modifier:
- * @xkeysym: an X keysym value
- * @modifier_mask: modifier assigned to @xkeysym
- *
- * Create an #EekKeysym with given X keysym value @xkeysym and
- * modifier @modifier_mask.
- */
-EekKeysym *
-eek_keysym_new_with_modifier (guint           xkeysym,
-                              EekModifierType modifier_mask)
-{
-    EekKeysym *keysym;
-    EekKeysymPrivate *priv;
-    EekKeysymEntry *special_entry, *xkeysym_entry, *unicode_entry,
-        *unichar_entry;
-    gchar *name, *label;
-    EekSymbolCategory category;
-    gunichar uc;
-
-    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;
-}

eek/eek-keysym.h

@@ -1,78 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_KEYSYM_H
-#define EEK_KEYSYM_H 1
-
-#include <X11/XKBlib.h>
-#include "eek-symbol.h"
-
-G_BEGIN_DECLS
-
-/**
- * EEK_INVALID_KEYSYM:
- *
- * Pseudo keysym used for error reporting.
- */
-#define EEK_INVALID_KEYSYM (0)
-
-#define EEK_TYPE_KEYSYM (eek_keysym_get_type())
-#define EEK_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEYSYM, EekKeysym))
-#define EEK_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEYSYM, EekKeysymClass))
-#define EEK_IS_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEYSYM))
-#define EEK_IS_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEYSYM))
-#define EEK_KEYSYM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEYSYM, EekKeysymClass))
-
-typedef struct _EekKeysymClass EekKeysymClass;
-typedef struct _EekKeysymPrivate EekKeysymPrivate;
-
-/**
- * EekKeysym:
- *
- * The #EekKeysym structure contains only private data and should only
- * be accessed using the provided API.
- */
-struct _EekKeysym {
-    /*< private >*/
-    EekSymbol parent;
-
-    EekKeysymPrivate *priv;
-};
-
-struct _EekKeysymClass {
-    /*< private >*/
-    EekSymbolClass parent_class;
-};
-
-GType      eek_keysym_get_type          (void) G_GNUC_CONST;
-EekKeysym *eek_keysym_new               (guint           xkeysym);
-guint      eek_keysym_get_xkeysym       (EekKeysym      *keysym);
-
-EekKeysym *eek_keysym_new_from_name     (const gchar    *name);
-EekKeysym *eek_keysym_new_with_modifier (guint           xkeysym,
-                                         EekModifierType modifier_mask);
-
-G_END_DECLS
-
-#endif  /* EEK_KEYSYM_H */

eek/eek-layout.c

@@ -26,15 +26,14 @@
  * arranges keyboard elements.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-layout.h"
 #include "eek-keyboard.h"
 #include "eekboard/eekboard-context-service.h"
+#include "eek-xml-layout.h"
 
-G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
 
 static void
 eek_layout_class_init (EekLayoutClass *klass)
@@ -46,26 +45,3 @@ void
 eek_layout_init (EekLayout *self)
 {
 }
-
-/**
- * eek_keyboard_new:
- * @layout: an #EekLayout
- * @initial_width: initial width of the keyboard
- * @initial_height: initial height of the keyboard
- *
- * Create a new #EekKeyboard based on @layout.
- */
-EekKeyboard *
-eek_keyboard_new (EekboardContextService *manager,
-                  EekLayout *layout,
-                  gdouble    initial_width,
-                  gdouble    initial_height)
-{
-    g_assert (EEK_IS_LAYOUT(layout));
-    g_assert (EEK_LAYOUT_GET_CLASS(layout)->create_keyboard);
-
-    return EEK_LAYOUT_GET_CLASS(layout)->create_keyboard (manager,
-                                                          layout,
-                                                          initial_width,
-                                                          initial_height);
-}

eek/eek-layout.h

@@ -27,24 +27,12 @@
 
 #include <glib-object.h>
 #include "eek-types.h"
+#include "src/layout.h"
 
 G_BEGIN_DECLS
 
 #define EEK_TYPE_LAYOUT (eek_layout_get_type())
-#define EEK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_LAYOUT, EekLayout))
-#define EEK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_LAYOUT, EekLayoutClass))
-#define EEK_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_LAYOUT))
-#define EEK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_LAYOUT))
-#define EEK_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_LAYOUT, EekLayoutClass))
-
-typedef struct _EekLayoutClass EekLayoutClass;
-typedef struct _EekLayout EekLayout;
-
-struct _EekLayout
-{
-    /*< private >*/
-    GObject parent;
-};
+G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
 
 /**
  * EekLayoutClass:
@@ -56,7 +44,7 @@ struct _EekLayoutClass
     GObjectClass parent_class;
 
     /*< public >*/
-    EekKeyboard* (* create_keyboard) (EekboardContextService *manager,
+    LevelKeyboard* (* create_keyboard) (EekboardContextService *manager,
                                       EekLayout *self,
                                       gdouble    initial_width,
                                       gdouble    initial_height);

eek/eek-marshalers.list

@@ -1 +0,0 @@
-VOID:INT,INT

eek/eek-renderer.h

@@ -21,49 +21,24 @@
 #ifndef EEK_RENDERER_H
 #define EEK_RENDERER_H 1
 
+#include <gtk/gtk.h>
 #include <pango/pangocairo.h>
+
 #include "eek-keyboard.h"
-#include "eek-keysym.h"
 #include "eek-types.h"
-#include "eek-theme.h"
-#include "eek-theme-context.h"
 
 G_BEGIN_DECLS
 
 #define EEK_TYPE_RENDERER (eek_renderer_get_type())
-#define EEK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_RENDERER, EekRenderer))
-#define EEK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_RENDERER, EekRendererClass))
-#define EEK_IS_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_RENDERER))
-#define EEK_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_RENDERER))
-#define EEK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_RENDERER, EekRendererClass))
-
-typedef struct _EekRenderer EekRenderer;
-typedef struct _EekRendererClass EekRendererClass;
-typedef struct _EekRendererPrivate EekRendererPrivate;
-
-struct _EekRenderer {
-    GObject parent;
-
-    EekRendererPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
 
 struct _EekRendererClass
 {
     GObjectClass parent_class;
 
-    void             (* render_key_label)   (EekRenderer *self,
-                                             PangoLayout *layout,
-                                             EekKey      *key);
-
-    void             (* render_key_outline) (EekRenderer *self,
+    void             (* render_button)         (EekRenderer *self,
                                              cairo_t     *cr,
-                                             EekKey      *key,
-                                             gdouble      scale,
-                                             gboolean     rotate);
-
-    void             (* render_key)         (EekRenderer *self,
-                                             cairo_t     *cr,
-                                             EekKey      *key,
+                                             struct button_place *place,
                                              gdouble      scale,
                                              gboolean     rotate);
 
@@ -72,7 +47,8 @@ struct _EekRendererClass
 
     cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
                                              const gchar *icon_name,
-                                             gint         size);
+                                             gint         size,
+                                             gint         scale);
 
     /*< private >*/
     /* padding */
@@ -80,8 +56,9 @@ struct _EekRendererClass
 };
 
 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
-EekRenderer     *eek_renderer_new              (EekKeyboard     *keyboard,
-                                                PangoContext    *pcontext);
+EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
+                                                PangoContext    *pcontext,
+                                                GtkStyleContext *scontext);
 void             eek_renderer_set_allocation_size
                                                (EekRenderer     *renderer,
                                                 gdouble          width,
@@ -89,35 +66,27 @@ void             eek_renderer_set_allocation_size
 void             eek_renderer_get_size         (EekRenderer     *renderer,
                                                 gdouble         *width,
                                                 gdouble         *height);
-void             eek_renderer_get_key_bounds   (EekRenderer     *renderer,
-                                                EekKey          *key,
+void             eek_renderer_get_button_bounds   (EekRenderer     *renderer,
+                                                struct button_place *button,
                                                 EekBounds       *bounds,
                                                 gboolean         rotate);
 
 gdouble          eek_renderer_get_scale        (EekRenderer     *renderer);
+void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
+                                                gint             scale);
 
 PangoLayout     *eek_renderer_create_pango_layout
                                                (EekRenderer     *renderer);
-void             eek_renderer_render_key_label (EekRenderer     *renderer,
-                                                PangoLayout     *layout,
-                                                EekKey          *key);
-
-void             eek_renderer_render_key_outline
-                                               (EekRenderer     *renderer,
+void             eek_renderer_render_button       (EekRenderer     *renderer,
                                                 cairo_t         *cr,
-                                                EekKey          *key,
-                                                gdouble          scale,
-                                                gboolean         rotate);
-
-void             eek_renderer_render_key       (EekRenderer     *renderer,
-                                                cairo_t         *cr,
-                                                EekKey          *key,
+                                                struct button_place *place,
                                                 gdouble          scale,
                                                 gboolean         rotate);
 
 cairo_surface_t *eek_renderer_get_icon_surface (EekRenderer     *renderer,
                                                 const gchar     *icon_name,
-                                                gint             size);
+                                                gint             size,
+                                                gint             scale);
 
 void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
                                                 cairo_t         *cr);
@@ -130,33 +99,18 @@ void             eek_renderer_set_default_background_color
                                                 const EekColor  *color);
 void             eek_renderer_get_foreground_color
                                                (EekRenderer     *renderer,
-                                                EekElement      *element,
+                                                GtkStyleContext *context,
                                                 EekColor        *color);
-void             eek_renderer_get_background_color
-                                               (EekRenderer     *renderer,
-                                                EekElement      *element,
-                                                EekColor        *color);
-void             eek_renderer_get_background_gradient
-                                               (EekRenderer     *renderer,
-                                                EekElement      *element,
-                                                EekGradientType *type,
-                                                EekColor        *start,
-                                                EekColor        *end);
 void             eek_renderer_set_border_width (EekRenderer     *renderer,
                                                 gdouble          border_width);
-EekKey          *eek_renderer_find_key_by_position
-                                               (EekRenderer     *renderer,
+struct squeek_button *eek_renderer_find_button_by_position(EekRenderer     *renderer, struct squeek_view *view,
                                                 gdouble          x,
                                                 gdouble          y);
-void             eek_renderer_apply_transformation_for_key
+void             eek_renderer_apply_transformation_for_button
                                                (EekRenderer     *renderer,
-                                                cairo_t         *cr,
-                                                EekKey          *key,
+                                                cairo_t         *cr, struct button_place *place,
                                                 gdouble          scale,
                                                 gboolean         rotate);
 
-void             eek_renderer_set_theme        (EekRenderer     *renderer,
-                                                EekTheme        *theme);
-
 G_END_DECLS
 #endif  /* EEK_RENDERER_H */

eek/eek-section.c

@@ -1,558 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-section
- * @short_description: Base class of a section
- * @see_also: #EekKey
- *
- * The #EekSectionClass class represents a section, which consists
- * of one or more keys of the #EekKeyClass class.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include <string.h>
-
-#include "eek-keyboard.h"
-#include "eek-section.h"
-#include "eek-key.h"
-#include "eek-symbol.h"
-
-enum {
-    PROP_0,
-    PROP_ANGLE,
-    PROP_LAST
-};
-
-enum {
-    KEY_LOCKED,
-    KEY_UNLOCKED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (EekSection, eek_section, EEK_TYPE_CONTAINER);
-
-#define EEK_SECTION_GET_PRIVATE(obj)                           \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SECTION, EekSectionPrivate))
-
-struct _EekRow
-{
-    gint num_columns;
-    EekOrientation orientation;
-};
-
-typedef struct _EekRow EekRow;
-
-struct _EekSectionPrivate
-{
-    gint angle;
-    GSList *rows;
-    EekModifierType modifiers;
-};
-
-static gint
-eek_section_real_get_n_rows (EekSection *self)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-
-    return g_slist_length (priv->rows);
-}
-
-static void
-eek_section_real_add_row (EekSection    *self,
-                          gint           num_columns,
-                          EekOrientation orientation)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-    EekRow *row;
-
-    row = g_slice_new (EekRow);
-    row->num_columns = num_columns;
-    row->orientation = orientation;
-    priv->rows = g_slist_append (priv->rows, row);
-}
-
-static void
-eek_section_real_get_row (EekSection     *self,
-                          gint            index,
-                          gint           *num_columns,
-                          EekOrientation *orientation)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-    EekRow *row;
-
-    row = g_slist_nth_data (priv->rows, index);
-    g_return_if_fail (row);
-    if (num_columns)
-        *num_columns = row->num_columns;
-    if (orientation)
-        *orientation = row->orientation;
-}
-
-static void
-on_locked (EekKey     *key,
-           EekSection *section)
-{
-    g_signal_emit (section, signals[KEY_LOCKED], 0, key);
-}
-
-static void
-on_unlocked (EekKey     *key,
-             EekSection *section)
-{
-    g_signal_emit (section, signals[KEY_UNLOCKED], 0, key);
-}
-
-static EekKey *
-eek_section_real_create_key (EekSection *self,
-                             guint       keycode,
-                             gint        column_index,
-                             guint        row_index)
-{
-    EekKey *key;
-    gint num_rows;
-    EekRow *row;
-
-    num_rows = eek_section_get_n_rows (self);
-    g_return_val_if_fail (0 <= row_index && row_index < num_rows, NULL);
-
-    row = g_slist_nth_data (self->priv->rows, row_index);
-    if (row->num_columns < column_index + 1)
-        row->num_columns = column_index + 1;
-
-    key = g_object_new (EEK_TYPE_KEY,
-                        "keycode", keycode,
-                        "column", column_index,
-                        "row", row_index,
-                        NULL);
-    g_return_val_if_fail (key, NULL);
-
-    EEK_CONTAINER_GET_CLASS(self)->add_child (EEK_CONTAINER(self),
-                                              EEK_ELEMENT(key));
-
-    return key;
-}
-
-static void
-set_level_from_modifiers (EekSection *self)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-    EekKeyboard *keyboard;
-    EekModifierType num_lock_mask;
-    gint level = -1;
-
-    keyboard = EEK_KEYBOARD(eek_element_get_parent (EEK_ELEMENT(self)));
-    num_lock_mask = eek_keyboard_get_num_lock_mask (keyboard);
-    if (priv->modifiers & num_lock_mask)
-        level = 1;
-    eek_element_set_level (EEK_ELEMENT(self), level);
-}
-
-static void
-eek_section_real_key_pressed (EekSection *self, EekKey *key)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-    EekSymbol *symbol;
-    EekKeyboard *keyboard;
-    EekModifierBehavior behavior;
-    EekModifierType modifier;
-
-    symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
-    if (!symbol)
-        return;
-
-    keyboard = EEK_KEYBOARD(eek_element_get_parent (EEK_ELEMENT(self)));
-    behavior = eek_keyboard_get_modifier_behavior (keyboard);
-    modifier = eek_symbol_get_modifier_mask (symbol);
-    if (behavior == EEK_MODIFIER_BEHAVIOR_NONE) {
-        priv->modifiers |= modifier;
-        set_level_from_modifiers (self);
-    }
-}
-
-static void
-eek_section_real_key_released (EekSection *self, EekKey *key)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
-    EekSymbol *symbol;
-    EekKeyboard *keyboard;
-    EekModifierBehavior behavior;
-    EekModifierType modifier;
-
-    symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
-    if (!symbol)
-        return;
-
-    keyboard = EEK_KEYBOARD(eek_element_get_parent (EEK_ELEMENT(self)));
-    behavior = eek_keyboard_get_modifier_behavior (keyboard);
-    modifier = eek_symbol_get_modifier_mask (symbol);
-    switch (behavior) {
-    case EEK_MODIFIER_BEHAVIOR_NONE:
-        priv->modifiers &= ~modifier;
-        break;
-    case EEK_MODIFIER_BEHAVIOR_LOCK:
-        priv->modifiers ^= modifier;
-        break;
-    case EEK_MODIFIER_BEHAVIOR_LATCH:
-        priv->modifiers = (priv->modifiers ^ modifier) & modifier;
-        break;
-    }
-    set_level_from_modifiers (self);
-}
-
-static void
-eek_section_finalize (GObject *object)
-{
-    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(object);
-    GSList *head;
-
-    for (head = priv->rows; head; head = g_slist_next (head))
-        g_slice_free (EekRow, head->data);
-    g_slist_free (priv->rows);
-
-    G_OBJECT_CLASS (eek_section_parent_class)->finalize (object);
-}
-
-static void
-eek_section_set_property (GObject      *object,
-                          guint         prop_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
-{
-    switch (prop_id) {
-    case PROP_ANGLE:
-        eek_section_set_angle (EEK_SECTION(object),
-                               g_value_get_int (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_section_get_property (GObject    *object,
-                          guint       prop_id,
-                          GValue     *value,
-                          GParamSpec *pspec)
-{
-    switch (prop_id) {
-    case PROP_ANGLE:
-        g_value_set_int (value, eek_section_get_angle (EEK_SECTION(object)));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_section_real_child_added (EekContainer *self,
-                              EekElement   *element)
-{
-    g_signal_connect (element, "locked", G_CALLBACK(on_locked), self);
-    g_signal_connect (element, "unlocked", G_CALLBACK(on_unlocked), self);
-}
-
-static void
-eek_section_real_child_removed (EekContainer *self,
-                                EekElement   *element)
-{
-    g_signal_handlers_disconnect_by_func (element, on_locked, self);
-    g_signal_handlers_disconnect_by_func (element, on_unlocked, self);
-}
-
-static void
-eek_section_class_init (EekSectionClass *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 (EekSectionPrivate));
-
-    klass->get_n_rows = eek_section_real_get_n_rows;
-    klass->add_row = eek_section_real_add_row;
-    klass->get_row = eek_section_real_get_row;
-    klass->create_key = eek_section_real_create_key;
-
-    /* signals */
-    klass->key_pressed = eek_section_real_key_pressed;
-    klass->key_released = eek_section_real_key_released;
-
-    container_class->child_added = eek_section_real_child_added;
-    container_class->child_removed = eek_section_real_child_removed;
-
-    gobject_class->set_property = eek_section_set_property;
-    gobject_class->get_property = eek_section_get_property;
-    gobject_class->finalize     = eek_section_finalize;
-
-    /**
-     * EekSection:angle:
-     *
-     * The rotation angle of #EekSection.
-     */
-    pspec = g_param_spec_int ("angle",
-                              "Angle",
-                              "Rotation angle of the section",
-                              -360, 360, 0,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_ANGLE,
-                                     pspec);
-
-    /**
-     * EekSection::key-locked:
-     * @section: an #EekSection
-     * @key: an #EekKey
-     *
-     * The ::key-locked signal is emitted each time a key in @section
-     * is shifted to the locked state.
-     */
-    signals[KEY_LOCKED] =
-        g_signal_new (I_("key-locked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekSectionClass, key_locked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE,
-                      1,
-                      EEK_TYPE_KEY);
-
-    /**
-     * EekSection::key-unlocked:
-     * @section: an #EekSection
-     * @key: an #EekKey
-     *
-     * The ::key-unlocked signal is emitted each time a key in @section
-     * is shifted to the unlocked state.
-     */
-    signals[KEY_UNLOCKED] =
-        g_signal_new (I_("key-unlocked"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekSectionClass, key_unlocked),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE,
-                      1,
-                      EEK_TYPE_KEY);
-}
-
-static void
-eek_section_init (EekSection *self)
-{
-    self->priv = EEK_SECTION_GET_PRIVATE (self);
-}
-
-/**
- * eek_section_set_angle:
- * @section: an #EekSection
- * @angle: rotation angle
- *
- * Set rotation angle of @section to @angle.
- */
-void
-eek_section_set_angle (EekSection  *section,
-                       gint         angle)
-{
-    g_return_if_fail (EEK_IS_SECTION(section));
-    if (section->priv->angle != angle) {
-        section->priv->angle = angle;
-        g_object_notify (G_OBJECT(section), "angle");
-    }
-}
-
-/**
- * eek_section_get_angle:
- * @section: an #EekSection
- *
- * Get rotation angle of @section.
- */
-gint
-eek_section_get_angle (EekSection *section)
-{
-    g_return_val_if_fail (EEK_IS_SECTION(section), -1);
-    return section->priv->angle;
-}
-
-/**
- * eek_section_get_n_rows:
- * @section: an #EekSection
- *
- * Get the number of rows in @section.
- */
-gint
-eek_section_get_n_rows (EekSection *section)
-{
-    g_return_val_if_fail (EEK_IS_SECTION(section), -1);
-    return EEK_SECTION_GET_CLASS(section)->get_n_rows (section);
-}
-
-/**
- * eek_section_add_row:
- * @section: an #EekSection
- * @num_columns: the number of column in the row
- * @orientation: #EekOrientation of the row
- *
- * Add a row which has @num_columns columns and whose orientation is
- * @orientation to @section.
- */
-void
-eek_section_add_row (EekSection    *section,
-                     gint           num_columns,
-                     EekOrientation orientation)
-{
-    g_return_if_fail (EEK_IS_SECTION(section));
-    EEK_SECTION_GET_CLASS(section)->add_row (section,
-                                             num_columns,
-                                             orientation);
-}
-
-/**
- * eek_section_get_row:
- * @section: an #EekSection
- * @index: the index of row
- * @num_columns: pointer where the number of column in the row will be stored
- * @orientation: pointer where #EekOrientation of the row will be stored
- *
- * Get the information about the @index-th row in @section.
- */
-void
-eek_section_get_row (EekSection     *section,
-                     gint            index,
-                     gint           *num_columns,
-                     EekOrientation *orientation)
-{
-    g_return_if_fail (EEK_IS_SECTION(section));
-    EEK_SECTION_GET_CLASS(section)->get_row (section,
-                                             index,
-                                             num_columns,
-                                             orientation);
-}
-
-/**
- * eek_section_create_key:
- * @section: an #EekSection
- * @keycode: a keycode
- * @column: the column index of the key
- * @row: the row index of the key
- *
- * Create an #EekKey instance and append it to @section.  This
- * function is rarely called by application but called by #EekLayout
- * implementation.
- */
-EekKey *
-eek_section_create_key (EekSection *section,
-                        guint       keycode,
-                        gint        column,
-                        gint        row)
-{
-    g_return_val_if_fail (EEK_IS_SECTION(section), NULL);
-    return EEK_SECTION_GET_CLASS(section)->create_key (section,
-                                                       keycode,
-                                                       column,
-                                                       row);
-}
-
-static void keysizer(EekElement *element, gpointer user_data) {
-    EekKey *key = EEK_KEY(element);
-    EekKeyboard *keyboard = EEK_KEYBOARD(user_data);
-    uint oref = eek_key_get_oref (key);
-    EekOutline *outline = eek_keyboard_get_outline (keyboard, oref);
-    if (outline && outline->num_points > 0) {
-        double minx = outline->points[0].x;
-        double maxx = minx;
-        double miny = outline->points[0].y;
-        double maxy = miny;
-        for (uint i = 1; i < outline->num_points; i++) {
-            EekPoint p = outline->points[i];
-            if (p.x < minx) {
-                minx = p.x;
-            } else if (p.x > maxx) {
-                maxx = p.x;
-            }
-
-            if (p.y < miny) {
-                miny = p.y;
-            } else if (p.y > maxy) {
-                maxy = p.y;
-            }
-        }
-        EekBounds key_bounds = {0};
-        eek_element_get_bounds(element, &key_bounds);
-        key_bounds.height = maxy - miny;
-        key_bounds.width = maxx - minx;
-        eek_element_set_bounds(element, &key_bounds);
-    }
-}
-
-struct keys_info {
-    uint count;
-    double total_width;
-    double biggest_height;
-};
-
-static void keycounter (EekElement *element, gpointer user_data) {
-    struct keys_info *data = user_data;
-    data->count++;
-    EekBounds key_bounds = {0};
-    eek_element_get_bounds(element, &key_bounds);
-    data->total_width += key_bounds.width;
-    if (key_bounds.height > data->biggest_height) {
-        data->biggest_height = key_bounds.height;
-    }
-}
-
-const double keyspacing = 3.0;
-
-static void keyplacer(EekElement *element, gpointer user_data) {
-    double *current_offset = user_data;
-    EekBounds key_bounds = {0};
-    eek_element_get_bounds(element, &key_bounds);
-    key_bounds.x = *current_offset;
-    key_bounds.y = 0;
-    eek_element_set_bounds(element, &key_bounds);
-    *current_offset += key_bounds.width + keyspacing;
-}
-
-void eek_section_place_keys(EekSection *section, EekKeyboard *keyboard)
-{
-    eek_container_foreach_child(EEK_CONTAINER(section), keysizer, keyboard);
-
-    struct keys_info keyinfo = {0};
-    eek_container_foreach_child(EEK_CONTAINER(section), keycounter, &keyinfo);
-    EekBounds section_bounds = {0};
-    eek_element_get_bounds(EEK_ELEMENT(section), &section_bounds);
-
-    double key_offset = (section_bounds.width - (keyinfo.total_width + (keyinfo.count - 1) * keyspacing)) / 2;
-    eek_container_foreach_child(EEK_CONTAINER(section), keyplacer, &key_offset);
-
-    section_bounds.height = keyinfo.biggest_height;
-    eek_element_set_bounds(EEK_ELEMENT(section), &section_bounds);
-}

eek/eek-section.h

@@ -1,133 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_SECTION_H
-#define EEK_SECTION_H 1
-
-#include <glib-object.h>
-#include "eek-container.h"
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_SECTION (eek_section_get_type())
-#define EEK_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SECTION, EekSection))
-#define EEK_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SECTION, EekSectionClass))
-#define EEK_IS_SECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SECTION))
-#define EEK_IS_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SECTION))
-#define EEK_SECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SECTION, EekSectionClass))
-
-typedef struct _EekSectionClass EekSectionClass;
-typedef struct _EekSectionPrivate EekSectionPrivate;
-
-/**
- * EekSection:
- *
- * The #EekSection structure contains only private data and should
- * only be accessed using the provided API.
- */
-struct _EekSection
-{
-    /*< private >*/
-    EekContainer parent;
-
-    EekSectionPrivate *priv;
-};
-
-/**
- * EekSectionClass:
- * @get_n_rows: virtual function for getting the number of rows in the section
- * @add_row: virtual function for adding a new row to the section
- * @get_row: virtual function for accessing a row in the section
- * @create_key: virtual function for creating key in the section
- * @key_pressed: class handler for #EekSection::key-pressed signal
- * @key_released: class handler for #EekSection::key-released signal
- * @key_locked: class handler for #EekSection::key-locked signal
- * @key_unlocked: class handler for #EekSection::key-unlocked signal
- * @key_cancelled: class handler for #EekSection::key-cancelled signal
- */
-struct _EekSectionClass
-{
-    /*< private >*/
-    EekContainerClass parent_class;
-
-    /*< public >*/
-    gint    (* get_n_rows)          (EekSection     *self);
-    void    (* add_row)             (EekSection     *self,
-                                     gint            num_columns,
-                                     EekOrientation  orientation);
-    void    (* get_row)             (EekSection     *self,
-                                     gint            index,
-                                     gint           *num_columns,
-                                     EekOrientation *orientation);
-
-    EekKey *(* create_key)          (EekSection     *self,
-                                     guint           keycode,
-                                     gint            row,
-                                     gint            column);
-
-    /* signals */
-    void    (* key_pressed)         (EekSection     *self,
-                                     EekKey         *key);
-    void    (* key_released)        (EekSection     *self,
-                                     EekKey         *key);
-    void    (* key_locked)          (EekSection     *self,
-                                     EekKey         *key);
-    void    (* key_unlocked)        (EekSection     *self,
-                                     EekKey         *key);
-    void    (* key_cancelled)       (EekSection     *self,
-                                     EekKey         *key);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[19];
-};
-
-GType   eek_section_get_type             (void) G_GNUC_CONST;
-
-void    eek_section_set_angle            (EekSection     *section,
-                                          gint            angle);
-gint    eek_section_get_angle            (EekSection     *section);
-
-gint    eek_section_get_n_rows           (EekSection     *section);
-void    eek_section_add_row              (EekSection     *section,
-                                          gint            num_columns,
-                                          EekOrientation  orientation);
-void    eek_section_get_row              (EekSection     *section,
-                                          gint            index,
-                                          gint           *num_columns,
-                                          EekOrientation *orientation);
-
-EekKey *eek_section_create_key           (EekSection     *section,
-                                          guint           keycode,
-                                          gint            column,
-                                          gint            row);
-
-EekKey *eek_section_find_key_by_keycode  (EekSection     *section,
-                                          guint           keycode);
-
-void eek_section_place_keys              (EekSection     *section, EekKeyboard *keyboard);
-
-G_END_DECLS
-#endif  /* EEK_SECTION_H */

eek/eek-serializable.c

@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2008-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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:eek-serializable
- * @short_description: Interface which provides object serialization
- * into #GVariant
- *
- * The #EekSerializableIface interface defines serialize/deserialize
- * method.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-serializable.h"
-
-GType
-eek_serializable_get_type (void)
-{
-    static GType iface_type = 0;
-    if (iface_type == 0) {
-        static const GTypeInfo info = {
-            sizeof (EekSerializableIface),
-            NULL,
-            NULL,
-        };
-        iface_type = g_type_register_static (G_TYPE_INTERFACE,
-                                             "EekSerializable",
-                                             &info, 0);
-    }
-    return iface_type;
-}
-
-GVariant *
-eek_serializable_serialize (EekSerializable *object)
-{
-    GVariantBuilder builder;
-
-    g_return_val_if_fail (EEK_IS_SERIALIZABLE (object), FALSE);
-
-    g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
-    g_variant_builder_add (&builder, "s", g_type_name (G_OBJECT_TYPE (object)));
-    EEK_SERIALIZABLE_GET_IFACE (object)->serialize (object, &builder);
-
-    return g_variant_builder_end (&builder);
-}
-
-EekSerializable *
-eek_serializable_deserialize (GVariant *variant)
-{
-    gchar *type_name = NULL;
-    GType type;
-    EekSerializable *object;
-    gsize index = 0;
-
-    g_return_val_if_fail (variant != NULL, NULL);
-
-    g_variant_get_child (variant, index++, "&s", &type_name);
-    type = g_type_from_name (type_name);
-
-    g_return_val_if_fail (g_type_is_a (type, EEK_TYPE_SERIALIZABLE), NULL);
-
-    object = g_object_new (type, NULL);
-
-    index = EEK_SERIALIZABLE_GET_IFACE (object)->deserialize (object,
-                                                              variant,
-                                                              index);
-    if (index < 0) {
-        g_object_unref (object);
-        g_return_val_if_reached (NULL);
-    }
-
-    return object;
-}

eek/eek-serializable.h

@@ -1,66 +0,0 @@
-/* 
- * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2011 Red Hat, Inc.
- * 
- * This program 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 program 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 <http://www.gnu.org/licenses/>.
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_SERIALIZABLE_H
-#define EEK_SERIALIZABLE_H 1
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_SERIALIZABLE (eek_serializable_get_type())
-#define EEK_SERIALIZABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SERIALIZABLE, EekSerializable))
-#define EEK_IS_SERIALIZABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SERIALIZABLE))
-#define EEK_SERIALIZABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), EEK_TYPE_SERIALIZABLE, EekSerializableIface))
-
-typedef struct _EekSerializable EekSerializable;
-typedef struct _EekSerializableIface EekSerializableIface;
-
-/**
- * EekSerializableIface:
- *
- * @serialize: virtual function for serializing object into #GVariant
- * @deserialize: virtual function for deserializing object from #GVariant
- */
-struct _EekSerializableIface
-{
-    /*< private >*/
-    GTypeInterface parent_iface;
-
-    void  (* serialize)   (EekSerializable       *object,
-                           GVariantBuilder       *builder);
-    gsize (* deserialize) (EekSerializable       *object,
-                           GVariant              *variant,
-                           gsize                  index);
-
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType            eek_serializable_get_type    (void);
-
-GVariant        *eek_serializable_serialize   (EekSerializable *object);
-EekSerializable *eek_serializable_deserialize (GVariant        *variant);
-
-G_END_DECLS
-#endif  /* EEK_SERIALIZABLE_H */

eek/eek-symbol-matrix.c

@@ -1,105 +0,0 @@
-/* 
- * 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
- */
-#include "eek-symbol-matrix.h"
-
-EekSymbolMatrix *
-eek_symbol_matrix_new (gint num_groups,
-                       gint num_levels)
-{
-    EekSymbolMatrix *matrix = g_slice_new (EekSymbolMatrix);
-
-    matrix->num_groups = num_groups;
-    matrix->num_levels = num_levels;
-    matrix->data = g_slice_alloc0 (sizeof (EekSymbol *) *
-                                   num_groups * num_levels);
-    return matrix;
-}
-
-EekSymbolMatrix *
-eek_symbol_matrix_copy (const EekSymbolMatrix *matrix)
-{
-    EekSymbolMatrix *retval;
-    gint i, num_symbols = matrix->num_groups * matrix->num_levels;
-
-    retval = g_slice_dup (EekSymbolMatrix, matrix);
-    retval->data = g_slice_copy (sizeof (EekSymbol *) * num_symbols,
-                                 matrix->data);
-    for (i = 0; i < num_symbols; i++)
-        if (retval->data[i])
-            g_object_ref (retval->data[i]);
-    return retval;
-}
-
-void
-eek_symbol_matrix_free (EekSymbolMatrix *matrix)
-{
-    gint i, num_symbols = matrix->num_groups * matrix->num_levels;
-    for (i = 0; i < num_symbols; i++)
-        if (matrix->data[i])
-            g_object_unref (matrix->data[i]);
-    g_slice_free1 (sizeof (EekSymbol *) * num_symbols, matrix->data);
-    g_slice_free (EekSymbolMatrix, matrix);
-}
-
-GType
-eek_symbol_matrix_get_type (void)
-{
-    static GType our_type = 0;
-
-    if (our_type == 0)
-        our_type =
-            g_boxed_type_register_static ("EekSymbolMatrix",
-                                          (GBoxedCopyFunc)eek_symbol_matrix_copy,
-                                          (GBoxedFreeFunc)eek_symbol_matrix_free);
-    return our_type;
-}
-
-void
-eek_symbol_matrix_set_symbol (EekSymbolMatrix *matrix,
-                              gint             group,
-                              gint             level,
-                              EekSymbol       *symbol)
-{
-    g_return_if_fail (group >= 0 && group < matrix->num_groups);
-    g_return_if_fail (level >= 0 && level < matrix->num_levels);
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-    matrix->data[group * matrix->num_levels + level] = g_object_ref (symbol);
-}
-
-/**
- * eek_symbol_matrix_get_symbol:
- * @matrix: an #EekSymbolMatrix
- * @group: group index of @matrix
- * @level: level index of @matrix
- *
- * Get an #EekSymbol stored in the cell selected by (@group, @level)
- * in @matrix.
- *
- * Return value: (transfer none): an #EekSymbol.
- */
-EekSymbol *
-eek_symbol_matrix_get_symbol (EekSymbolMatrix *matrix,
-                              gint             group,
-                              gint             level)
-{
-    g_return_val_if_fail (group >= 0 && group < matrix->num_groups, NULL);
-    g_return_val_if_fail (level >= 0 && level < matrix->num_levels, NULL);
-    return matrix->data[group * matrix->num_levels + level];
-}

eek/eek-symbol-matrix.h

@@ -1,62 +0,0 @@
-/* 
- * 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
- */
-#ifndef EEK_SYMBOL_MATRIX_H
-#define EEK_SYMBOL_MATRIX_H 1
-
-#include "eek-symbol.h"
-
-G_BEGIN_DECLS
-
-/**
- * EekSymbolMatrix:
- * @data: array of symbols
- * @num_groups: the number of groups (rows)
- * @num_levels: the number of levels (columns)
- *
- * Symbol matrix of a key.
- */
-struct _EekSymbolMatrix
-{
-    /*< public >*/
-    gint num_groups;
-    gint num_levels;
-    EekSymbol **data;
-};
-
-#define EEK_TYPE_SYMBOL_MATRIX (eek_symbol_matrix_get_type ())
-GType            eek_symbol_matrix_get_type (void) G_GNUC_CONST;
-EekSymbolMatrix *eek_symbol_matrix_new      (gint                   num_groups,
-                                             gint                   num_levels);
-EekSymbolMatrix *eek_symbol_matrix_copy     (const EekSymbolMatrix *matrix);
-void             eek_symbol_matrix_free     (EekSymbolMatrix       *matrix);
-
-void             eek_symbol_matrix_set_symbol
-                                            (EekSymbolMatrix       *matrix,
-                                             gint                   group,
-                                             gint                   level,
-                                             EekSymbol             *symbol);
-EekSymbol       *eek_symbol_matrix_get_symbol
-                                            (EekSymbolMatrix       *matrix,
-                                             gint                   group,
-                                             gint                   level);
-
-G_END_DECLS
-
-#endif  /* EEK_SYMBOL_MATRIX_H */

eek/eek-symbol.c

@@ -25,277 +25,18 @@
  * The #EekSymbolClass class represents a symbol assigned to a key.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-symbol.h"
-#include "eek-serializable.h"
 #include "eek-enumtypes.h"
 
-enum {
-    PROP_0,
-    PROP_NAME,
-    PROP_LABEL,
-    PROP_CATEGORY,
-    PROP_MODIFIER_MASK,
-    PROP_ICON_NAME,
-    PROP_TOOLTIP,
-    PROP_LAST
-};
-
-struct _EekSymbolPrivate {
-    gchar *name;
-    gchar *label;
-    EekSymbolCategory category;
-    EekModifierType modifier_mask;
-    gchar *icon_name;
-    gchar *tooltip;
-};
-
-static void eek_serializable_iface_init (EekSerializableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (EekSymbol, eek_symbol, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-                                                eek_serializable_iface_init));
-
-#define EEK_SYMBOL_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SYMBOL, EekSymbolPrivate))
-
-static void
-eek_symbol_real_serialize (EekSerializable *self,
-                           GVariantBuilder *builder)
-{
-    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);
-#define NOTNULL(s) ((s) != NULL ? (s) : "")
-    g_variant_builder_add (builder, "s", NOTNULL(priv->name));
-    g_variant_builder_add (builder, "s", NOTNULL(priv->label));
-    g_variant_builder_add (builder, "u", priv->category);
-    g_variant_builder_add (builder, "u", priv->modifier_mask);
-    g_variant_builder_add (builder, "s", NOTNULL(priv->icon_name));
-    g_variant_builder_add (builder, "s", NOTNULL(priv->tooltip));
-#undef NOTNULL
-}
-
-static gsize
-eek_symbol_real_deserialize (EekSerializable *self,
-                             GVariant        *variant,
-                             gsize            index)
-{
-    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);
-
-    g_variant_get_child (variant, index++, "s", &priv->name);
-    g_variant_get_child (variant, index++, "s", &priv->label);
-    g_variant_get_child (variant, index++, "u", &priv->category);
-    g_variant_get_child (variant, index++, "u", &priv->modifier_mask);
-    g_variant_get_child (variant, index++, "s", &priv->icon_name);
-    g_variant_get_child (variant, index++, "s", &priv->tooltip);
-
-    return index;
-}
-
-static void
-eek_serializable_iface_init (EekSerializableIface *iface)
-{
-    iface->serialize = eek_symbol_real_serialize;
-    iface->deserialize = eek_symbol_real_deserialize;
-}
-
-static void
-eek_symbol_set_property (GObject      *object,
-                         guint         prop_id,
-                         const GValue *value,
-                         GParamSpec   *pspec)
-{
-    switch (prop_id) {
-    case PROP_NAME:
-        eek_symbol_set_name (EEK_SYMBOL(object), g_value_get_string (value));
-        break;
-    case PROP_LABEL:
-        eek_symbol_set_label (EEK_SYMBOL(object), g_value_get_string (value));
-        break;
-    case PROP_CATEGORY:
-        eek_symbol_set_category (EEK_SYMBOL(object), g_value_get_enum (value));
-        break;
-    case PROP_MODIFIER_MASK:
-        eek_symbol_set_modifier_mask (EEK_SYMBOL(object),
-                                      g_value_get_flags (value));
-        break;
-    case PROP_ICON_NAME:
-        eek_symbol_set_icon_name (EEK_SYMBOL(object),
-                                  g_value_get_string (value));
-        break;
-    case PROP_TOOLTIP:
-        eek_symbol_set_tooltip (EEK_SYMBOL(object),
-                                g_value_get_string (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_symbol_get_property (GObject    *object,
-                         guint       prop_id,
-                         GValue     *value,
-                         GParamSpec *pspec)
-{
-    switch (prop_id) {
-    case PROP_NAME:
-        g_value_set_string (value, eek_symbol_get_name (EEK_SYMBOL(object)));
-        break;
-    case PROP_LABEL:
-        g_value_set_string (value, eek_symbol_get_label (EEK_SYMBOL(object)));
-        break;
-    case PROP_CATEGORY:
-        g_value_set_enum (value, eek_symbol_get_category (EEK_SYMBOL(object)));
-        break;
-    case PROP_MODIFIER_MASK:
-        g_value_set_flags (value,
-                           eek_symbol_get_modifier_mask (EEK_SYMBOL(object)));
-        break;
-    case PROP_ICON_NAME:
-        g_value_set_string (value,
-                            eek_symbol_get_icon_name (EEK_SYMBOL(object)));
-        break;
-    case PROP_TOOLTIP:
-        g_value_set_string (value,
-                            eek_symbol_get_tooltip (EEK_SYMBOL(object)));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_symbol_finalize (GObject *object)
-{
-    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(object);
-
-    g_free (priv->name);
-    g_free (priv->label);
-    g_free (priv->icon_name);
-    g_free (priv->tooltip);
-    G_OBJECT_CLASS (eek_symbol_parent_class)->finalize (object);
-}
-
-static void
-eek_symbol_class_init (EekSymbolClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec *pspec;
-
-    g_type_class_add_private (gobject_class, sizeof (EekSymbolPrivate));
-
-    gobject_class->set_property = eek_symbol_set_property;
-    gobject_class->get_property = eek_symbol_get_property;
-    gobject_class->finalize = eek_symbol_finalize;
-
-    pspec = g_param_spec_string ("name",
-                                 "Name",
-                                 "Canonical name of the symbol",
-                                 NULL,
-                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_NAME, pspec);
-
-    pspec = g_param_spec_string ("label",
-                                 "Label",
-                                 "Text used to display the symbol",
-                                 NULL,
-                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_LABEL, pspec);
-
-    pspec = g_param_spec_enum ("category",
-                               "Category",
-                               "Category of the symbol",
-                               EEK_TYPE_SYMBOL_CATEGORY,
-                               EEK_SYMBOL_CATEGORY_UNKNOWN,
-                               G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_CATEGORY, pspec);
-
-    pspec = g_param_spec_flags ("modifier-mask",
-                                "Modifier mask",
-                                "Modifier mask of the symbol",
-                                EEK_TYPE_MODIFIER_TYPE,
-                                0,
-                                G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_MODIFIER_MASK, pspec);
-
-    pspec = g_param_spec_string ("icon-name",
-                                 "Icon name",
-                                 "Icon name used to render the symbol",
-                                 NULL,
-                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_ICON_NAME, pspec);
-
-    pspec = g_param_spec_string ("tooltip",
-                                 "Tooltip",
-                                 "Tooltip text",
-                                 NULL,
-                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_TOOLTIP, pspec);
-}
-
-static void
-eek_symbol_init (EekSymbol *self)
-{
-    EekSymbolPrivate *priv;
-
-    priv = self->priv = EEK_SYMBOL_GET_PRIVATE(self);
-    priv->category = EEK_SYMBOL_CATEGORY_UNKNOWN;
-}
-
-/**
- * eek_symbol_new:
- * @name: name of the symbol
- *
- * Create a new #EekSymbol with @name.
- */
 EekSymbol *
 eek_symbol_new (const gchar *name)
 {
-    return g_object_new (EEK_TYPE_SYMBOL, "name", name, NULL);
-}
-
-/**
- * eek_symbol_set_name:
- * @symbol: an #EekSymbol
- * @name: name of the symbol
- *
- * Set the name of @symbol to @name.
- */
-void
-eek_symbol_set_name (EekSymbol   *symbol,
-                     const gchar *name)
-{
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    g_free (priv->name);
-    priv->name = g_strdup (name);
-}
-
-/**
- * eek_symbol_get_name:
- * @symbol: an #EekSymbol
- *
- * Get the name of @symbol.
- */
-const gchar *
-eek_symbol_get_name (EekSymbol *symbol)
-{
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    if (priv->name == NULL || *priv->name == '\0')
-        return NULL;
-    return priv->name;
+    EekSymbol *self = g_new0(EekSymbol, 1);
+    self->name = g_strdup (name);
+    self->category = EEK_SYMBOL_CATEGORY_UNKNOWN;
+    return self;
 }
 
 /**
@@ -309,68 +50,8 @@ void
 eek_symbol_set_label (EekSymbol   *symbol,
                       const gchar *label)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    g_free (priv->label);
-    priv->label = g_strdup (label);
-}
-
-/**
- * eek_symbol_get_label:
- * @symbol: an #EekSymbol
- *
- * Get the label text of @symbol.
- */
-const gchar *
-eek_symbol_get_label (EekSymbol *symbol)
-{
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    if (priv->label == NULL || *priv->label == '\0')
-        return NULL;
-    return priv->label;
-}
-
-/**
- * eek_symbol_set_category:
- * @symbol: an #EekSymbol
- * @category: an #EekSymbolCategory
- *
- * Set symbol category of @symbol to @category.
- */
-void
-eek_symbol_set_category (EekSymbol        *symbol,
-                         EekSymbolCategory category)
-{
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    priv->category = category;
-}
-
-/**
- * eek_symbol_get_category:
- * @symbol: an #EekSymbol
- *
- * Get symbol category of @symbol.
- */
-EekSymbolCategory
-eek_symbol_get_category (EekSymbol *symbol)
-{
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), EEK_SYMBOL_CATEGORY_UNKNOWN);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    return priv->category;
+    g_free (symbol->label);
+    symbol->label = g_strdup (label);
 }
 
 /**
@@ -384,12 +65,7 @@ void
 eek_symbol_set_modifier_mask (EekSymbol      *symbol,
                               EekModifierType mask)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    priv->modifier_mask = mask;
+    symbol->modifier_mask = mask;
 }
 
 /**
@@ -401,136 +77,37 @@ eek_symbol_set_modifier_mask (EekSymbol      *symbol,
 EekModifierType
 eek_symbol_get_modifier_mask (EekSymbol *symbol)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), 0);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    return priv->modifier_mask;
+    return 0;
+    return symbol->modifier_mask;
 }
 
-/**
- * eek_symbol_is_modifier:
- * @symbol: an #EekSymbol
- *
- * Check if @symbol is a modifier.
- * Returns: %TRUE if @symbol is a modifier.
- */
-gboolean
-eek_symbol_is_modifier (EekSymbol *symbol)
-{
-    return eek_symbol_get_modifier_mask (symbol) != 0;
-}
-
-/**
- * eek_symbol_set_icon_name:
- * @symbol: an #EekSymbol
- * @icon_name: icon name of @symbol
- *
- * Set the icon name of @symbol to @icon_name.
- */
 void
 eek_symbol_set_icon_name (EekSymbol   *symbol,
                           const gchar *icon_name)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    g_free (priv->icon_name);
-    priv->icon_name = g_strdup (icon_name);
+    g_free (symbol->icon_name);
+    symbol->icon_name = g_strdup (icon_name);
 }
 
-/**
- * eek_symbol_get_icon_name:
- * @symbol: an #EekSymbol
- *
- * Get the icon name of @symbol.
- */
 const gchar *
 eek_symbol_get_icon_name (EekSymbol *symbol)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    if (priv->icon_name == NULL || *priv->icon_name == '\0')
-        return NULL;
-    return priv->icon_name;
+    return NULL;
 }
 
-/**
- * eek_symbol_set_tooltip:
- * @symbol: an #EekSymbol
- * @tooltip: icon name of @symbol
- *
- * Set the tooltip text of @symbol to @tooltip.
- */
 void
 eek_symbol_set_tooltip (EekSymbol   *symbol,
                         const gchar *tooltip)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_if_fail (EEK_IS_SYMBOL(symbol));
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    g_free (priv->tooltip);
-    priv->tooltip = g_strdup (tooltip);
+    g_free (symbol->tooltip);
+    symbol->tooltip = g_strdup (tooltip);
 }
 
-/**
- * eek_symbol_get_tooltip:
- * @symbol: an #EekSymbol
- *
- * Get the tooltip text of @symbol.
- */
 const gchar *
 eek_symbol_get_tooltip (EekSymbol *symbol)
 {
-    EekSymbolPrivate *priv;
-
-    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
-
-    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-    if (priv->tooltip == NULL || *priv->tooltip == '\0')
-        return NULL;
-    return priv->tooltip;
-}
-
-static const struct {
-    EekSymbolCategory category;
-    gchar *name;
-} category_names[] = {
-    { EEK_SYMBOL_CATEGORY_LETTER, "letter" },
-    { EEK_SYMBOL_CATEGORY_FUNCTION, "function" },
-    { EEK_SYMBOL_CATEGORY_KEYNAME, "keyname" },
-    { EEK_SYMBOL_CATEGORY_USER0, "user0" },
-    { EEK_SYMBOL_CATEGORY_USER1, "user1" },
-    { EEK_SYMBOL_CATEGORY_USER2, "user2" },
-    { EEK_SYMBOL_CATEGORY_USER3, "user3" },
-    { EEK_SYMBOL_CATEGORY_USER4, "user4" },
-    { EEK_SYMBOL_CATEGORY_UNKNOWN, NULL }
-};
-
-const gchar *
-eek_symbol_category_get_name (EekSymbolCategory category)
-{
-    gint i;
-    for (i = 0; i < G_N_ELEMENTS(category_names); i++)
-        if (category_names[i].category == category)
-            return category_names[i].name;
     return NULL;
-}
-
-EekSymbolCategory
-eek_symbol_category_from_name (const gchar *name)
-{
-    gint i;
-    for (i = 0; i < G_N_ELEMENTS(category_names); i++)
-        if (g_strcmp0 (category_names[i].name, name) == 0)
-            return category_names[i].category;
-    return EEK_SYMBOL_CATEGORY_UNKNOWN;
+    if (symbol->tooltip == NULL || *symbol->tooltip == '\0')
+        return NULL;
+    return symbol->tooltip;
 }

eek/eek-symbol.h

@@ -1,120 +0,0 @@
-/* 
- * 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
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_SYMBOL_H
-#define EEK_SYMBOL_H 1
-
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-
-/**
- * EekSymbolCategory:
- * @EEK_SYMBOL_CATEGORY_LETTER: the symbol represents an alphabet letter
- * @EEK_SYMBOL_CATEGORY_FUNCTION: the symbol represents a function
- * @EEK_SYMBOL_CATEGORY_KEYNAME: the symbol does not have meaning but
- * have a name
- * @EEK_SYMBOL_CATEGORY_USER0: reserved for future use
- * @EEK_SYMBOL_CATEGORY_USER1: reserved for future use
- * @EEK_SYMBOL_CATEGORY_USER2: reserved for future use
- * @EEK_SYMBOL_CATEGORY_USER3: reserved for future use
- * @EEK_SYMBOL_CATEGORY_USER4: reserved for future use
- * @EEK_SYMBOL_CATEGORY_UNKNOWN: used for error reporting
- * @EEK_SYMBOL_CATEGORY_LAST: the last symbol category
- *
- * Category of the key symbols.
- */
-typedef enum {
-    EEK_SYMBOL_CATEGORY_LETTER,
-    EEK_SYMBOL_CATEGORY_FUNCTION,
-    EEK_SYMBOL_CATEGORY_KEYNAME,
-    EEK_SYMBOL_CATEGORY_USER0,
-    EEK_SYMBOL_CATEGORY_USER1,
-    EEK_SYMBOL_CATEGORY_USER2,
-    EEK_SYMBOL_CATEGORY_USER3,
-    EEK_SYMBOL_CATEGORY_USER4,
-    EEK_SYMBOL_CATEGORY_UNKNOWN,
-    EEK_SYMBOL_CATEGORY_LAST = EEK_SYMBOL_CATEGORY_UNKNOWN
-} EekSymbolCategory;
-
-#define EEK_TYPE_SYMBOL (eek_symbol_get_type())
-#define EEK_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SYMBOL, EekSymbol))
-#define EEK_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SYMBOL, EekSymbolClass))
-#define EEK_IS_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SYMBOL))
-#define EEK_IS_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SYMBOL))
-#define EEK_SYMBOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SYMBOL, EekSymbolClass))
-
-typedef struct _EekSymbolClass EekSymbolClass;
-typedef struct _EekSymbolPrivate EekSymbolPrivate;
-
-/**
- * EekSymbol:
- *
- * The #EekSymbol structure contains only private data and should only
- * be accessed using the provided API.
- */
-struct _EekSymbol {
-    /*< private >*/
-    GObject parent;
-
-    EekSymbolPrivate *priv;
-};
-
-/**
- * EekSymbolClass:
- */
-struct _EekSymbolClass {
-    /*< private >*/
-    GObjectClass parent_class;
-};
-
-GType             eek_symbol_get_type           (void) G_GNUC_CONST;
-
-EekSymbol        *eek_symbol_new                (const gchar      *name);
-void              eek_symbol_set_name           (EekSymbol        *symbol,
-                                                 const gchar      *name);
-const gchar      *eek_symbol_get_name           (EekSymbol        *symbol);
-void              eek_symbol_set_label          (EekSymbol        *symbol,
-                                                 const gchar      *label);
-const gchar      *eek_symbol_get_label          (EekSymbol        *symbol);
-void              eek_symbol_set_category       (EekSymbol        *symbol,
-                                                 EekSymbolCategory category);
-EekSymbolCategory eek_symbol_get_category       (EekSymbol        *symbol);
-EekModifierType   eek_symbol_get_modifier_mask  (EekSymbol        *symbol);
-void              eek_symbol_set_modifier_mask  (EekSymbol        *symbol,
-                                                 EekModifierType   mask);
-gboolean          eek_symbol_is_modifier        (EekSymbol        *symbol);
-void              eek_symbol_set_icon_name      (EekSymbol        *symbol,
-                                                 const gchar      *icon_name);
-const gchar      *eek_symbol_get_icon_name      (EekSymbol        *symbol);
-void              eek_symbol_set_tooltip        (EekSymbol        *symbol,
-                                                 const gchar      *tooltip);
-const gchar *     eek_symbol_get_tooltip        (EekSymbol        *symbol);
-
-const gchar      *eek_symbol_category_get_name  (EekSymbolCategory category);
-EekSymbolCategory eek_symbol_category_from_name (const gchar      *name);
-
-G_END_DECLS
-
-#endif  /* EEK_SYMBOL_H */

eek/eek-text.c

@@ -1,182 +0,0 @@
-/* 
- * 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
- */
-
-/**
- * SECTION:eek-text
- * @short_description: an #EekText represents a text symbol
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-text.h"
-#include "eek-serializable.h"
-
-enum {
-    PROP_0,
-    PROP_TEXT,
-    PROP_LAST
-};
-
-struct _EekTextPrivate {
-    gchar *text;
-};
-
-static void eek_serializable_iface_init (EekSerializableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (EekText, eek_text, EEK_TYPE_SYMBOL,
-                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-                                                eek_serializable_iface_init));
-
-#define EEK_TEXT_GET_PRIVATE(obj)                                  \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_TEXT, EekTextPrivate))
-
-static EekSerializableIface *eek_text_parent_serializable_iface;
-
-static void
-eek_text_real_serialize (EekSerializable *self,
-                         GVariantBuilder *builder)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);
-
-    eek_text_parent_serializable_iface->serialize (self, builder);
-
-    g_variant_builder_add (builder, "s", priv->text);
-}
-
-static gsize
-eek_text_real_deserialize (EekSerializable *self,
-                           GVariant        *variant,
-                           gsize            index)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);
-
-    index = eek_text_parent_serializable_iface->deserialize (self,
-                                                             variant,
-                                                             index);
-    g_variant_get_child (variant, index++, "s", &priv->text);
-
-    return index;
-}
-
-static void
-eek_serializable_iface_init (EekSerializableIface *iface)
-{
-    eek_text_parent_serializable_iface =
-        g_type_interface_peek_parent (iface);
-
-    iface->serialize = eek_text_real_serialize;
-    iface->deserialize = eek_text_real_deserialize;
-}
-
-static void
-eek_text_set_property (GObject      *object,
-                       guint         prop_id,
-                       const GValue *value,
-                       GParamSpec   *pspec)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-    switch (prop_id) {
-    case PROP_TEXT:
-        g_free (priv->text);
-        priv->text = g_strdup (g_value_get_string (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_text_get_property (GObject    *object,
-                         guint       prop_id,
-                         GValue     *value,
-                         GParamSpec *pspec)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-    switch (prop_id) {
-    case PROP_TEXT:
-        g_value_set_string (value, priv->text);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_text_finalize (GObject *object)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-
-    g_free (priv->text);
-    G_OBJECT_CLASS (eek_text_parent_class)->finalize (object);
-}
-
-static void
-eek_text_class_init (EekTextClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec *pspec;
-
-    g_type_class_add_private (gobject_class, sizeof (EekTextPrivate));
-
-    gobject_class->set_property = eek_text_set_property;
-    gobject_class->get_property = eek_text_get_property;
-    gobject_class->finalize = eek_text_finalize;
-
-    pspec = g_param_spec_string ("text",
-                                 "Text",
-                                 "Text",
-                                 NULL,
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
-}
-
-static void
-eek_text_init (EekText *self)
-{
-    self->priv = EEK_TEXT_GET_PRIVATE(self);
-}
-
-EekText *
-eek_text_new (const gchar *text)
-{
-    return g_object_new (EEK_TYPE_TEXT,
-                         "label", text,
-                         "category", EEK_SYMBOL_CATEGORY_FUNCTION,
-                         "text", text,
-                         NULL);
-}
-
-/**
- * eek_text_get_text:
- * @text: an #EekText
- *
- * Get a text value associated with @text
- */
-const gchar *
-eek_text_get_text (EekText *text)
-{
-    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(text);
-
-    return priv->text;
-}

eek/eek-text.h

@@ -1,66 +0,0 @@
-/* 
- * 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
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_TEXT_H
-#define EEK_TEXT_H 1
-
-#include "eek-symbol.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_TEXT (eek_text_get_type())
-#define EEK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_TEXT, EekText))
-#define EEK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_TEXT, EekTextClass))
-#define EEK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_TEXT))
-#define EEK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_TEXT))
-#define EEK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_TEXT, EekTextClass))
-
-typedef struct _EekTextClass EekTextClass;
-typedef struct _EekTextPrivate EekTextPrivate;
-
-/**
- * EekText:
- *
- * The #EekText structure contains only private data and should only
- * be accessed using the provided API.
- */
-struct _EekText {
-    /*< private >*/
-    EekSymbol parent;
-
-    EekTextPrivate *priv;
-};
-
-struct _EekTextClass {
-    /*< private >*/
-    EekSymbolClass parent_class;
-};
-
-GType        eek_text_get_type (void) G_GNUC_CONST;
-EekText     *eek_text_new      (const gchar *text);
-const gchar *eek_text_get_text (EekText     *text);
-
-G_END_DECLS
-
-#endif  /* EEK_TEXT_H */

eek/eek-theme-context.c

@@ -1,289 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/*
- * eek-theme-context.c: holds global information about a tree of styled objects
- *
- * Copyright 2009, 2010 Red Hat, Inc.
- * Copyright 2009 Florian Müllner
- *
- * This program 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.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope 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 program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#include "eek-theme.h"
-#include "eek-theme-context.h"
-
-struct _EekThemeContext {
-  GObject parent;
-
-  double resolution;
-  PangoFontDescription *font;
-  EekThemeNode *root_node;
-  EekTheme *theme;
-};
-
-struct _EekThemeContextClass {
-  GObjectClass parent_class;
-};
-
-#define DEFAULT_RESOLUTION 96.
-#define DEFAULT_FONT "sans-serif 10"
-
-enum
-{
-  CHANGED,
-
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (EekThemeContext, eek_theme_context, G_TYPE_OBJECT)
-
-static void
-eek_theme_context_finalize (GObject *object)
-{
-  EekThemeContext *context = EEK_THEME_CONTEXT (object);
-
-  if (context->root_node)
-    g_object_unref (context->root_node);
-  if (context->theme)
-    g_object_unref (context->theme);
-
-  pango_font_description_free (context->font);
-
-  G_OBJECT_CLASS (eek_theme_context_parent_class)->finalize (object);
-}
-
-static void
-eek_theme_context_class_init (EekThemeContextClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = eek_theme_context_finalize;
-
-  signals[CHANGED] =
-    g_signal_new ("changed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, /* no default handler slot */
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-}
-
-static void
-eek_theme_context_init (EekThemeContext *context)
-{
-  context->resolution = DEFAULT_RESOLUTION;
-  context->font = pango_font_description_from_string (DEFAULT_FONT);
-}
-
-/**
- * eek_theme_context_new:
- *
- * Create a new theme context.
- */
-EekThemeContext *
-eek_theme_context_new (void)
-{
-  EekThemeContext *context;
-
-  context = g_object_new (EEK_TYPE_THEME_CONTEXT, NULL);
-
-  return context;
-}
-
-static void
-eek_theme_context_changed (EekThemeContext *context)
-{
-  EekThemeNode *old_root = context->root_node;
-  context->root_node = NULL;
-
-  g_signal_emit (context, signals[CHANGED], 0);
-
-  if (old_root)
-    g_object_unref (old_root);
-}
-
-/**
- * eek_theme_context_set_theme:
- * @context: an #EekThemeContext
- * @theme: an #EekTheme
- *
- * Sets the default set of theme stylesheets for the context. This theme will
- * be used for the root node and for nodes descending from it, unless some other
- * style is explicitely specified.
- */
-void
-eek_theme_context_set_theme (EekThemeContext          *context,
-                            EekTheme                 *theme)
-{
-  g_return_if_fail (EEK_IS_THEME_CONTEXT (context));
-  g_return_if_fail (theme == NULL || EEK_IS_THEME (theme));
-
-  if (context->theme != theme)
-    {
-      if (context->theme)
-        g_object_unref (context->theme);
-
-      context->theme = theme;
-
-      if (context->theme)
-        g_object_ref (context->theme);
-
-      eek_theme_context_changed (context);
-    }
-}
-
-/**
- * eek_theme_context_get_theme:
- * @context: a #EekThemeContext
- *
- * Gets the default theme for the context. See eek_theme_context_set_theme()
- *
- * Return value: (transfer none): the default theme for the context
- */
-EekTheme *
-eek_theme_context_get_theme (EekThemeContext *context)
-{
-  g_return_val_if_fail (EEK_IS_THEME_CONTEXT (context), NULL);
-
-  return context->theme;
-}
-
-/**
- * eek_theme_context_set_resolution:
- * @context: a #EekThemeContext
- * @resolution: resolution of the context (number of pixels in an "inch")
- *
- * Sets the resolution of the theme context. This is the scale factor
- * used to convert between points and the length units pt, in, and cm.
- * This does not necessarily need to correspond to the actual number
- * resolution of the device. A value of 72. means that points and
- * pixels are identical. The default value is 96.
- */
-void
-eek_theme_context_set_resolution (EekThemeContext *context,
-                                 double          resolution)
-{
-  g_return_if_fail (EEK_IS_THEME_CONTEXT (context));
-
-  if (resolution == context->resolution)
-    return;
-
-  context->resolution = resolution;
-  eek_theme_context_changed (context);
-}
-
-/**
- * eek_theme_context_set_default_resolution:
- * @context: a #EekThemeContext
- *
- * Sets the resolution of the theme context to the default value of 96.
- * See eek_theme_context_set_resolution().
- */
-void
-eek_theme_context_set_default_resolution (EekThemeContext *context)
-{
-  g_return_if_fail (EEK_IS_THEME_CONTEXT (context));
-
-  if (context->resolution == DEFAULT_RESOLUTION)
-    return;
-
-  context->resolution = DEFAULT_RESOLUTION;
-  eek_theme_context_changed (context);
-}
-
-/**
- * eek_theme_context_get_resolution:
- * @context: a #EekThemeContext
- *
- * Gets the current resolution of the theme context.
- * See eek_theme_context_set_resolution().
- *
- * Return value: the resolution (in dots-per-"inch")
- */
-double
-eek_theme_context_get_resolution (EekThemeContext *context)
-{
-  g_return_val_if_fail (EEK_IS_THEME_CONTEXT (context), DEFAULT_RESOLUTION);
-
-  return context->resolution;
-}
-
-/**
- * eek_theme_context_set_font:
- * @context: a #EekThemeContext
- * @font: the default font for theme context
- *
- * Sets the default font for the theme context. This is the font that
- * is inherited by the root node of the tree of theme nodes. If the
- * font is not overriden, then this font will be used. If the font is
- * partially modified (for example, with 'font-size: 110%', then that
- * modification is based on this font.
- */
-void
-eek_theme_context_set_font (EekThemeContext             *context,
-                           const PangoFontDescription *font)
-{
-  g_return_if_fail (EEK_IS_THEME_CONTEXT (context));
-  g_return_if_fail (font != NULL);
-
-  if (context->font == font ||
-      pango_font_description_equal (context->font, font))
-    return;
-
-  pango_font_description_free (context->font);
-  context->font = pango_font_description_copy (font);
-  eek_theme_context_changed (context);
-}
-
-/**
- * eek_theme_context_get_font:
- * @context: a #EekThemeContext
- *
- * Gets the default font for the theme context. See eek_theme_context_set_font().
- *
- * Return value: the default font for the theme context.
- */
-const PangoFontDescription *
-eek_theme_context_get_font (EekThemeContext *context)
-{
-  g_return_val_if_fail (EEK_IS_THEME_CONTEXT (context), NULL);
-
-  return context->font;
-}
-
-/**
- * eek_theme_context_get_root_node:
- * @context: a #EekThemeContext
- *
- * Gets the root node of the tree of theme style nodes that associated with this
- * context. For the node tree associated with a stage, this node represents
- * styles applied to the stage itself.
- *
- * Return value: (transfer none): the root node of the context's style tree
- */
-EekThemeNode *
-eek_theme_context_get_root_node (EekThemeContext *context)
-{
-  if (context->root_node == NULL)
-    context->root_node = eek_theme_node_new (context, NULL, context->theme,
-                                             G_TYPE_NONE, NULL, NULL, NULL, NULL);
-
-  return context->root_node;
-}

eek/eek-theme-context.h

@@ -1,78 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * eek-theme-context.c: holds global information about a tree of styled objects
- *
- * Copyright 2009, 2010 Red Hat, Inc.
- * Copyright 2009 Florian Müllner
- *
- * This program 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.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope 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 program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __EEK_THEME_CONTEXT_H__
-#define __EEK_THEME_CONTEXT_H__
-
-#include <pango/pango.h>
-#include "eek-theme-node.h"
-
-G_BEGIN_DECLS
-
-/**
- * SECTION:eek-theme-context
- * @short_description: holds global information about a tree of styled objects
- *
- * #EekThemeContext is responsible for managing information global to
- * a tree of styled objects, such as the set of stylesheets or the
- * default font.
- */
-
-typedef struct _EekThemeContextClass EekThemeContextClass;
-
-#define EEK_TYPE_THEME_CONTEXT             (eek_theme_context_get_type ())
-#define EEK_THEME_CONTEXT(object)          (G_TYPE_CHECK_INSTANCE_CAST ((object), EEK_TYPE_THEME_CONTEXT, EekThemeContext))
-#define EEK_THEME_CONTEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_THEME_CONTEXT, EekThemeContextClass))
-#define EEK_IS_THEME_CONTEXT(object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), EEK_TYPE_THEME_CONTEXT))
-#define EEK_IS_THEME_CONTEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_THEME_CONTEXT))
-#define EEK_THEME_CONTEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_THEME_CONTEXT, EekThemeContextClass))
-
-GType                       eek_theme_context_get_type
-                            (void) G_GNUC_CONST;
-
-EekThemeContext            *eek_theme_context_new
-                            (void);
-
-void                        eek_theme_context_set_theme
-                            (EekThemeContext            *context,
-                             EekTheme                   *theme);
-EekTheme *                  eek_theme_context_get_theme
-                            (EekThemeContext            *context);
-
-void                        eek_theme_context_set_resolution
-                            (EekThemeContext            *context,
-                             gdouble                     resolution);
-void                        eek_theme_context_set_default_resolution
-                            (EekThemeContext            *context);
-double                      eek_theme_context_get_resolution
-                            (EekThemeContext            *context);
-void                        eek_theme_context_set_font
-                            (EekThemeContext            *context,
-                             const PangoFontDescription *font);
-const PangoFontDescription *eek_theme_context_get_font
-                            (EekThemeContext            *context);
-
-EekThemeNode *              eek_theme_context_get_root_node
-                            (EekThemeContext            *context);
-
-G_END_DECLS
-
-#endif /* __EEK_THEME_CONTEXT_H__ */

eek/eek-theme-node.h

@@ -1,141 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#ifndef __EEK_THEME_NODE_H__
-#define __EEK_THEME_NODE_H__
-
-#include <pango/pango.h>
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-
-/**
- * SECTION:eek-theme-node
- * @short_description: style information for one node in a tree of
- * themed objects
- *
- * The #EekThemeNode class represents the CSS style information (the
- * set of CSS properties) for one node in a tree of themed objects. In
- * typical usage, it represents the style information for a single
- * #EekElement. A #EekThemeNode is immutable: attributes such as the
- * CSS classes for the node are passed in at construction. If the
- * attributes of the node or any parent node change, the node should
- * be discarded and a new node created.  #EekThemeNode has generic
- * accessors to look up properties by name and specific accessors for
- * standard CSS properties that add caching and handling of various
- * details of the CSS specification. #EekThemeNode also has
- * convenience functions to help in implementing a #EekElement with
- * borders and padding.
- */
-
-typedef enum {
-    EEK_SIDE_TOP,
-    EEK_SIDE_RIGHT,
-    EEK_SIDE_BOTTOM,
-    EEK_SIDE_LEFT
-} EekSide;
-
-typedef enum {
-    EEK_CORNER_TOPLEFT,
-    EEK_CORNER_TOPRIGHT,
-    EEK_CORNER_BOTTOMRIGHT,
-    EEK_CORNER_BOTTOMLEFT
-} EekCorner;
-
-#define EEK_TYPE_THEME_NODE (eek_theme_node_get_type())
-#define EEK_THEME_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_THEME_NODE, EekThemeNode))
-#define EEK_THEME_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_THEME_NODE, EekThemeNodeClass))
-#define EEK_IS_THEME_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_THEME_NODE))
-#define EEK_IS_THEME_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_THEME_NODE))
-#define EEK_THEME_NODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_THEME_NODE, EekThemeNodeClass))
-
-typedef struct _EekThemeNodeClass EekThemeNodeClass;
-typedef struct _EekThemeNodePrivate EekThemeNodePrivate;
-
-GType         eek_theme_node_get_type
-                                 (void) G_GNUC_CONST;
-
-EekThemeNode *eek_theme_node_new (EekThemeContext            *context,
-                                  EekThemeNode               *parent_node,
-                                  /* can be null */ EekTheme *theme,
-                                  /* can be null */ GType     element_type,
-                                  const char                 *element_id,
-                                  const char                 *element_class,
-                                  const char                 *pseudo_class,
-                                  const char                 *inline_style);
-
-EekThemeNode *eek_theme_node_get_parent
-                                 (EekThemeNode               *node);
-
-EekTheme     *eek_theme_node_get_theme
-                                 (EekThemeNode               *node);
-
-GType         eek_theme_node_get_element_type
-                                 (EekThemeNode               *node);
-const char   *eek_theme_node_get_element_id
-                                 (EekThemeNode               *node);
-const char   *eek_theme_node_get_element_class
-                                 (EekThemeNode               *node);
-const char   *eek_theme_node_get_pseudo_class
-                                 (EekThemeNode               *node);
-
-/* Generic getters ... these are not cached so are less efficient. The other
- * reason for adding the more specific version is that we can handle the
- * details of the actual CSS rules, which can be complicated, especially
- * for fonts
- */
-void          eek_theme_node_get_color
-                                 (EekThemeNode               *node,
-                                  const char                 *property_name,
-                                  EekColor                   *color);
-
-/* Specific getters for particular properties: cached
- */
-void          eek_theme_node_get_background_color
-                                 (EekThemeNode               *node,
-                                  EekColor                   *color);
-void          eek_theme_node_get_foreground_color
-                                 (EekThemeNode               *node,
-                                  EekColor                   *color);
-void          eek_theme_node_get_background_gradient
-                                 (EekThemeNode               *node,
-                                  EekGradientType            *type,
-                                  EekColor                   *start,
-                                  EekColor                   *end);
-int           eek_theme_node_get_border_width
-                                 (EekThemeNode               *node,
-                                  EekSide                     side);
-int           eek_theme_node_get_border_radius
-                                 (EekThemeNode               *node,
-                                  EekCorner                   corner);
-void          eek_theme_node_get_border_color
-                                 (EekThemeNode               *node,
-                                  EekSide                     side,
-                                  EekColor                   *color);
-
-/* Font rule processing is pretty complicated, so we just hardcode it
- * under the standard font/font-family/font-size/etc names. This means
- * you can't have multiple separate styled fonts for a single item,
- * but that should be OK.
- */
-const PangoFontDescription *eek_theme_node_get_font (EekThemeNode *node);
-
-G_END_DECLS
-
-#endif /* __EEK_THEME_NODE_H__ */

eek/eek-theme-private.h

@@ -1,22 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __EEK_THEME_PRIVATE_H__
-#define __EEK_THEME_PRIVATE_H__
-
-#include <libcroco/libcroco.h>
-#include "eek-theme.h"
-
-G_BEGIN_DECLS
-
-GPtrArray *_eek_theme_get_matched_properties (EekTheme       *theme,
-                                             EekThemeNode   *node);
-
-/* Resolve an URL from the stylesheet to a filename */
-char *_eek_theme_resolve_url (EekTheme      *theme,
-                             CRStyleSheet *base_stylesheet,
-                             const char   *url);
-
-CRDeclaration *_eek_theme_parse_declaration_list (const char *str);
-
-G_END_DECLS
-
-#endif /* __EEK_THEME_PRIVATE_H__ */