154 lines
4.9 KiB
Diff
154 lines
4.9 KiB
Diff
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 @@
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:bn:inscript</name>
|
|
+ <name>m17n:bn:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:gu:inscript</name>
|
|
+ <name>m17n:gu:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:hi:inscript</name>
|
|
+ <name>m17n:hi:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:kn:kgp</name>
|
|
@@ -37,19 +40,22 @@
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:mai:inscript</name>
|
|
+ <name>m17n:mai:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:ml:inscript</name>
|
|
+ <name>m17n:ml:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:mr:inscript</name>
|
|
+ <name>m17n:mr:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:ne:rom</name>
|
|
@@ -57,14 +63,16 @@
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:or:inscript</name>
|
|
+ <name>m17n:or:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:pa:inscript</name>
|
|
+ <name>m17n:pa:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:sa:harvard-kyoto</name>
|
|
@@ -72,14 +80,16 @@
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:sd:inscript</name>
|
|
+ <name>m17n:sd:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:si:wijesekera</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:ta:tamil99</name>
|
|
@@ -87,9 +97,10 @@
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
</engine>
|
|
<engine>
|
|
- <name>m17n:te:inscript</name>
|
|
+ <name>m17n:te:inscript*</name>
|
|
<rank>2</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<!-- Samanala should have lower rank than other Sinhala
|
|
engines since it is the only non-keyboard input method in
|
|
@@ -226,6 +237,7 @@
|
|
<name>m17n:si:*</name>
|
|
<rank>1</rank>
|
|
<preedit-highlight>FALSE</preedit-highlight>
|
|
+ <layout>default[lv3:ralt_switch]</layout>
|
|
</engine>
|
|
<engine>
|
|
<name>m17n:ta:*</name>
|
|
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
|
|
@@ -120,7 +120,7 @@ ibus_m17n_engine_new (MSymbol lang,
|
|
"language", msymbol_name (lang),
|
|
"license", "GPL",
|
|
"icon", engine_icon ? engine_icon : "",
|
|
- "layout", "us",
|
|
+ "layout", config->layout ? config->layout : "us",
|
|
"rank", config->rank,
|
|
NULL);
|
|
#else
|
|
@@ -282,6 +282,11 @@ ibus_m17n_engine_config_parse_xml_node (
|
|
cnode->config.rank = atoi (sub_node->text);
|
|
continue;
|
|
}
|
|
+ if (g_strcmp0 (sub_node->name , "layout") == 0) {
|
|
+ g_free (cnode->config.layout);
|
|
+ cnode->config.layout = g_strdup (sub_node->text);
|
|
+ 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
|
|
@@ -14,6 +14,9 @@ struct _IBusM17NEngineConfig {
|
|
/* engine rank */
|
|
gint rank;
|
|
|
|
+ /* keyboard layout */
|
|
+ gchar *layout;
|
|
+
|
|
/* whether to highlight preedit */
|
|
gboolean preedit_highlight;
|
|
};
|