Imported Upstream version 0.0.2

7 files changed, 260 insertions, 139 deletions

diff --git a/Makefile.in b/Makefile.in
index 2900eea..0b86c43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in AUTHORS COPYING INSTALL README \
-	config.guess config.sub install-sh missing ltmain.sh
+	config.guess config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -204,6 +204,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -217,11 +218,11 @@ EDJE_CC_PATH = @EDJE_CC_PATH@
 EFL_CFLAGS = @EFL_CFLAGS@
 EFL_LIBS = @EFL_LIBS@
 EGREP = @EGREP@
-ELDBUS_CFLAGS = @ELDBUS_CFLAGS@
-ELDBUS_LIBS = @ELDBUS_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IBUS_CFLAGS = @IBUS_CFLAGS@
+IBUS_LIBS = @IBUS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -263,6 +264,8 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/aclocal.m4 b/aclocal.m4
index fbc0cb4..fe5c841 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1340,7 +1340,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1359,7 +1362,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -9831,6 +9837,8 @@ AC_SUBST([am__untar])
 AC_DEFUN([WAYLAND_SCANNER_RULES], [
     PKG_PROG_PKG_CONFIG
 
+    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner])
+
     wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
     AC_SUBST([wayland_scanner])
 
diff --git a/config.h.in b/config.h.in
index 918eb57..423fcf8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Build integration with IBus input method system */
-#undef BUILD_IBUS
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
diff --git a/configure b/configure
index 12091e9..a9adc1d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for weekeyboard 0.0.1.
+# Generated by GNU Autoconf 2.69 for weekeyboard 0.0.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='weekeyboard'
 PACKAGE_TARNAME='weekeyboard'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='weekeyboard 0.0.1'
+PACKAGE_VERSION='0.0.2'
+PACKAGE_STRING='weekeyboard 0.0.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -632,13 +632,14 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CXXFLAGS
 wayland_protocoldir
 wayland_scanner
+WAYLAND_SCANNER_LIBS
+WAYLAND_SCANNER_CFLAGS
 have_ibus
-ELDBUS_LIBS
-ELDBUS_CFLAGS
-ENABLE_IBUS_FALSE
-ENABLE_IBUS_TRUE
+IBUS_LIBS
+IBUS_CFLAGS
 EDJE_CC_PATH
 EFL_LIBS
 EFL_CFLAGS
@@ -776,7 +777,6 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 with_edje_cc
-enable_ibus
 '
       ac_precious_vars='build_alias
 host_alias
@@ -794,8 +794,10 @@ WAYLAND_CFLAGS
 WAYLAND_LIBS
 EFL_CFLAGS
 EFL_LIBS
-ELDBUS_CFLAGS
-ELDBUS_LIBS'
+IBUS_CFLAGS
+IBUS_LIBS
+WAYLAND_SCANNER_CFLAGS
+WAYLAND_SCANNER_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1336,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures weekeyboard 0.0.1 to adapt to many kinds of systems.
+\`configure' configures weekeyboard 0.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1406,7 +1408,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of weekeyboard 0.0.1:";;
+     short | recursive ) echo "Configuration of weekeyboard 0.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1425,7 +1427,6 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-ibus          Disable integration with IBus input method system
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1457,9 +1458,12 @@ Some influential environment variables:
               linker flags for WAYLAND, overriding pkg-config
   EFL_CFLAGS  C compiler flags for EFL, overriding pkg-config
   EFL_LIBS    linker flags for EFL, overriding pkg-config
-  ELDBUS_CFLAGS
-              C compiler flags for ELDBUS, overriding pkg-config
-  ELDBUS_LIBS linker flags for ELDBUS, overriding pkg-config
+  IBUS_CFLAGS C compiler flags for IBUS, overriding pkg-config
+  IBUS_LIBS   linker flags for IBUS, overriding pkg-config
+  WAYLAND_SCANNER_CFLAGS
+              C compiler flags for WAYLAND_SCANNER, overriding pkg-config
+  WAYLAND_SCANNER_LIBS
+              linker flags for WAYLAND_SCANNER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1527,7 +1531,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-weekeyboard configure 0.0.1
+weekeyboard configure 0.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1805,7 +1809,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by weekeyboard $as_me 0.0.1, which was
+It was created by weekeyboard $as_me 0.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2158,9 +2162,9 @@ weekeyboard_MAJOR=0
 
 weekeyboard_MINOR=0
 
-weekeyboard_MICRO=1
+weekeyboard_MICRO=2
 
-weekeyboard_VERSION=0.0.1
+weekeyboard_VERSION=0.0.2
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -2681,7 +2685,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='weekeyboard'
- VERSION='0.0.1'
+ VERSION='0.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6236,7 +6240,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -6254,7 +6258,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -6273,7 +6280,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -11629,12 +11639,12 @@ if test -n "$EFL_CFLAGS"; then
     pkg_cv_EFL_CFLAGS="$EFL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina eet evas ecore ecore-evas ecore-wayland edje\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eina eet evas ecore ecore-evas ecore-wayland edje") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina evas ecore ecore-evas ecore-wayland edje\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina evas ecore ecore-evas ecore-wayland edje") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EFL_CFLAGS=`$PKG_CONFIG --cflags "eina eet evas ecore ecore-evas ecore-wayland edje" 2>/dev/null`
+  pkg_cv_EFL_CFLAGS=`$PKG_CONFIG --cflags "eina evas ecore ecore-evas ecore-wayland edje" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11646,12 +11656,12 @@ if test -n "$EFL_LIBS"; then
     pkg_cv_EFL_LIBS="$EFL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina eet evas ecore ecore-evas ecore-wayland edje\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eina eet evas ecore ecore-evas ecore-wayland edje") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina evas ecore ecore-evas ecore-wayland edje\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina evas ecore ecore-evas ecore-wayland edje") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EFL_LIBS=`$PKG_CONFIG --libs "eina eet evas ecore ecore-evas ecore-wayland edje" 2>/dev/null`
+  pkg_cv_EFL_LIBS=`$PKG_CONFIG --libs "eina evas ecore ecore-evas ecore-wayland edje" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11672,14 +11682,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EFL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina eet evas ecore ecore-evas ecore-wayland edje" 2>&1`
+	        EFL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina evas ecore ecore-evas ecore-wayland edje" 2>&1`
         else
-	        EFL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina eet evas ecore ecore-evas ecore-wayland edje" 2>&1`
+	        EFL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina evas ecore ecore-evas ecore-wayland edje" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EFL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (eina eet evas ecore ecore-evas ecore-wayland edje) were not met:
+	as_fn_error $? "Package requirements (eina evas ecore ecore-evas ecore-wayland edje) were not met:
 
 $EFL_PKG_ERRORS
 
@@ -11723,39 +11733,20 @@ fi
 
 
 
-# Check whether --enable-ibus was given.
-if test "${enable_ibus+set}" = set; then :
-  enableval=$enable_ibus;
-else
-  enable_ibus=yes
-fi
-
-
- if test "x$enable_ibus" = "xyes"; then
-  ENABLE_IBUS_TRUE=
-  ENABLE_IBUS_FALSE='#'
-else
-  ENABLE_IBUS_TRUE='#'
-  ENABLE_IBUS_FALSE=
-fi
-
-
-if test "x$enable_ibus" = "xyes"; then
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELDBUS" >&5
-$as_echo_n "checking for ELDBUS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IBUS" >&5
+$as_echo_n "checking for IBUS... " >&6; }
 
-if test -n "$ELDBUS_CFLAGS"; then
-    pkg_cv_ELDBUS_CFLAGS="$ELDBUS_CFLAGS"
+if test -n "$IBUS_CFLAGS"; then
+    pkg_cv_IBUS_CFLAGS="$IBUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eldbus\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eldbus") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eldbus eet efreet\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eldbus eet efreet") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_ELDBUS_CFLAGS=`$PKG_CONFIG --cflags "eldbus" 2>/dev/null`
+  pkg_cv_IBUS_CFLAGS=`$PKG_CONFIG --cflags "eldbus eet efreet" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11763,16 +11754,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$ELDBUS_LIBS"; then
-    pkg_cv_ELDBUS_LIBS="$ELDBUS_LIBS"
+if test -n "$IBUS_LIBS"; then
+    pkg_cv_IBUS_LIBS="$IBUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eldbus\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eldbus") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eldbus eet efreet\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eldbus eet efreet") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_ELDBUS_LIBS=`$PKG_CONFIG --libs "eldbus" 2>/dev/null`
+  pkg_cv_IBUS_LIBS=`$PKG_CONFIG --libs "eldbus eet efreet" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -11793,22 +11784,22 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ELDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eldbus" 2>&1`
+	        IBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eldbus eet efreet" 2>&1`
         else
-	        ELDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eldbus" 2>&1`
+	        IBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eldbus eet efreet" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$ELDBUS_PKG_ERRORS" >&5
+	echo "$IBUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (eldbus) were not met:
+	as_fn_error $? "Package requirements (eldbus eet efreet) were not met:
 
-$ELDBUS_PKG_ERRORS
+$IBUS_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables ELDBUS_CFLAGS
-and ELDBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables IBUS_CFLAGS
+and IBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -11819,20 +11810,20 @@ as_fn_error $? "The pkg-config script could not be found or is too old.  Make su
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables ELDBUS_CFLAGS
-and ELDBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables IBUS_CFLAGS
+and IBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	ELDBUS_CFLAGS=$pkg_cv_ELDBUS_CFLAGS
-	ELDBUS_LIBS=$pkg_cv_ELDBUS_LIBS
+	IBUS_CFLAGS=$pkg_cv_IBUS_CFLAGS
+	IBUS_LIBS=$pkg_cv_IBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
-    # Extract the first word of "ibus", so it can be a program name with args.
+# Extract the first word of "ibus", so it can be a program name with args.
 set dummy ibus; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -11871,22 +11862,17 @@ fi
 
 
 
-    if  test "x$have ibus" = "xno" ; then :
+if  test "x$have ibus" = "xno" ; then :
    as_fn_error $? "The ibus executable was not found." "$LINENO" 5
 fi
 
-    IBUS_ADDR=`ibus address > /dev/null 2>&1`
-    if  test $? -ne 0 ; then :
+IBUS_ADDR=`ibus address > /dev/null 2>&1`
+if  test $? -ne 0 ; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The ibus executable does not support 'address' argument." >&5
 $as_echo "$as_me: WARNING: The ibus executable does not support 'address' argument." >&2;}
 fi
 
 
-$as_echo "#define BUILD_IBUS 1" >>confdefs.h
-
-fi
-
-
 
 
 
@@ -12008,6 +11994,98 @@ $as_echo "no" >&6; }
 	fi
 fi
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_SCANNER" >&5
+$as_echo_n "checking for WAYLAND_SCANNER... " >&6; }
+
+if test -n "$WAYLAND_SCANNER_CFLAGS"; then
+    pkg_cv_WAYLAND_SCANNER_CFLAGS="$WAYLAND_SCANNER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_CFLAGS=`$PKG_CONFIG --cflags "wayland-scanner" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$WAYLAND_SCANNER_LIBS"; then
+    pkg_cv_WAYLAND_SCANNER_LIBS="$WAYLAND_SCANNER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_LIBS=`$PKG_CONFIG --libs "wayland-scanner" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-scanner" 2>&1`
+        else
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-scanner" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$WAYLAND_SCANNER_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (wayland-scanner) were not met:
+
+$WAYLAND_SCANNER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables WAYLAND_SCANNER_CFLAGS
+and WAYLAND_SCANNER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables WAYLAND_SCANNER_CFLAGS
+and WAYLAND_SCANNER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	WAYLAND_SCANNER_CFLAGS=$pkg_cv_WAYLAND_SCANNER_CFLAGS
+	WAYLAND_SCANNER_LIBS=$pkg_cv_WAYLAND_SCANNER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
     wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
 
 
@@ -12018,6 +12096,12 @@ fi
 
 
 
+CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter"
+
+
+CXXFLAGS="$CXXFLAGS -Wextra -Wno-unused-parameter"
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile data/themes/Makefile protocol/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -12153,10 +12237,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_IBUS_TRUE}" && test -z "${ENABLE_IBUS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_IBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -12554,7 +12634,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by weekeyboard $as_me 0.0.1, which was
+This file was extended by weekeyboard $as_me 0.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12620,7 +12700,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-weekeyboard config.status 0.0.1
+weekeyboard config.status 0.0.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index effe392..b04dc0d 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -151,6 +151,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -164,11 +165,11 @@ EDJE_CC_PATH = @EDJE_CC_PATH@
 EFL_CFLAGS = @EFL_CFLAGS@
 EFL_LIBS = @EFL_LIBS@
 EGREP = @EGREP@
-ELDBUS_CFLAGS = @ELDBUS_CFLAGS@
-ELDBUS_LIBS = @ELDBUS_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IBUS_CFLAGS = @IBUS_CFLAGS@
+IBUS_LIBS = @IBUS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -210,6 +211,8 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/protocol/Makefile.in b/protocol/Makefile.in
index 78c8a6d..08c372e 100644
--- a/protocol/Makefile.in
+++ b/protocol/Makefile.in
@@ -121,6 +121,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -134,11 +135,11 @@ EDJE_CC_PATH = @EDJE_CC_PATH@
 EFL_CFLAGS = @EFL_CFLAGS@
 EFL_LIBS = @EFL_LIBS@
 EGREP = @EGREP@
-ELDBUS_CFLAGS = @ELDBUS_CFLAGS@
-ELDBUS_LIBS = @ELDBUS_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IBUS_CFLAGS = @IBUS_CFLAGS@
+IBUS_LIBS = @IBUS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,6 +181,8 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/src/Makefile.in b/src/Makefile.in
index bc927a9..1345669 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,9 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = weekeyboard$(EXEEXT)
-@ENABLE_IBUS_TRUE@noinst_PROGRAMS =  \
-@ENABLE_IBUS_TRUE@	weekeyboard-config-eet-test$(EXEEXT) \
-@ENABLE_IBUS_TRUE@	weekeyboard-ibus-test$(EXEEXT)
+noinst_PROGRAMS = weekeyboard-config-eet-test$(EXEEXT) \
+	weekeyboard-ibus-test$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
@@ -95,7 +94,10 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_weekeyboard_OBJECTS = wkb-main.$(OBJEXT) \
+am_weekeyboard_OBJECTS = wkb-main.$(OBJEXT) wkb-log.$(OBJEXT) \
+	wkb-ibus.$(OBJEXT) wkb-ibus-helper.$(OBJEXT) \
+	wkb-ibus-panel.$(OBJEXT) wkb-ibus-config.$(OBJEXT) \
+	wkb-ibus-config-key.$(OBJEXT) wkb-ibus-config-eet.$(OBJEXT) \
 	input-method-protocol.$(OBJEXT) text-protocol.$(OBJEXT)
 weekeyboard_OBJECTS = $(am_weekeyboard_OBJECTS)
 weekeyboard_LDADD = $(LDADD)
@@ -103,22 +105,17 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am__weekeyboard_config_eet_test_SOURCES_DIST = wkb-ibus-config-eet.c \
-	wkb-ibus-config-eet.h wkb-ibus-config-eet-test.c
-@ENABLE_IBUS_TRUE@am_weekeyboard_config_eet_test_OBJECTS =  \
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.$(OBJEXT) \
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet-test.$(OBJEXT)
+am_weekeyboard_config_eet_test_OBJECTS = wkb-log.$(OBJEXT) \
+	wkb-ibus-config-key.$(OBJEXT) wkb-ibus-config-eet.$(OBJEXT) \
+	wkb-ibus-config-eet-test.$(OBJEXT)
 weekeyboard_config_eet_test_OBJECTS =  \
 	$(am_weekeyboard_config_eet_test_OBJECTS)
 weekeyboard_config_eet_test_LDADD = $(LDADD)
-am__weekeyboard_ibus_test_SOURCES_DIST = wkb-ibus.h wkb-ibus.c \
-	wkb-ibus-panel.c wkb-ibus-config.c wkb-ibus-config-eet.c \
-	wkb-ibus-config-eet.h wkb-ibus-test.c
-@ENABLE_IBUS_TRUE@am_weekeyboard_ibus_test_OBJECTS =  \
-@ENABLE_IBUS_TRUE@	wkb-ibus.$(OBJEXT) wkb-ibus-panel.$(OBJEXT) \
-@ENABLE_IBUS_TRUE@	wkb-ibus-config.$(OBJEXT) \
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.$(OBJEXT) \
-@ENABLE_IBUS_TRUE@	wkb-ibus-test.$(OBJEXT)
+am_weekeyboard_ibus_test_OBJECTS = wkb-ibus.$(OBJEXT) \
+	wkb-ibus-helper.$(OBJEXT) wkb-log.$(OBJEXT) \
+	wkb-ibus-panel.$(OBJEXT) wkb-ibus-config.$(OBJEXT) \
+	wkb-ibus-config-key.$(OBJEXT) wkb-ibus-config-eet.$(OBJEXT) \
+	wkb-ibus-test.$(OBJEXT)
 weekeyboard_ibus_test_OBJECTS = $(am_weekeyboard_ibus_test_OBJECTS)
 weekeyboard_ibus_test_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -159,8 +156,8 @@ SOURCES = $(weekeyboard_SOURCES) \
 	$(weekeyboard_config_eet_test_SOURCES) \
 	$(weekeyboard_ibus_test_SOURCES)
 DIST_SOURCES = $(weekeyboard_SOURCES) \
-	$(am__weekeyboard_config_eet_test_SOURCES_DIST) \
-	$(am__weekeyboard_ibus_test_SOURCES_DIST)
+	$(weekeyboard_config_eet_test_SOURCES) \
+	$(weekeyboard_ibus_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -199,6 +196,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -212,11 +210,11 @@ EDJE_CC_PATH = @EDJE_CC_PATH@
 EFL_CFLAGS = @EFL_CFLAGS@
 EFL_LIBS = @EFL_LIBS@
 EGREP = @EGREP@
-ELDBUS_CFLAGS = @ELDBUS_CFLAGS@
-ELDBUS_LIBS = @ELDBUS_LIBS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IBUS_CFLAGS = @IBUS_CFLAGS@
+IBUS_LIBS = @IBUS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -258,6 +256,8 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,34 +320,58 @@ weekeyboard_VERSION = @weekeyboard_VERSION@
 AM_CFLAGS = \
 	@WAYLAND_CFLAGS@			\
 	@EFL_CFLAGS@				\
-	@ELDBUS_CFLAGS@				\
+	@IBUS_CFLAGS@				\
 	-DPKGDATADIR='"$(pkgdatadir)"'
 
 AM_LDFLAGS = \
 	@WAYLAND_LIBS@				\
 	@EFL_LIBS@				\
-	@ELDBUS_LIBS@
+	@IBUS_LIBS@
 
 weekeyboard_SOURCES = \
 	wkb-main.c				\
+	wkb-log.c				\
+	wkb-log.h				\
+	wkb-ibus.h				\
+	wkb-ibus.c				\
+	wkb-ibus-helper.h			\
+	wkb-ibus-helper.c			\
+	wkb-ibus-defs.h				\
+	wkb-ibus-panel.c			\
+	wkb-ibus-config.c			\
+	wkb-ibus-config-key.c			\
+	wkb-ibus-config-key.h			\
+	wkb-ibus-config-eet.c			\
+	wkb-ibus-config-eet.h			\
 	input-method-protocol.c			\
 	input-method-client-protocol.h		\
 	text-protocol.c				\
 	text-client-protocol.h
 
-@ENABLE_IBUS_TRUE@weekeyboard_config_eet_test_SOURCES = \
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.c			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.h			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet-test.c
-
-@ENABLE_IBUS_TRUE@weekeyboard_ibus_test_SOURCES = \
-@ENABLE_IBUS_TRUE@	wkb-ibus.h				\
-@ENABLE_IBUS_TRUE@	wkb-ibus.c				\
-@ENABLE_IBUS_TRUE@	wkb-ibus-panel.c			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-config.c			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.c			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-config-eet.h			\
-@ENABLE_IBUS_TRUE@	wkb-ibus-test.c
+weekeyboard_config_eet_test_SOURCES = \
+	wkb-log.c				\
+	wkb-log.h				\
+	wkb-ibus-config-key.c			\
+	wkb-ibus-config-key.h			\
+	wkb-ibus-config-eet.c			\
+	wkb-ibus-config-eet.h			\
+	wkb-ibus-config-eet-test.c
+
+weekeyboard_ibus_test_SOURCES = \
+	wkb-ibus.h				\
+	wkb-ibus.c				\
+	wkb-ibus-helper.h			\
+	wkb-ibus-helper.c			\
+	wkb-log.c				\
+	wkb-log.h				\
+	wkb-ibus-defs.h				\
+	wkb-ibus-panel.c			\
+	wkb-ibus-config.c			\
+	wkb-ibus-config-key.c			\
+	wkb-ibus-config-key.h			\
+	wkb-ibus-config-eet.c			\
+	wkb-ibus-config-eet.h			\
+	wkb-ibus-test.c
 
 BUILT_SOURCES = \
 	 input-method-protocol.c		\
@@ -471,10 +495,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-protocol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-config-eet-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-config-eet.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-config-key.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-config.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-ibus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wkb-main.Po@am__quote@
 
 .c.o: