From 01b9e72fe7a2e31eb42a9169ae4414ac2c8d9ff0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 1 Sep 2011 19:18:22 +0900 Subject: [PATCH] Update to 1.3.2-11. --- ibus-m17n-default-xml-override.patch | 621 +++++++++++++++++++++ ibus-m17n-iok.patch | 100 ---- ibus-m17n-virtkbd.patch | 653 ++++++++++++++++++++++ ibus-m17n-xkb-options.patch | 182 +++--- ibus-m17n-xx-icon-symbol.patch | 791 ++++++++++----------------- ibus-m17n.spec | 21 +- 6 files changed, 1630 insertions(+), 738 deletions(-) create mode 100644 ibus-m17n-default-xml-override.patch delete mode 100644 ibus-m17n-iok.patch create mode 100644 ibus-m17n-virtkbd.patch diff --git a/ibus-m17n-default-xml-override.patch b/ibus-m17n-default-xml-override.patch new file mode 100644 index 0000000..744e6a4 --- /dev/null +++ b/ibus-m17n-default-xml-override.patch @@ -0,0 +1,621 @@ +From 736e3f89d3afe368bec030b1f01d36b417fcac5c Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 31 Aug 2011 11:44:46 +0900 +Subject: [PATCH 1/5] Update the format of default.xml to allow override. + +This patch allows value inheritance from the previous matches. +With the new format: + + + + * + 0 + FALSE + + + m17n:ja:* + 2 + TRUE + + + m17n:ja:anthy + 1 + + + +We will get preedit-highlight == TRUE and rank == 1 for m17n:ja:anthy. +--- + src/Makefile.am | 3 +- + src/default.xml.in.in | 221 +++++++++++++++++++------------------------------ + src/engine.c | 2 + + src/m17nutil.c | 68 +++++++--------- + src/m17nutil.h | 1 + + src/test.c | 66 +++++++++++++++ + 6 files changed, 186 insertions(+), 175 deletions(-) + create mode 100644 src/test.c + +diff --git a/src/Makefile.am b/src/Makefile.am +index 282128a..e354149 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -40,11 +40,10 @@ TESTS = \ + + + test_m17n_SOURCES = \ +- m17nutil.c \ ++ test.c \ + $(NULL) + test_m17n_CFLAGS = \ + $(AM_CFLAGS) \ +- -DDEBUG \ + $(NULL) + test_m17n_LDADD = \ + libm17ncommon.a \ +diff --git a/src/default.xml.in.in b/src/default.xml.in.in +index 5c5d67d..dc93fd3 100644 +--- a/src/default.xml.in.in ++++ b/src/default.xml.in.in +@@ -1,246 +1,197 @@ + + + +- ++ engine. A "name" element in an "engine" element allows ++ wildcard patterns. "engine" elements are evaluated in ++ first-to-last order and the latter match may override the ++ existing default. --> ++ ++ ++ m17n:* ++ 0 ++ FALSE ++ ++ ++ ++ m17n:as:* ++ 1 ++ ++ ++ m17n:bn:* ++ 1 ++ ++ ++ m17n:gu:* ++ 1 ++ ++ ++ m17n:hi:* ++ 1 ++ ++ ++ m17n:kn:* ++ 1 ++ ++ ++ m17n:ks:* ++ 1 ++ ++ ++ m17n:mai:* ++ 1 ++ ++ ++ m17n:ml:* ++ 1 ++ ++ ++ m17n:mr:* ++ 1 ++ ++ ++ m17n:ne:* ++ 1 ++ ++ ++ m17n:or:* ++ 1 ++ ++ ++ m17n:pa:* ++ 1 ++ ++ ++ m17n:sa:* ++ 1 ++ ++ ++ m17n:sd:* ++ 1 ++ ++ ++ m17n:si:* ++ 1 ++ ++ ++ m17n:ta:* ++ 1 ++ ++ ++ m17n:te:* ++ 1 ++ ++ + + m17n:as:phonetic + 2 +- FALSE + + + m17n:bn:inscript + 2 +- FALSE + + + m17n:gu:inscript + 2 +- FALSE + + + m17n:hi:inscript + 2 +- FALSE + + + m17n:kn:kgp + 2 +- FALSE + + + m17n:ks:kbd + 2 +- FALSE + + + m17n:mai:inscript + 2 +- FALSE + + + m17n:ml:inscript + 2 +- FALSE + + + m17n:mr:inscript + 2 +- FALSE + + + m17n:ne:rom + 2 +- FALSE + + + m17n:or:inscript + 2 +- FALSE + + + m17n:pa:inscript + 2 +- FALSE + + + m17n:sa:harvard-kyoto + 2 +- FALSE + + + m17n:sd:inscript + 2 +- FALSE + + + m17n:si:wijesekera + 2 +- FALSE + + + m17n:ta:tamil99 + 2 +- FALSE + + + m17n:te:inscript + 2 +- FALSE + +- ++ + + m17n:si:samanala + 0 +- FALSE +- +- +- +- m17n:ja:anthy +- 0 +- TRUE + ++ + + m17n:zh:cangjie +- 0 + TRUE + + + m17n:zh:py-b5 +- 0 + TRUE + + + m17n:zh:py-gb +- 0 + TRUE + + + m17n:zh:py +- 0 + TRUE + + + m17n:zh:quick +- 0 + TRUE + + + m17n:zh:tonepy-b5 +- 0 + TRUE + + + m17n:zh:tonepy-gb +- 0 + TRUE + + + m17n:zh:tonepy +- 0 + TRUE + + +- m17n:zh:util +- 0 ++ m17n:ja:anthy + TRUE + +- +- +- m17n:as:* +- 1 +- FALSE +- +- +- m17n:bn:* +- 1 +- FALSE +- +- +- m17n:gu:* +- 1 +- FALSE +- +- +- m17n:hi:* +- 1 +- FALSE +- +- +- m17n:kn:* +- 1 +- FALSE +- +- +- m17n:ks:* +- 1 +- FALSE +- +- +- m17n:mai:* +- 1 +- FALSE +- +- +- m17n:ml:* +- 1 +- FALSE +- +- +- m17n:mr:* +- 1 +- FALSE +- +- +- m17n:ne:* +- 1 +- FALSE +- +- +- m17n:or:* +- 1 +- FALSE +- +- +- m17n:pa:* +- 1 +- FALSE +- +- +- m17n:sa:* +- 1 +- FALSE +- +- +- m17n:sd:* +- 1 +- FALSE +- +- +- m17n:si:* +- 1 +- FALSE +- +- +- m17n:ta:* +- 1 +- FALSE +- +- +- m17n:te:* +- 1 +- FALSE +- +- +- +- m17n:* +- 0 +- FALSE +- + +diff --git a/src/engine.c b/src/engine.c +index b68b13e..f1e3068 100644 +--- a/src/engine.c ++++ b/src/engine.c +@@ -290,6 +290,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass) + &klass->lookup_table_orientation)) + klass->lookup_table_orientation = IBUS_ORIENTATION_SYSTEM; + ++ ibus_m17n_engine_config_free (engine_config); ++ + g_signal_connect (config, "value-changed", + G_CALLBACK(ibus_m17n_config_value_changed), + klass); +diff --git a/src/m17nutil.c b/src/m17nutil.c +index 1150cc4..00b7194 100644 +--- a/src/m17nutil.c ++++ b/src/m17nutil.c +@@ -9,12 +9,18 @@ static MConverter *utf8_converter = NULL; + + #define DEFAULT_XML (SETUPDIR "/default.xml") + +-struct _IBusM17NEngineConfigNode { ++typedef enum { ++ ENGINE_CONFIG_RANK_MASK = 1 << 0, ++ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 1 ++} EngineConfigMask; ++ ++struct _EngineConfigNode { + gchar *name; ++ EngineConfigMask mask; + IBusM17NEngineConfig config; + }; + +-typedef struct _IBusM17NEngineConfigNode IBusM17NEngineConfigNode; ++typedef struct _EngineConfigNode EngineConfigNode; + + static GSList *config_list = NULL; + +@@ -253,20 +259,31 @@ ibus_m17n_list_engines (void) + IBusM17NEngineConfig * + ibus_m17n_get_engine_config (const gchar *engine_name) + { ++ IBusM17NEngineConfig *config = g_slice_new0 (IBusM17NEngineConfig); + GSList *p; + + for (p = config_list; p != NULL; p = p->next) { +- IBusM17NEngineConfigNode *cnode = p->data; ++ EngineConfigNode *cnode = p->data; + +- if (g_pattern_match_simple (cnode->name, engine_name)) +- return &cnode->config; ++ if (g_pattern_match_simple (cnode->name, engine_name)) { ++ if (cnode->mask & ENGINE_CONFIG_RANK_MASK) ++ config->rank = cnode->config.rank; ++ if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK) ++ config->preedit_highlight = cnode->config.preedit_highlight; ++ } + } +- g_return_val_if_reached (NULL); ++ return config; ++} ++ ++void ++ibus_m17n_engine_config_free (IBusM17NEngineConfig *config) ++{ ++ g_slice_free (IBusM17NEngineConfig, config); + } + + static gboolean +-ibus_m17n_engine_config_parse_xml_node (IBusM17NEngineConfigNode *cnode, +- XMLNode *node) ++ibus_m17n_engine_config_parse_xml_node (EngineConfigNode *cnode, ++ XMLNode *node) + { + GList *p; + +@@ -280,6 +297,7 @@ ibus_m17n_engine_config_parse_xml_node (IBusM17NEngineConfigNode *cnode, + } + if (g_strcmp0 (sub_node->name , "rank") == 0) { + cnode->config.rank = atoi (sub_node->text); ++ cnode->mask |= ENGINE_CONFIG_RANK_MASK; + continue; + } + if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) { +@@ -288,6 +306,7 @@ ibus_m17n_engine_config_parse_xml_node (IBusM17NEngineConfigNode *cnode, + else if (g_ascii_strcasecmp ("FALSE", sub_node->text) != 0) + g_warning ("<%s> element contains invalid boolean value %s", + sub_node->name, sub_node->text); ++ cnode->mask |= ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK; + continue; + } + g_warning (" element contains invalid element <%s>", +@@ -316,7 +335,7 @@ ibus_m17n_get_component (void) + if (node && g_strcmp0 (node->name, "engines") == 0) { + for (p = node->sub_nodes; p != NULL; p = p->next) { + XMLNode *sub_node = p->data; +- IBusM17NEngineConfigNode *cnode; ++ EngineConfigNode *cnode; + + if (g_strcmp0 (sub_node->name, "engine") != 0) { + g_warning (" element contains invalid element <%s>", +@@ -324,9 +343,9 @@ ibus_m17n_get_component (void) + continue; + } + +- cnode = g_slice_new0 (IBusM17NEngineConfigNode); ++ cnode = g_slice_new0 (EngineConfigNode); + if (!ibus_m17n_engine_config_parse_xml_node (cnode, sub_node)) { +- g_slice_free (IBusM17NEngineConfigNode, cnode); ++ g_slice_free (EngineConfigNode, cnode); + continue; + } + config_list = g_slist_prepend (config_list, cnode); +@@ -444,30 +463,3 @@ ibus_m17n_config_get_int (IBusConfig *config, + return FALSE; + #endif /* !IBUS_CHECK_VERSION(1,3,99) */ + } +- +-#ifdef DEBUG +-#include +- +-int main () +-{ +- IBusComponent *component; +- GString *output; +- +- setlocale (LC_ALL, ""); +- ibus_init (); +- ibus_m17n_init_common (); +- +- component = ibus_m17n_get_component (); +- +- output = g_string_new (""); +- +- ibus_component_output (component, output, 1); +- +- g_debug ("\n%s", output->str); +- +- g_string_free (output, TRUE); +- g_object_unref (component); +- +- return 0; +-} +-#endif +diff --git a/src/m17nutil.h b/src/m17nutil.h +index f083194..313e7bc 100644 +--- a/src/m17nutil.h ++++ b/src/m17nutil.h +@@ -30,6 +30,7 @@ gunichar *ibus_m17n_mtext_to_ucs4 (MText *text, + guint ibus_m17n_parse_color (const gchar *hex); + IBusM17NEngineConfig + *ibus_m17n_get_engine_config (const gchar *engine_name); ++void ibus_m17n_engine_config_free (IBusM17NEngineConfig *config); + void ibus_m17n_config_set_string (IBusConfig *config, + const gchar *section, + const gchar *name, +diff --git a/src/test.c b/src/test.c +new file mode 100644 +index 0000000..0908818 +--- /dev/null ++++ b/src/test.c +@@ -0,0 +1,66 @@ ++/* vim:set et sts=4: */ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include "m17nutil.h" ++ ++static void ++test_output_component (void) ++{ ++ IBusComponent *component; ++ GString *output; ++ ++ component = ibus_m17n_get_component (); ++ ++ output = g_string_new (""); ++ ++ ibus_component_output (component, output, 1); ++ ++ g_debug ("\n%s", output->str); ++ ++ g_string_free (output, TRUE); ++ g_object_unref (component); ++} ++ ++static void ++test_engine_config (void) ++{ ++ IBusM17NEngineConfig *config; ++ ++ config = ibus_m17n_get_engine_config ("m17n:non:exsistent"); ++ g_assert_cmpint (config->rank, ==, 0); ++ g_assert_cmpint (config->preedit_highlight, ==, 0); ++ ibus_m17n_engine_config_free (config); ++ ++ config = ibus_m17n_get_engine_config ("m17n:si:wijesekera"); ++ g_assert_cmpint (config->rank, ==, 2); ++ g_assert_cmpint (config->preedit_highlight, ==, 0); ++ ibus_m17n_engine_config_free (config); ++ ++ config = ibus_m17n_get_engine_config ("m17n:si:phonetic-dynamic"); ++ g_assert_cmpint (config->rank, ==, 1); ++ g_assert_cmpint (config->preedit_highlight, ==, 0); ++ ibus_m17n_engine_config_free (config); ++ ++ config = ibus_m17n_get_engine_config ("m17n:si:samanala"); ++ g_assert_cmpint (config->rank, ==, 0); ++ g_assert_cmpint (config->preedit_highlight, ==, 0); ++ ibus_m17n_engine_config_free (config); ++} ++ ++int main (int argc, char **argv) ++{ ++ setlocale (LC_ALL, ""); ++ ibus_init (); ++ ibus_m17n_init_common (); ++ ++ g_test_init (&argc, &argv, NULL); ++ ++ g_test_add_func ("/test-m17n/output-component", test_output_component); ++ g_test_add_func ("/test-m17n/engine-config", test_engine_config); ++ ++ return g_test_run (); ++} +-- +1.7.6.1 + diff --git a/ibus-m17n-iok.patch b/ibus-m17n-iok.patch deleted file mode 100644 index e73124f..0000000 --- a/ibus-m17n-iok.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch to support iok (Indic Onscreen Keyboard). -Index: ibus-m17n-1.3.2/src/engine.c -=================================================================== ---- ibus-m17n-1.3.2.orig/src/engine.c -+++ ibus-m17n-1.3.2/src/engine.c -@@ -23,6 +23,7 @@ struct _IBusM17NEngine { - IBusProperty *setup_prop; - #endif /* HAVE_SETUP */ - IBusPropList *prop_list; -+ IBusProperty *show_iok_prop; - }; - - struct _IBusM17NEngineClass { -@@ -34,6 +35,7 @@ struct _IBusM17NEngineClass { - guint preedit_background; - gint preedit_underline; - gint lookup_table_orientation; -+ gboolean use_iok; - - MInputMethod *im; - }; -@@ -248,6 +250,9 @@ ibus_m17n_engine_class_init (IBusM17NEng - } - engine_name = g_strdup_printf ("m17n:%s:%s", lang, name); - klass->config_section = g_strdup_printf ("engine/M17N/%s/%s", lang, name); -+ /* whether to use iok - maybe good to move this to default.xml */ -+ klass->use_iok = g_strcmp0 (name, "inscript") == 0 || -+ g_strcmp0 (name, "inscript2") == 0; - g_free (lang); - g_free (name); - -@@ -344,6 +349,7 @@ ibus_m17n_engine_init (IBusM17NEngine *m - { - 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); -@@ -376,6 +382,23 @@ ibus_m17n_engine_init (IBusM17NEngine *m - ibus_prop_list_append (m17n->prop_list, m17n->setup_prop); - #endif /* HAVE_SETUP */ - -+ label = ibus_text_new_from_string ("iok"); -+ m17n->show_iok_prop = ibus_property_new ("iok", -+ PROP_TYPE_NORMAL, -+ label, -+ "/usr/share/pixmaps/iok.xpm", -+ label, -+ TRUE, -+ FALSE, -+ 0, -+ NULL); -+ g_object_ref_sink (m17n->show_iok_prop); -+ -+ if (klass->use_iok) -+ ibus_property_set_visible (m17n->show_iok_prop, TRUE); -+ -+ ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop); -+ - m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE); - g_object_ref_sink (m17n->table); - m17n->context = NULL; -@@ -461,6 +484,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine - } - #endif /* HAVE_SETUP */ - -+ if (m17n->show_iok_prop) { -+ g_object_unref (m17n->show_iok_prop); -+ m17n->show_iok_prop = NULL; -+ } -+ - if (m17n->table) { - g_object_unref (m17n->table); - m17n->table = NULL; -@@ -778,6 +806,24 @@ ibus_m17n_engine_property_activate (IBus - } - #endif /* HAVE_SETUP */ - -+ if (g_strcmp0 (prop_name, "iok") == 0) { -+ const gchar *engine_name; -+ gchar *lang = NULL, *name = NULL; -+ -+ engine_name = ibus_engine_get_name ((IBusEngine *) m17n); -+ if (ibus_m17n_scan_engine_name (engine_name, &lang, &name)) { -+ gchar *iok; -+ -+ iok = g_strdup_printf ("/usr/bin/iok -n %s", lang); -+ g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", -+ engine_name, prop_name, prop_state); -+ g_spawn_command_line_async(iok, NULL); -+ g_free (iok); -+ } -+ g_free (lang); -+ g_free (name); -+ } -+ - parent_class->property_activate (engine, prop_name, prop_state); - } - diff --git a/ibus-m17n-virtkbd.patch b/ibus-m17n-virtkbd.patch new file mode 100644 index 0000000..32c9830 --- /dev/null +++ b/ibus-m17n-virtkbd.patch @@ -0,0 +1,653 @@ +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 + diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch index 6c3d8b9..2dc5c13 100644 --- a/ibus-m17n-xkb-options.patch +++ b/ibus-m17n-xkb-options.patch @@ -1,122 +1,49 @@ -Patch to set certain XKB options when an m17n IME is set. -Index: ibus-m17n-1.3.2/src/default.xml.in.in -=================================================================== ---- ibus-m17n-1.3.2.orig/src/default.xml.in.in -+++ ibus-m17n-1.3.2/src/default.xml.in.in -@@ -12,19 +12,22 @@ - FALSE +From 98be0a7b90cd47cafabb715695d20b9bfc7dd1bb Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 8 Aug 2011 09:59:28 +0900 +Subject: [PATCH 3/5] Set XKB layout option via default.xml. + +--- + src/default.xml.in.in | 9 +++++++++ + src/m17nutil.c | 13 +++++++++++-- + src/m17nutil.h | 3 +++ + 3 files changed, 23 insertions(+), 2 deletions(-) + +diff --git a/src/default.xml.in.in b/src/default.xml.in.in +index dc93fd3..785ab05 100644 +--- a/src/default.xml.in.in ++++ b/src/default.xml.in.in +@@ -157,6 +157,15 @@ + m17n:si:samanala + 0 - -- m17n:bn:inscript -+ m17n:bn:inscript* - 2 - FALSE ++ ++ ++ m17n:*:inscript + default[lv3:ralt_switch] - - -- m17n:gu:inscript -+ m17n:gu:inscript* - 2 - FALSE ++ ++ ++ m17n:si:* + default[lv3:ralt_switch] - ++ + -- m17n:hi:inscript -+ m17n:hi:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - - m17n:kn:kgp -@@ -37,19 +40,22 @@ - FALSE - - -- m17n:mai:inscript -+ m17n:mai:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - -- m17n:ml:inscript -+ m17n:ml:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - -- m17n:mr:inscript -+ m17n:mr:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - - m17n:ne:rom -@@ -57,14 +63,16 @@ - FALSE - - -- m17n:or:inscript -+ m17n:or:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - -- m17n:pa:inscript -+ m17n:pa:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - - m17n:sa:harvard-kyoto -@@ -72,14 +80,16 @@ - FALSE - - -- m17n:sd:inscript -+ m17n:sd:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - - m17n:si:wijesekera - 2 - FALSE -+ default[lv3:ralt_switch] - - - m17n:ta:tamil99 -@@ -87,9 +97,10 @@ - FALSE - - -- m17n:te:inscript -+ m17n:te:inscript* - 2 - FALSE -+ default[lv3:ralt_switch] - - - - m17n:ja:anthy - 0 - TRUE -- -- -- m17n:zh:cangjie -- 0 -- TRUE -- -- -- m17n:zh:py-b5 -- 0 -- TRUE -- -- -- m17n:zh:py-gb -- 0 -- TRUE -- -- -- m17n:zh:py -- 0 -- TRUE -- -- -- m17n:zh:quick -- 0 -- TRUE -- -- -- m17n:zh:tonepy-b5 -- 0 -- TRUE -- -- -- m17n:zh:tonepy-gb -- 0 -- TRUE -- -- -- m17n:zh:tonepy -- 0 -- TRUE -- -- -- m17n:zh:util -- 0 -- TRUE -+ あ - - -@@ -167,92 +141,312 @@ - m17n:as:* - 1 - FALSE -+ ক - - - m17n:bn:* - 1 - FALSE -+ ক - - - m17n:gu:* - 1 - FALSE -+ ક - - - m17n:hi:* - 1 - FALSE -+ क - - - m17n:kn:* - 1 - FALSE -+ ಕ - - - m17n:ks:* - 1 - FALSE -+ क - - - m17n:mai:* - 1 - FALSE -+ क - - - m17n:ml:* - 1 - FALSE -+ ക - - - m17n:mr:* - 1 - FALSE -+ क - - - m17n:ne:* - 1 - FALSE -+ - - - m17n:or:* - 1 - FALSE -+ କ - - - m17n:pa:* - 1 - FALSE -+ ਕ - - - m17n:sa:* - 1 - FALSE -+ क - - - m17n:sd:* - 1 - FALSE -+ क - - - m17n:si:* - 1 - FALSE - default[lv3:ralt_switch] -+ සි - - - m17n:ta:* - 1 - FALSE -+ க - - - m17n:te:* - 1 - FALSE -+ క -+ -+ -+ -+ m17n:*:kbd -+ 0 -+ FALSE -+ -+ -+ -+ m17n:*:pre -+ 0 -+ FALSE -+ -+ -+ -+ m17n:*:post -+ 0 -+ FALSE -+ -+ -+ -+ m17n:am:sera -+ 0 -+ FALSE -+ አ -+ -+ -+ m17n:bo:* -+ 0 -+ FALSE -+ ཀ -+ -+ -+ m17n:cr:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:dv:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:eo:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:fa:* -+ 0 -+ FALSE -+ ف -+ -+ -+ m17n:fr:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:ii:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:iu:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:kk:* -+ 0 -+ FALSE -+ قا -+ -+ -+ m17n:km:* -+ 0 -+ FALSE -+ ក -+ -+ -+ m17n:lo:* -+ 0 -+ FALSE -+ ກ -+ -+ -+ m17n:nsk:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:oj:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:ps:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:ru:* -+ 0 -+ FALSE -+ Я -+ -+ -+ m17n:sv:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:syrc:* -+ 0 -+ FALSE -+ -+ -+ -+ m17n:tai:* -+ 0 -+ FALSE -+ ꫞ -+ -+ -+ m17n:th:* -+ 0 -+ FALSE -+ ท -+ -+ -+ m17n:ur:* -+ 0 -+ FALSE -+ خ -+ -+ -+ m17n:vi:han -+ 0 -+ FALSE -+ 越 -+ -+ -+ m17n:vi:nom* -+ 0 -+ FALSE -+ 喃 -+ -+ -+ m17n:vi:* -+ 0 -+ FALSE -+ Ắ -+ -+ -+ m17n:yi:* -+ 0 -+ TRUE -+ -+ -+ -+ m17n:zh:bopomofo -+ 0 -+ TRUE -+ ㄅ -+ -+ -+ m17n:zh:cangjie -+ 0 -+ TRUE -+ 倉 -+ -+ -+ m17n:zh:py* -+ 0 -+ TRUE -+ 拼 -+ -+ -+ m17n:zh:quick -+ 0 -+ TRUE -+ 簡 -+ -+ -+ m17n:zh:tonepy* -+ 0 -+ TRUE -+ 调 - - - +diff --git a/src/default.xml.in.in b/src/default.xml.in.in +index 785ab05..8192878 100644 +--- a/src/default.xml.in.in ++++ b/src/default.xml.in.in +@@ -10,6 +10,8 @@ m17n:* 0 FALSE + + @IBUS_HOTKEYS_XML@ + +@@ -203,4 +205,209 @@ + m17n:ja:anthy + TRUE + ++ ++ ++ m17n:as:* ++ ক ++ ++ ++ m17n:bn:* ++ ক ++ ++ ++ m17n:gu:* ++ ક ++ ++ ++ m17n:hi:* ++ क ++ ++ ++ m17n:kn:* ++ ಕ ++ ++ ++ m17n:ks:* ++ क ++ ++ ++ m17n:mai:* ++ क ++ ++ ++ m17n:ml:* ++ ക ++ ++ ++ m17n:mr:* ++ क ++ ++ ++ m17n:ne:* ++ ने ++ ++ ++ m17n:or:* ++ କ ++ ++ ++ m17n:pa:* ++ ਕ ++ ++ ++ m17n:sa:* ++ क ++ ++ ++ m17n:sd:* ++ क ++ ++ ++ m17n:si:* ++ සි ++ ++ ++ m17n:ta:* ++ க ++ ++ ++ m17n:te:* ++ క ++ ++ ++ m17n:*:kbd ++ ++ ++ ++ m17n:*:pre ++ ++ ++ ++ m17n:*:post ++ ++ ++ ++ m17n:am:sera ++ አ ++ ++ ++ m17n:bo:* ++ ཀ ++ ++ ++ m17n:cr:* ++ ++ ++ ++ m17n:dv:* ++ ++ ++ ++ m17n:eo:* ++ ++ ++ ++ m17n:fa:* ++ ف ++ ++ ++ m17n:fr:* ++ ++ ++ ++ m17n:ii:* ++ ++ ++ ++ m17n:iu:* ++ ++ ++ ++ m17n:ja:anthy ++ あ ++ ++ ++ m17n:kk:* ++ قا ++ ++ ++ m17n:km:* ++ ក ++ ++ ++ m17n:lo:* ++ ກ ++ ++ ++ m17n:nsk:* ++ ++ ++ ++ m17n:oj:* ++ ++ ++ ++ m17n:ps:* ++ ++ ++ ++ m17n:ru:* ++ Я ++ ++ ++ m17n:sv:* ++ ++ ++ ++ m17n:syrc:* ++ ++ ++ ++ m17n:tai:* ++ ꫞ ++ ++ ++ m17n:th:* ++ ท ++ ++ ++ m17n:ur:* ++ خ ++ ++ ++ m17n:vi:han ++ 越 ++ ++ ++ m17n:vi:nom* ++ 喃 ++ ++ ++ m17n:vi:* ++ Ắ ++ ++ ++ m17n:yi:* ++ ++ ++ ++ m17n:zh:bopomofo ++ ㄅ ++ ++ ++ m17n:zh:cangjie ++ 倉 ++ ++ ++ m17n:zh:py* ++ 拼 ++ ++ ++ m17n:zh:quick ++ 簡 ++ ++ ++ m17n:zh:tonepy* ++ 调 ++ -Index: ibus-m17n-1.3.2/src/m17nutil.c -=================================================================== ---- ibus-m17n-1.3.2.orig/src/m17nutil.c -+++ ibus-m17n-1.3.2/src/m17nutil.c -@@ -122,6 +122,8 @@ ibus_m17n_engine_new (MSymbol lang, +diff --git a/src/m17nutil.c b/src/m17nutil.c +index 06e1b58..3e6b9f1 100644 +--- a/src/m17nutil.c ++++ b/src/m17nutil.c +@@ -12,7 +12,9 @@ static MConverter *utf8_converter = NULL; + typedef enum { + ENGINE_CONFIG_RANK_MASK = 1 << 0, + ENGINE_CONFIG_LAYOUT_MASK = 1 << 1, +- ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 2 ++ ENGINE_CONFIG_HOTKEYS_MASK = 1 << 2, ++ ENGINE_CONFIG_SYMBOL_MASK = 1 << 3, ++ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4 + } EngineConfigMask; + + struct _EngineConfigNode { +@@ -129,6 +131,8 @@ ibus_m17n_engine_new (MSymbol lang, "icon", engine_icon ? engine_icon : "", "layout", config->layout ? config->layout : "us", "rank", config->rank, @@ -589,25 +340,38 @@ Index: ibus-m17n-1.3.2/src/m17nutil.c NULL); #else engine = ibus_engine_desc_new (engine_name, -@@ -287,6 +289,14 @@ ibus_m17n_engine_config_parse_xml_node ( - cnode->config.layout = g_strdup (sub_node->text); +@@ -271,6 +275,10 @@ ibus_m17n_get_engine_config (const gchar *engine_name) + config->rank = cnode->config.rank; + if (cnode->mask & ENGINE_CONFIG_LAYOUT_MASK) + config->layout = cnode->config.layout; ++ if (cnode->mask & ENGINE_CONFIG_HOTKEYS_MASK) ++ config->hotkeys = cnode->config.hotkeys; ++ if (cnode->mask & ENGINE_CONFIG_SYMBOL_MASK) ++ config->symbol = cnode->config.symbol; + if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK) + config->preedit_highlight = cnode->config.preedit_highlight; + } +@@ -309,6 +317,16 @@ ibus_m17n_engine_config_parse_xml_node (EngineConfigNode *cnode, + cnode->mask |= ENGINE_CONFIG_LAYOUT_MASK; continue; } + if (g_strcmp0 (sub_node->name , "hotkeys") == 0) { + cnode->config.hotkeys = g_strdup (sub_node->text); ++ cnode->mask |= ENGINE_CONFIG_HOTKEYS_MASK; + continue; + } + if (g_strcmp0 (sub_node->name , "symbol") == 0) { + cnode->config.symbol = g_strdup (sub_node->text); ++ cnode->mask |= ENGINE_CONFIG_SYMBOL_MASK; + continue; + } if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) { if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0) cnode->config.preedit_highlight = TRUE; -Index: ibus-m17n-1.3.2/src/m17nutil.h -=================================================================== ---- ibus-m17n-1.3.2.orig/src/m17nutil.h -+++ ibus-m17n-1.3.2/src/m17nutil.h +diff --git a/src/m17nutil.h b/src/m17nutil.h +index c7b283e..21b1bb9 100644 +--- a/src/m17nutil.h ++++ b/src/m17nutil.h @@ -17,6 +17,12 @@ struct _IBusM17NEngineConfig { /* keyboard layout */ gchar *layout; @@ -621,3 +385,6 @@ Index: ibus-m17n-1.3.2/src/m17nutil.h /* whether to highlight preedit */ gboolean preedit_highlight; }; +-- +1.7.6.1 + diff --git a/ibus-m17n.spec b/ibus-m17n.spec index 9f60a37..184e159 100644 --- a/ibus-m17n.spec +++ b/ibus-m17n.spec @@ -11,9 +11,13 @@ %global _with_hotkeys --with-hotkeys %endif +%if (0%{?fedora} > 16) +%global _enable_eekboard --enable_eekboard +%endif + Name: ibus-m17n Version: 1.3.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The M17N engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -21,9 +25,10 @@ URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: ibus-m17n-HEAD.patch -Patch1: ibus-m17n-iok.patch +Patch1: ibus-m17n-default-xml-override.patch Patch2: ibus-m17n-xkb-options.patch Patch3: ibus-m17n-xx-icon-symbol.patch +Patch4: ibus-m17n-virtkbd.patch # The following BR is for autogen and not necessary when packging # released tarballs. @@ -39,10 +44,11 @@ BuildRequires: gtk2-devel %endif BuildRequires: libxklavier-devel BuildRequires: ibus-devel >= %{require_ibus_version} +BuildRequires: eekboard-devel Requires: ibus >= %{require_ibus_version} Requires: m17n-lib -Requires: iok > 1.3.1 +Requires: eekboard %description M17N engine for IBus input platform. It allows input of many languages using @@ -51,13 +57,14 @@ the input table maps from m17n-db. %prep %setup -q %patch0 -p1 -b .HEAD -%patch1 -p1 -b .iok +%patch1 -p1 -b .default-xml-override %patch2 -p1 -b .xkb-options %patch3 -p1 -b .xx-icon-symbol +%patch4 -p1 -b .virtkbd NOCONFIGURE=1 ./autogen.sh %build -%configure --disable-static %{?_with_gtk} %{?_with_hotkeys} +%configure --disable-static %{?_with_gtk} %{?_with_hotkeys} %{?_enable_eekboard} # make -C po update-gmo make %{?_smp_mflags} @@ -75,6 +82,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install %{_datadir}/ibus/component/* %changelog +* Thu Sep 1 2011 Daiki Ueno - 1.3.2-11 +- Add ibus-m17n-default-xml-override.patch. +- Add ibus-m17n-virtkbd.patch, instead of ibus-m17n-iok.patch. + * Tue Aug 9 2011 Daiki Ueno - 1.3.2-10 - Set symbol for m17n:ne:rom.