Minimal changes to compile under the VM without (most?) X11 calls

Key-repeat timer should be cleared when the server receives a new D-Bus.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=857977

bindings/vala/Makefile.am

@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+NULL =
+
 if ENABLE_VALA
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA =				\
@@ -45,7 +47,7 @@ maintainer-clean-local:
 eek_vapi_deps =						\
 	$(srcdir)/Eek-$(EEK_API_VERSION).metadata	\
 	|						\
-	$(top_srcdir)/eek/Eek-$(EEK_API_VERSION).gir	\
+	$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir	\
 	$(NULL)
 
 eek-$(EEK_API_VERSION).vapi: $(eek_vapi_deps)
@@ -53,34 +55,37 @@ eek-$(EEK_API_VERSION).vapi: $(eek_vapi_deps)
 		--library eek-$(EEK_API_VERSION) \
 		--pkg gio-2.0 \
 		--metadatadir=$(srcdir) \
-		$(top_srcdir)/eek/Eek-$(EEK_API_VERSION).gir
+		$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir
 
 eek_gtk_vapi_deps =					\
 	$(srcdir)/EekGtk-$(EEK_API_VERSION).metadata	\
 	|						\
-	$(top_srcdir)/eek/EekGtk-$(EEK_API_VERSION).gir	\
+	$(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_srcdir)/eek/EekGtk-$(EEK_API_VERSION).gir
+		$(top_builddir)/eek/EekGtk-$(EEK_API_VERSION).gir
 
 eek_xkl_vapi_deps =						\
 	$(srcdir)/EekXkl-$(EEK_API_VERSION).metadata		\
 	|							\
-	$(top_srcdir)/eek/EekXkl-$(EEK_API_VERSION).gir	\
+	$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir	\
 	$(NULL)
 
 eek-xkl-$(EEK_API_VERSION).vapi: $(eek_xkl_vapi_deps)
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir)		\
+	$(VAPIGEN_V)$(VAPIGEN) \
+		--vapidir=$(builddir) \
 		--library eek-xkl-$(EEK_API_VERSION) \
 		--pkg eek-$(EEK_API_VERSION) \
+		--pkg gio-2.0 \
 		--metadatadir=$(srcdir) \
-		$(top_srcdir)/eek/EekXkl-$(EEK_API_VERSION).gir
+		$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir
 
 # set up the verbosity rules to avoid some build noise
 VAPIGEN_V = $(VAPIGEN_V_$(V))

bindings/vala/eek-xkl-0.90.deps

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

eek/Makefile.am

@@ -16,10 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+NULL =
+
 lib_LTLIBRARIES =				\
 	libeek.la				\
 	libeek-gtk.la				\
-	libeek-xkl.la
+	libeek-xkl.la				\
+	$(NULL)
 
 libeek_public_headers =				\
 	$(srcdir)/eek-layout.h			\
@@ -37,17 +40,17 @@ libeek_public_headers =				\
 	$(srcdir)/eek-xml-layout.h		\
 	$(srcdir)/eek-serializable.h		\
 	$(srcdir)/eek-theme.h			\
-	$(srcdir)/eek.h
+	$(srcdir)/eek.h				\
+	$(NULL)
 
 libeek_private_headers =			\
 	$(srcdir)/eek-renderer.h		\
-	$(srcdir)/eek-special-keysym-entries.h	\
-	$(srcdir)/eek-unicode-keysym-entries.h	\
-	$(srcdir)/eek-xkeysym-keysym-entries.h	\
-	$(srcdir)/eek-marshalers.h		\
+	$(libeek_keysym_headers)		\
+	$(builddir)/eek-marshalers.h		\
 	$(srcdir)/eek-theme-context.h		\
 	$(srcdir)/eek-theme-private.h		\
-	$(srcdir)/eek-theme-node.h
+	$(srcdir)/eek-theme-node.h		\
+	$(NULL)
 
 libeek_sources =				\
 	$(srcdir)/eek.c				\
@@ -69,30 +72,36 @@ libeek_sources =				\
 	$(srcdir)/eek-keyboard-drawing.c	\
 	$(srcdir)/eek-theme.c			\
 	$(srcdir)/eek-theme-context.c		\
-	$(srcdir)/eek-theme-node.c
+	$(srcdir)/eek-theme-node.c		\
+	$(NULL)
 
-libeek_keysym_sources =				\
-	$(srcdir)/eek-special-keysym-entries.h	\
-	$(srcdir)/eek-unicode-keysym-entries.h	\
-	$(srcdir)/eek-xkeysym-keysym-entries.h
+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 =			\
-	$(srcdir)/eek-enumtypes.c		\
-	$(srcdir)/eek-enumtypes.h
+	$(builddir)/eek-enumtypes.c		\
+	$(builddir)/eek-enumtypes.h		\
+	$(NULL)
 
 libeek_marshalers_sources =			\
-	$(srcdir)/eek-marshalers.c		\
-	$(srcdir)/eek-marshalers.h
+	$(builddir)/eek-marshalers.c		\
+	$(builddir)/eek-marshalers.h		\
+	$(NULL)
 
 BUILT_SOURCES =					\
-	$(libeek_keysym_sources)		\
+	$(libeek_keysym_headers)		\
 	$(libeek_enumtypes_sources)		\
-	$(libeek_marshalers_sources)
+	$(libeek_marshalers_sources)		\
+	$(NULL)
 
 libeek_la_SOURCES =				\
 	$(libeek_sources)			\
-	$(srcdir)/eek-enumtypes.c		\
-	$(srcdir)/eek-marshalers.c
+	$(builddir)/eek-enumtypes.c		\
+	$(builddir)/eek-marshalers.c		\
+	$(NULL)
 
 libeek_la_CFLAGS =					\
 	-DEEK_COMPILATION=1				\
@@ -111,12 +120,15 @@ libeek_la_LIBADD =				\
 
 libeek_gtk_public_headers =			\
 	$(srcdir)/eek-gtk-keyboard.h		\
-	$(srcdir)/eek-gtk.h
+	$(srcdir)/eek-gtk.h			\
+	$(NULL)
 libeek_gtk_private_headers =			\
-	$(srcdir)/eek-gtk-renderer.h
+	$(srcdir)/eek-gtk-renderer.h		\
+	$(NULL)
 libeek_gtk_sources =				\
 	$(srcdir)/eek-gtk-keyboard.c		\
-	$(srcdir)/eek-gtk-renderer.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)
@@ -126,11 +138,13 @@ libeek_xkl_public_headers =			\
 	$(srcdir)/eek-xkl-layout.h		\
 	$(srcdir)/eek-xkl.h			\
 	$(srcdir)/eek-xkb-layout.h		\
-	$(srcdir)/eek-xkb.h
+	$(srcdir)/eek-xkb.h			\
+	$(NULL)
 
 libeek_xkl_sources =				\
 	$(srcdir)/eek-xkb-layout.c		\
-	$(srcdir)/eek-xkl-layout.c
+	$(srcdir)/eek-xkl-layout.c		\
+	$(NULL)
 
 libeek_xkl_la_SOURCES = $(libeek_xkl_sources)
 libeek_xkl_la_CFLAGS = -DEEK_COMPILATION=1 $(LIBXKLAVIER_CFLAGS)
@@ -139,56 +153,68 @@ libeek_xkl_la_LIBADD = libeek.la $(LIBXKLAVIER_LIBS)
 eekdir = $(includedir)/eek-$(EEK_API_VERSION)/eek
 eek_HEADERS =					\
 	$(libeek_public_headers)		\
-	$(srcdir)/eek-enumtypes.h		\
+	$(builddir)/eek-enumtypes.h		\
 	$(libeek_gtk_public_headers)		\
-	$(libeek_xkl_public_headers)
+	$(libeek_xkl_public_headers)		\
+	$(NULL)
 
 noinst_HEADERS =				\
 	$(libeek_private_headers)		\
 	$(libeek_gtk_private_headers)		\
-	$(libeek_xkl_private_headers)
+	$(libeek_xkl_private_headers)		\
+	$(NULL)
 
 eek-special-keysym-entries.h: special-keysym-entries.txt
-	$(AM_V_GEN) $(PYTHON) ./gen-keysym-entries.py special_keysym_entries \
+	$(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) ./gen-keysym-entries.py unicode_keysym_entries \
+	$(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) ./gen-keysym-entries.py xkeysym_keysym_entries \
+	$(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 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 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 && \
+	$(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 && \
+	$(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
+	eek-xkl-$(EEK_API_VERSION).pc		\
+	$(NULL)
 
 CLEANFILES =
 
 DISTCLEANFILES =				\
 	$(BUILT_SOURCES)			\
-	$(pkgconfig_DATA)
+	$(pkgconfig_DATA)			\
+	$(NULL)
 
 EXTRA_DIST =					\
 	gen-keysym-entries.py			\
@@ -197,7 +223,8 @@ EXTRA_DIST =					\
 	xkeysym-keysym-entries.txt		\
 	eek-enumtypes.h.template		\
 	eek-enumtypes.c.template		\
-	eek-marshalers.list
+	eek-marshalers.list			\
+	$(NULL)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
@@ -207,29 +234,57 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 if HAVE_INTROSPECTION
 
 Eek@EEK_LIBRARY_SUFFIX@.gir: libeek.la
-Eek@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS = --strip-prefix=Eek --pkg=glib-2.0 --pkg-export=eek-$(EEK_API_VERSION)
+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) $(srcdir)/eek-enumtypes.h
+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 = --pkg-export=eek-gtk-$(EEK_API_VERSION)
-EekGtk@EEK_LIBRARY_SUFFIX_U@_gir_INCLUDES = GObject-2.0 Gtk-@GTK_API_VERSION@ Eek@EEK_LIBRARY_SUFFIX@
+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)
+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)
+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
+	EekXkl@EEK_LIBRARY_SUFFIX@.gir		\
+	$(NULL)
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)

eekboard/Makefile.am

@@ -16,55 +16,69 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+NULL =
+
 lib_LTLIBRARIES = libeekboard.la
 
 libeekboard_headers =				\
-	eekboard-service.h			\
-	eekboard-context-service.h		\
-	eekboard-client.h			\
-	eekboard-context.h			\
-	eekboard-xklutil.h
+	$(srcdir)/eekboard-service.h		\
+	$(srcdir)/eekboard-context-service.h	\
+	$(srcdir)/eekboard-client.h		\
+	$(srcdir)/eekboard-context.h		\
+	$(srcdir)/eekboard-xklutil.h		\
+	$(NULL)
+
 libeekboard_private_headers =			\
-	eekboard-marshalers.h
+	$(builddir)/eekboard-marshalers.h	\
+	$(NULL)
+
 libeekboard_sources =				\
-	eekboard-service.c			\
-	eekboard-context-service.c		\
-	eekboard-client.c			\
-	eekboard-context.c			\
-	eekboard-xklutil.c
+	$(srcdir)/eekboard-service.c		\
+	$(srcdir)/eekboard-context-service.c	\
+	$(srcdir)/eekboard-client.c		\
+	$(srcdir)/eekboard-context.c		\
+	$(srcdir)/eekboard-xklutil.c		\
+	$(NULL)
 
 libeekboard_marshalers_sources =		\
-	eekboard-marshalers.c			\
-	eekboard-marshalers.h
+	$(builddir)/eekboard-marshalers.c	\
+	$(builddir)/eekboard-marshalers.h	\
+	$(NULL)
 
 BUILT_SOURCES =					\
-	$(libeekboard_marshalers_sources)
+	$(libeekboard_marshalers_sources)	\
+	$(NULL)
 
 libeekboard_la_SOURCES =			\
 	$(libeekboard_sources)			\
-	eekboard-marshalers.c
+	$(builddir)/eekboard-marshalers.c	\
+	$(NULL)
 
 libeekboard_la_CFLAGS =					\
 	-DEEKBOARD_COMPILATION=1			\
 	-DKEYBOARDDIR=\"$(pkgdatadir)/keyboards\"	\
 	-I$(top_srcdir)					\
 	$(GIO2_CFLAGS)					\
-	$(LIBXKLAVIER_CFLAGS)
+	$(LIBXKLAVIER_CFLAGS)				\
+	$(NULL)
 libeekboard_la_LIBADD =				\
 	$(top_builddir)/eek/libeek.la		\
 	$(top_builddir)/eek/libeek-xkl.la	\
 	$(GIO2_LIBS)				\
-	$(LIBXKLAVIER_LIBS)
+	$(LIBXKLAVIER_LIBS)			\
+	$(NULL)
 
 eekboarddir = $(includedir)/eekboard-$(EEK_API_VERSION)/eekboard
 eekboard_HEADERS = $(libeekboard_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
-	eekboard-$(EEK_API_VERSION).pc
+	eekboard-$(EEK_API_VERSION).pc		\
+	$(NULL)
 DISTCLEANFILES =				\
 	$(BUILT_SOURCES)			\
-	$(pkgconfig_DATA)
+	$(pkgconfig_DATA)			\
+	$(NULL)
 
 CLEANFILES =
 
@@ -72,22 +86,37 @@ EXTRA_DIST = eekboard-marshalers.list
 
 # gen marshal
 eekboard-marshalers.h: eekboard-marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_eekboard_marshal $(srcdir)/eekboard-marshalers.list --header --internal > $@.tmp && \
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_eekboard_marshal \
+		$(srcdir)/eekboard-marshalers.list --header --internal \
+		> $@.tmp && \
 	mv $@.tmp $@
 
 eekboard-marshalers.c: eekboard-marshalers.list eekboard-marshalers.h
 	$(AM_V_GEN) (echo "#include \"eekboard-marshalers.h\""; \
-	$(GLIB_GENMARSHAL) --prefix=_eekboard_marshal $(srcdir)/eekboard-marshalers.list --body --internal) > $@.tmp && \
+	$(GLIB_GENMARSHAL) \
+		--prefix=_eekboard_marshal \
+		$(srcdir)/eekboard-marshalers.list --body --internal) \
+		> $@.tmp && \
 	mv $@.tmp $@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(builddir) --add-include-path=$(top_builddir)/eek
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/eek
+INTROSPECTION_SCANNER_ARGS =			\
+	--add-include-path=$(builddir)		\
+	--add-include-path=$(top_builddir)/eek	\
+	$(NULL)
+INTROSPECTION_COMPILER_ARGS =			\
+	--includedir=$(builddir)		\
+	--includedir=$(top_builddir)/eek	\
+	$(NULL)
 
 if HAVE_INTROSPECTION
 Eekboard@EEK_LIBRARY_SUFFIX@.gir: libeekboard.la
-Eekboard@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS = --strip-prefix=Eekboard
+Eekboard@EEK_LIBRARY_SUFFIX_U@_gir_SCANNERFLAGS =	\
+	--identifier-prefix=Eekboard			\
+	--symbol-prefix=eekboard			\
+	$(NULL)
 Eekboard@EEK_LIBRARY_SUFFIX_U@_gir_INCLUDES = Eek@EEK_LIBRARY_SUFFIX@
 Eekboard@EEK_LIBRARY_SUFFIX_U@_gir_CFLAGS = $(libeekboard_la_CFLAGS)
 Eekboard@EEK_LIBRARY_SUFFIX_U@_gir_LIBS = libeekboard.la

eekboard/eekboard-context-service.c

@@ -31,7 +31,7 @@
 
 #include "eekboard/eekboard-context-service.h"
 #include "eekboard/eekboard-xklutil.h"
-#include "eek/eek-xkl.h"
+//#include "eek/eek-xkl.h"      //x11_stub
 
 #define CSW 640
 #define CSH 480
@@ -173,7 +173,7 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
             display = XOpenDisplay (NULL);
 
         error = NULL;
-        layout = eek_xkl_layout_new (display, &error);
+        //layout = eek_xkl_layout_new (display, &error);    //x11_stub
         if (layout == NULL) {
             g_warning ("can't create keyboard %s: %s",
                        keyboard_type, error->message);
@@ -181,10 +181,14 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
             return NULL;
         }
 
+        /*
+        //x11_stub
         if (!eek_xkl_layout_set_config (EEK_XKL_LAYOUT(layout), rec)) {
             g_object_unref (layout);
             return NULL;
         }
+        */
+
     } else {
         error = NULL;
         layout = eek_xml_layout_new (keyboard_type, &error);
@@ -750,6 +754,11 @@ handle_method_call (GDBusConnection       *connection,
     EekboardContextService *context = user_data;
     EekboardContextServiceClass *klass = EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context);
     
+    if (context->priv->repeat_timeout_id) {
+        g_source_remove (context->priv->repeat_timeout_id);
+        context->priv->repeat_timeout_id = 0;
+    }
+
     if (g_strcmp0 (method_name, "AddKeyboard") == 0) {
         const gchar *keyboard_type;
         static guint keyboard_id = 0;

eekboard/eekboard-context.c

@@ -151,7 +151,7 @@ eekboard_context_real_destroyed (EekboardContext *self)
 
 static void
 eekboard_context_real_key_activated (EekboardContext *self,
-                                     const gchar     *keyname,
+                                     guint            keycode,
                                      EekSymbol       *symbol,
                                      guint            modifiers)
 {

src/client-main.c

@@ -37,7 +37,9 @@ static gboolean opt_session = FALSE;
 static gchar *opt_address = NULL;
 
 static gboolean opt_focus = FALSE;
+#ifdef HAVE_ATSPI
 static gboolean opt_keystroke = FALSE;
+#endif  /* HAVE_ATSPI */
 
 static gchar *opt_keyboards = NULL;
 

src/client.c

@@ -93,7 +93,7 @@ struct _Client {
 
 #ifdef HAVE_XTEST
     guint modifier_keycodes[8]; 
-    XkbDescRec *xkb;
+    //XkbDescRec *xkb;  //x11_stub
 #endif  /* HAVE_XTEST */
 
     GSettings *settings;
@@ -858,6 +858,8 @@ get_replaced_keycode (Client *client)
 {
     guint keycode;
 
+    /*
+    //x11_stub_start
     for (keycode = client->xkb->max_key_code;
          keycode >= client->xkb->min_key_code;
          --keycode) {
@@ -867,6 +869,8 @@ get_replaced_keycode (Client *client)
             return keycode;
         }
     }
+    //x11_stub_end
+    */
 
     return 0;
 }
@@ -889,6 +893,8 @@ replace_keycode (Client *client,
     int keysyms_per_keycode;
     KeySym *syms;
 
+    /*
+    //x11_stub_start
     g_return_val_if_fail (client->xkb->min_key_code <= keycode &&
                           keycode <= client->xkb->max_key_code,
                           FALSE);
@@ -901,6 +907,8 @@ replace_keycode (Client *client,
     XSync (xdisplay, False);
     XFree (syms);
     *keysym = old_keysym;
+    //x11_stub_end
+    */
 
     return TRUE;
 }
@@ -1017,7 +1025,9 @@ send_fake_key_events (Client    *client,
     if (eek_symbol_is_modifier (symbol))
         return;
 
-    /* If symbol is a text, convert chars in it to keysym */
+    /*
+    //x11_stub_start
+    // If symbol is a text, convert chars in it to keysym
     if (EEK_IS_TEXT(symbol)) {
         const gchar *utf8 = eek_text_get_text (EEK_TEXT(symbol));
         glong items_written;
@@ -1041,6 +1051,8 @@ send_fake_key_events (Client    *client,
         g_free (ucs4);
         return;
     }
+    //x11_stub_end
+    */
 
     if (EEK_IS_KEYSYM(symbol)) {
         guint xkeysym = eek_keysym_get_xkeysym (EEK_KEYSYM(symbol));
@@ -1131,9 +1143,13 @@ client_enable_xtest (Client *client)
         return FALSE;
     }
 
+    /*
+    //x11_stub_start
     if (!client->xkb)
         client->xkb = XkbGetMap (xdisplay, XkbKeySymsMask, XkbUseCoreKbd);
     g_assert (client->xkb);
+    //x11_stub_end
+    */
 
     update_modifier_keycodes (client);
 
@@ -1147,9 +1163,13 @@ client_enable_xtest (Client *client)
 void
 client_disable_xtest (Client *client)
 {
+    /*
+    //x11_stub_start
     if (client->xkb) {
-        XkbFreeKeyboard (client->xkb, 0, TRUE);	/* free_all = TRUE */
+        XkbFreeKeyboard (client->xkb, 0, TRUE);	// free_all = TRUE 
         client->xkb = NULL;
     }
+    //x11_stub+end
+    */
 }
 #endif  /* HAVE_XTEST */