summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2011-08-08 17:27:55 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2011-08-08 17:27:55 +0900
commitdc810769a06be481c364a5f7f2835068af7694eb (patch)
tree896798ddef090308b5cf9ca9b4e3388a27184686
parent0faaa05ea0627e1b8a849ca5b6ab4492fb217bac (diff)
downloadibus-anthy-dc810769a06be481c364a5f7f2835068af7694eb.tar.gz
Added symbol and hotkeys property in IBusEngineDesc.
-rw-r--r--configure.ac45
-rw-r--r--engine/anthy.xml.in.in2
-rw-r--r--ibus-anthy.spec.in1
3 files changed, 48 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 701ced1..d1b3181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,39 @@ AC_ARG_WITH(kasumi-icon,
[KASUMI_ICON_FILE="$datadir/pixmaps/kasumi.png"])
AC_SUBST(KASUMI_ICON_FILE)
+dnl - check hotkeys for ibus-anthy which is used for ibus bridge mode.
+dnl - Normally you don't need this so could be HOTKEYS="no"
+AC_ARG_WITH(hotkeys,
+ [AC_HELP_STRING([--with-hotkeys=HOTKEYS],
+ [Use hotkeys for ibus bridge mode. (available value: yes/no/keys)])],
+ [HOTKEYS="$withval"],
+ [HOTKEYS="no"])
+if test x"$HOTKEYS" = x"no"; then
+ HOTKEYS_XML="<!-- <hotkeys>Control+space,Zenkaku_Hankaku</hotkeys> -->"
+elif test x"$HOTKEYS" = x"yes"; then
+ HOTKEYS_XML="<hotkeys>Control+space,Zenkaku_Hankaku</hotkeys>"
+elif test x"$HOTKEYS" = x; then
+ HOTKEYS_XML="<hotkeys>Control+space,Zenkaku_Hankaku</hotkeys>"
+elif test x"$HOTKEYS" = xnull; then
+ HOTKEYS_XML="<hotkeys></hotkeys>"
+else
+ HOTKEYS_XML="<hotkeys>${HOTKEYS}</hotkeys>"
+fi
+AC_SUBST(HOTKEYS_XML)
+
+SYMBOL_CHAR='&#x3042;'
+SYMBOL_TEST="import ibus
+engine = ibus.EngineDesc('test')
+exit(not hasattr(engine, 'symbol'))
+"
+$PYTHON -c "$SYMBOL_TEST"
+if test $? -eq 0; then
+ SYMBOL_XML="<symbol>${SYMBOL_CHAR}</symbol>"
+else
+ SYMBOL_XML="<!-- <symbol>${SYMBOL_CHAR}</symbol> -->"
+fi
+AC_SUBST(SYMBOL_XML)
+
dnl - define GETTEXT_* variables
GETTEXT_PACKAGE=ibus-anthy
AC_SUBST(GETTEXT_PACKAGE)
@@ -146,3 +179,15 @@ m4/Makefile
])
AC_OUTPUT
+echo "
+ IBus-Anthy version ibus_version
+
+python-config: $PYTHON_CONFIG
+PYTHON_CFLAGS $PYTHON_CFLAGS
+PYTHON_LIBS $PYTHON_LIBS
+ANTHY_ZIPCODE_FILE $ANTHY_ZIPCODE_FILE
+KASUMI_EXEC_FILE $KASUMI_EXEC_FILE
+KASUMI_ICON_FILE $KASUMI_ICON_FILE
+HOTKEYS_XML $HOTKEYS_XML
+SYMBOL_XML $SYMBOL_XML
+"
diff --git a/engine/anthy.xml.in.in b/engine/anthy.xml.in.in
index 196537f..b2f9ee7 100644
--- a/engine/anthy.xml.in.in
+++ b/engine/anthy.xml.in.in
@@ -22,6 +22,8 @@
<longname>Anthy</longname>
<description>Anthy Input Method</description>
<rank>99</rank>
+ @HOTKEYS_XML@
+ @SYMBOL_XML@
</engine>
</engines>
</component>
diff --git a/ibus-anthy.spec.in b/ibus-anthy.spec.in
index fbdf310..e2a5fc4 100644
--- a/ibus-anthy.spec.in
+++ b/ibus-anthy.spec.in
@@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: anthy-devel
BuildRequires: gettext-devel
+BuildRequires: ibus
BuildRequires: intltool >= %require_intltool_version
BuildRequires: libtool
BuildRequires: pkgconfig