From 03557655071092e8135a6fc5c5f8cc2b2f692a83 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 31 Aug 2011 18:28:48 +0900 Subject: [PATCH 5/5] Support virtual keyboard. --- configure.ac | 17 ++++ src/Makefile.am | 7 ++ src/default.xml.in.in | 111 ++++++++++++++++++++++++ src/engine.c | 44 ++++++++++ src/m17nutil.c | 10 ++- src/m17nutil.h | 3 + src/virtkbd.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++++ src/virtkbd.h | 31 +++++++ 8 files changed, 448 insertions(+), 1 deletions(-) create mode 100644 src/virtkbd.c create mode 100644 src/virtkbd.h diff --git a/configure.ac b/configure.ac index 089aafb..ea1476c 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,23 @@ fi AM_CONDITIONAL([HAVE_GTK],[test x$with_gtk != xno]) +dnl check eekboard for virtual keyboard +AC_MSG_CHECKING([whether you enable eekboard]) +AC_ARG_ENABLE(eekboard, + AS_HELP_STRING([--enable-eekboard=no/yes], + [Enable eekboard default=yes]), + enable_eekboard=$enableval, + enable_eekboard=yes) + +if test x$enable_eekboard = xyes; then + PKG_CHECK_MODULES([EEKBOARD], [eekboard-0.90], , enable_xtest=no) + if test x$enable_eekboard = xyes; then + AC_DEFINE([HAVE_EEKBOARD], [1], [Define if eekboard is found]) + fi +fi +AM_CONDITIONAL(ENABLE_EEKBOARD, [test x$enable_eekboard = xyes]) +AC_MSG_RESULT($enable_eekboard) + # check if minput_list, which is available in m17n-lib 1.6.2+ (CVS) save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" diff --git a/src/Makefile.am b/src/Makefile.am index e354149..eac6629 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,11 +64,18 @@ ibus_engine_m17n_SOURCES = \ main.c \ engine.c \ engine.h \ + virtkbd.c \ + virtkbd.h \ + $(NULL) +ibus_engine_m17n_CFLAGS = \ + @EEKBOARD_CFLAGS@ \ + $(AM_CFLAGS) \ $(NULL) ibus_engine_m17n_LDADD = \ libm17ncommon.a \ @IBUS_LIBS@ \ @M17N_LIBS@ \ + @EEKBOARD_LIBS@ \ $(NULL) if HAVE_GTK diff --git a/src/default.xml.in.in b/src/default.xml.in.in index 8192878..47053ae 100644 --- a/src/default.xml.in.in +++ b/src/default.xml.in.in @@ -12,6 +12,7 @@ FALSE @IBUS_HOTKEYS_XML@ + us @@ -410,4 +411,114 @@ m17n:zh:tonepy* 调 + + + + m17n:ar:kbd + ar,us + + + m17n:be:kbd + be,us + + + m17n:fa:kbd + fa,us + + + m17n:he:kbd + he,us + + + m17n:kk:kbd + kk,us + + + m17n:ks:kbd + ks,us + + + m17n:my:kbd + my,us + + + m17n:ru:kbd + ru,us + + + m17n:ua:kbd + ua,us + + + m17n:ug:kbd + ug,us + + + m17n:be:kbd + be,us + + + m17n:th:* + th,us + + + m17n:zh:bopomofo + zh-bopomofo,us + + + m17n:as:inscript + as-inscript,us + + + m17n:bn:inscript + bn-inscript,us + + + m17n:gu:inscript + gu-inscript,us + + + m17n:hi:inscript + hi-inscript,us + + + m17n:kn:inscript + kn-inscript,us + + + m17n:ks:inscript + kn-inscript,us + + + m17n:mai:inscript + mai-inscript,us + + + m17n:ml:inscript + ml-inscript,us + + + m17n:mr:inscript + mr-inscript,us + + + m17n:or:inscript + or-inscript,us + + + m17n:pa:inscript + pa-inscript,us + + + m17n:sd:inscript + sd-inscript,us + + + m17n:ta:inscript + ta-inscript,us + + + m17n:te:inscript + te-inscript,us + diff --git a/src/engine.c b/src/engine.c index f1e3068..cad01e5 100644 --- a/src/engine.c +++ b/src/engine.c @@ -7,6 +7,7 @@ #include #include #include "m17nutil.h" +#include "virtkbd.h" #include "engine.h" typedef struct _IBusM17NEngine IBusM17NEngine; @@ -18,10 +19,13 @@ struct _IBusM17NEngine { /* members */ MInputContext *context; IBusLookupTable *table; + IBusM17NVirtualKeyboard *virtkbd; + IBusProperty *status_prop; #ifdef HAVE_SETUP IBusProperty *setup_prop; #endif /* HAVE_SETUP */ + IBusProperty *virtkbd_prop; IBusPropList *prop_list; }; @@ -34,6 +38,7 @@ struct _IBusM17NEngineClass { guint preedit_background; gint preedit_underline; gint lookup_table_orientation; + gchar *virtual_keyboard; MInputMethod *im; }; @@ -110,6 +115,10 @@ ibus_m17n_init (IBusBus *bus) if (config) g_object_ref_sink (config); ibus_m17n_init_common (); + +#ifdef HAVE_EEKBOARD + eek_init (); +#endif /* HAVE_EEKBOARD */ } static gboolean @@ -290,6 +299,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass) &klass->lookup_table_orientation)) klass->lookup_table_orientation = IBUS_ORIENTATION_SYSTEM; + klass->virtual_keyboard = engine_config->virtual_keyboard; + ibus_m17n_engine_config_free (engine_config); g_signal_connect (config, "value-changed", @@ -346,6 +357,7 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n) { IBusText* label; IBusText* tooltip; + IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n); m17n->prop_list = ibus_prop_list_new (); g_object_ref_sink (m17n->prop_list); @@ -378,6 +390,22 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n) ibus_prop_list_append (m17n->prop_list, m17n->setup_prop); #endif /* HAVE_SETUP */ + if (klass->virtual_keyboard != NULL) { + label = ibus_text_new_from_string ("On-screen Keyboard"); + tooltip = ibus_text_new_from_string ("Show on-screen keyboard"); + m17n->virtkbd_prop = ibus_property_new ("virtual-keyboard", + PROP_TYPE_NORMAL, + label, + "input-keyboard", + tooltip, + TRUE, + TRUE, + PROP_STATE_UNCHECKED, + NULL); + g_object_ref_sink (m17n->virtkbd_prop); + ibus_prop_list_append (m17n->prop_list, m17n->virtkbd_prop); + } + m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE); g_object_ref_sink (m17n->table); m17n->context = NULL; @@ -439,6 +467,8 @@ ibus_m17n_engine_constructor (GType type, } m17n->context = minput_create_ic (klass->im, m17n); + m17n->virtkbd = ibus_m17n_virtual_keyboard_new ((IBusEngine *)m17n, + klass->virtual_keyboard); return (GObject *) m17n; } @@ -473,6 +503,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n) m17n->context = NULL; } + if (m17n->virtkbd) { + g_object_unref (m17n->virtkbd); + m17n->virtkbd = NULL; + } + IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)m17n); } @@ -709,6 +744,8 @@ ibus_m17n_engine_enable (IBusEngine *engine) ibus_engine_get_surrounding_text (engine, &text, &cursor_pos); g_object_unref (text); #endif /* HAVE_IBUS_ENGINE_GET_SURROUNDING_TEXT */ + + ibus_m17n_virtual_keyboard_enable (m17n->virtkbd); } static void @@ -718,6 +755,8 @@ ibus_m17n_engine_disable (IBusEngine *engine) ibus_m17n_engine_focus_out (engine); parent_class->disable (engine); + + ibus_m17n_virtual_keyboard_disable (m17n->virtkbd); } static void @@ -780,6 +819,11 @@ ibus_m17n_engine_property_activate (IBusEngine *engine, } #endif /* HAVE_SETUP */ +#ifdef HAVE_EEKBOARD + if (g_strcmp0 (prop_name, "virtual-keyboard") == 0) + ibus_m17n_virtual_keyboard_toggle_display (m17n->virtkbd); +#endif /* HAVE_EEKBOARD */ + parent_class->property_activate (engine, prop_name, prop_state); } diff --git a/src/m17nutil.c b/src/m17nutil.c index 3e6b9f1..bf8bf84 100644 --- a/src/m17nutil.c +++ b/src/m17nutil.c @@ -14,7 +14,8 @@ typedef enum { ENGINE_CONFIG_LAYOUT_MASK = 1 << 1, ENGINE_CONFIG_HOTKEYS_MASK = 1 << 2, ENGINE_CONFIG_SYMBOL_MASK = 1 << 3, - ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4 + ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4, + ENGINE_CONFIG_VIRTUAL_KEYBOARD_MASK = 1 << 5 } EngineConfigMask; struct _EngineConfigNode { @@ -281,6 +282,8 @@ ibus_m17n_get_engine_config (const gchar *engine_name) config->symbol = cnode->config.symbol; if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK) config->preedit_highlight = cnode->config.preedit_highlight; + if (cnode->mask & ENGINE_CONFIG_VIRTUAL_KEYBOARD_MASK) + config->virtual_keyboard = cnode->config.virtual_keyboard; } } return config; @@ -336,6 +339,11 @@ ibus_m17n_engine_config_parse_xml_node (EngineConfigNode *cnode, cnode->mask |= ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK; continue; } + if (g_strcmp0 (sub_node->name , "virtual-keyboard") == 0) { + cnode->config.virtual_keyboard = g_strdup (sub_node->text); + cnode->mask |= ENGINE_CONFIG_VIRTUAL_KEYBOARD_MASK; + continue; + } g_warning (" element contains invalid element <%s>", sub_node->name); } diff --git a/src/m17nutil.h b/src/m17nutil.h index 21b1bb9..f138c8b 100644 --- a/src/m17nutil.h +++ b/src/m17nutil.h @@ -25,6 +25,9 @@ struct _IBusM17NEngineConfig { /* whether to highlight preedit */ gboolean preedit_highlight; + + /* virtual keyboard type */ + gchar *virtual_keyboard; }; typedef struct _IBusM17NEngineConfig IBusM17NEngineConfig; diff --git a/src/virtkbd.c b/src/virtkbd.c new file mode 100644 index 0000000..92ae3a5 --- /dev/null +++ b/src/virtkbd.c @@ -0,0 +1,226 @@ +/* vim:set et sts=4: */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_EEKBOARD +#include +#endif /* HAVE_EEKBOARD */ + +#include "virtkbd.h" + +struct _IBusM17NVirtualKeyboard { + GObject parent; + IBusEngine *engine; + gchar *keyboard_type; + GSList *keyboards; + +#ifdef HAVE_EEKBOARD + EekboardClient *client; + EekboardContext *context; +#endif /* HAVE_EEKBOARD */ +}; + +struct _IBusM17NVirtualKeyboardClass { + GObjectClass parent_class; +}; + +typedef struct _IBusM17NVirtualKeyboardClass IBusM17NVirtualKeyboardClass; + +G_DEFINE_TYPE (IBusM17NVirtualKeyboard, ibus_m17n_virtual_keyboard, G_TYPE_OBJECT); + +static void +ibus_m17n_virtual_keyboard_dispose (GObject *object) +{ + IBusM17NVirtualKeyboard *virtkbd = IBUS_M17N_VIRTUAL_KEYBOARD (object); + + if (virtkbd->engine) { + g_object_unref (virtkbd->engine); + virtkbd->engine = NULL; + } + if (virtkbd->keyboards) { + GSList *next = virtkbd->keyboards->next; + /* virtkbd->keyboards is a ring; break it before free */ + virtkbd->keyboards->next = NULL; + g_slist_free (next); + } + +#ifdef HAVE_EEKBOARD + if (virtkbd->context) { + g_object_unref (virtkbd->context); + virtkbd->context = NULL; + } + if (virtkbd->client) { + g_object_unref (virtkbd->client); + virtkbd->client = NULL; + } +#endif /* HAVE_EEKBOARD */ + + G_OBJECT_CLASS (ibus_m17n_virtual_keyboard_parent_class)->dispose (object); +} + +static void +ibus_m17n_virtual_keyboard_finalize (GObject *object) +{ + IBusM17NVirtualKeyboard *virtkbd = IBUS_M17N_VIRTUAL_KEYBOARD (object); + + g_free (virtkbd->keyboard_type); + + G_OBJECT_CLASS (ibus_m17n_virtual_keyboard_parent_class)->finalize (object); +} + +static void +ibus_m17n_virtual_keyboard_class_init (IBusM17NVirtualKeyboardClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + gobject_class->dispose = ibus_m17n_virtual_keyboard_dispose; + gobject_class->finalize = ibus_m17n_virtual_keyboard_finalize; +} + +static void +ibus_m17n_virtual_keyboard_init (IBusM17NVirtualKeyboard *self) +{ +} + +#ifdef HAVE_EEKBOARD +static void +destroyed_cb (EekboardClient *client, + IBusM17NVirtualKeyboard *virtkbd) +{ + if (virtkbd->context) { + g_object_unref (virtkbd->context); + virtkbd->context = NULL; + } + if (virtkbd->client) { + g_object_unref (virtkbd->client); + virtkbd->client = NULL; + } +} + +static void +key_pressed_cb (EekboardContext *context, + gchar *keyname, + EekSymbol *symbol, + guint modifiers, + IBusM17NVirtualKeyboard *virtkbd) +{ + if (EEK_IS_TEXT (symbol)) { + const gchar *string; + IBusText *text; + + string = eek_text_get_text (EEK_TEXT (symbol)); + text = ibus_text_new_from_static_string (string); + ibus_engine_commit_text (virtkbd->engine, text); + } else if (EEK_IS_KEYSYM (symbol)) { + guint keyval = eek_keysym_get_xkeysym (EEK_KEYSYM (symbol)); + ibus_engine_forward_key_event (virtkbd->engine, + keyval, + 0, + modifiers); + ibus_engine_forward_key_event (virtkbd->engine, + keyval, + 0, + modifiers | IBUS_RELEASE_MASK); + } else if (g_strcmp0 (eek_symbol_get_name (symbol), + "cycle-keyboard") == 0) { + virtkbd->keyboards = g_slist_next (virtkbd->keyboards); + eekboard_context_set_keyboard (virtkbd->context, + GPOINTER_TO_UINT (virtkbd->keyboards->data), + NULL); + } +} + +static void +init_client (IBusM17NVirtualKeyboard *virtkbd) +{ + GDBusConnection *connection; + GError *error; + gchar **strv, **p; + + error = NULL; + connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + if (connection == NULL) { + g_printerr ("Can't connect to the session bus: %s\n", + error->message); + return; + } + + virtkbd->client = eekboard_client_new (connection, NULL); + g_object_unref (connection); + g_signal_connect (virtkbd->client, "destroyed", + G_CALLBACK (destroyed_cb), virtkbd); + + virtkbd->context = eekboard_client_create_context (virtkbd->client, + "ibus-m17n", + NULL); + g_signal_connect (virtkbd->context, "key-pressed", + G_CALLBACK (key_pressed_cb), virtkbd); + + strv = g_strsplit (virtkbd->keyboard_type, ",", -1); + for (p = strv; *p; p++) { + guint keyboard; + + keyboard = eekboard_context_add_keyboard (virtkbd->context, + g_strstrip (*p), + NULL); + virtkbd->keyboards = g_slist_prepend (virtkbd->keyboards, + GUINT_TO_POINTER (keyboard)); + } + virtkbd->keyboards = g_slist_reverse (virtkbd->keyboards); + g_strfreev (strv); + + /* make a cycle */ + g_slist_last (virtkbd->keyboards)->next = virtkbd->keyboards; + + eekboard_context_set_keyboard (virtkbd->context, + GPOINTER_TO_UINT (virtkbd->keyboards->data), + NULL); +} +#endif /* HAVE_EEKBOARD */ + +void +ibus_m17n_virtual_keyboard_toggle_display (IBusM17NVirtualKeyboard *virtkbd) +{ +#ifdef HAVE_EEKBOARD + if (virtkbd->client == NULL) + ibus_m17n_virtual_keyboard_enable (virtkbd); + + if (virtkbd->client != NULL) { + if (eekboard_context_is_visible (virtkbd->context)) + eekboard_context_hide_keyboard (virtkbd->context, NULL); + else + eekboard_context_show_keyboard (virtkbd->context, NULL); + } +#endif /* HAVE_EEKBOARD */ +} + +void +ibus_m17n_virtual_keyboard_enable (IBusM17NVirtualKeyboard *virtkbd) +{ +#ifdef HAVE_EEKBOARD + if (virtkbd->client == NULL) + init_client (virtkbd); + + if (virtkbd->client != NULL) + eekboard_client_push_context (virtkbd->client, virtkbd->context, NULL); +#endif /* HAVE_EEKBOARD */ +} + +void +ibus_m17n_virtual_keyboard_disable (IBusM17NVirtualKeyboard *virtkbd) +{ +#ifdef HAVE_EEKBOARD + if (virtkbd->client != NULL) + eekboard_client_pop_context (virtkbd->client, NULL); +#endif /* HAVE_EEKBOARD */ +} + +IBusM17NVirtualKeyboard * +ibus_m17n_virtual_keyboard_new (IBusEngine *engine, + const gchar *keyboard_type) +{ + IBusM17NVirtualKeyboard *virtkbd = g_object_new (IBUS_M17N_TYPE_VIRTUAL_KEYBOARD, NULL); + virtkbd->engine = g_object_ref (engine); + virtkbd->keyboard_type = g_strdup (keyboard_type); + return virtkbd; +} diff --git a/src/virtkbd.h b/src/virtkbd.h new file mode 100644 index 0000000..c28953a --- /dev/null +++ b/src/virtkbd.h @@ -0,0 +1,31 @@ +#ifndef __VIRTKBD_H__ +#define __VIRTKBD_H__ 1 + +#include + +G_BEGIN_DECLS + +#define IBUS_M17N_TYPE_VIRTUAL_KEYBOARD (ibus_m17n_virtual_keyboard_get_type()) +#define IBUS_M17N_VIRTUAL_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IBUS_M17N_TYPE_VIRTUAL_KEYBOARD, IBusM17NVirtualKeyboard)) +#define IBUS_M17N_VIRTUAL_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IBUS_M17N_TYPE_VIRTUAL_KEYBOARD, IBusM17NVirtualKeyboardClass)) +#define IBUS_M17N_IS_VIRTUAL_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IBUS_M17N_TYPE_VIRTUAL_KEYBOARD)) +#define IBUS_M17N_IS_VIRTUAL_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IBUS_M17N_TYPE_VIRTUAL_KEYBOARD)) +#define IBUS_M17N_VIRTUAL_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IBUS_M17N_TYPE_VIRTUAL_KEYBOARD, IBusM17NVirtualKeyboardClass)) + +typedef struct _IBusM17NVirtualKeyboard IBusM17NVirtualKeyboard; + +GType ibus_m17n_virtual_keyboard_get_type + (void); +IBusM17NVirtualKeyboard *ibus_m17n_virtual_keyboard_new + (IBusEngine *engine, + const gchar *keyboard_type); +void ibus_m17n_virtual_keyboard_toggle_display + (IBusM17NVirtualKeyboard *virtkbd); +void ibus_m17n_virtual_keyboard_enable + (IBusM17NVirtualKeyboard *virtkbd); +void ibus_m17n_virtual_keyboard_disable + (IBusM17NVirtualKeyboard *virtkbd); + +G_END_DECLS + +#endif /* __VIRTKBD_H__ */ -- 1.7.6.1