Skip to content

Commit

Permalink
Read default engine configuration from a file.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ueno
ueno committed Dec 3, 2010
1 parent 16165b9 commit e564a69
Show file tree
Hide file tree
Showing 5 changed files with 342 additions and 82 deletions.
2 changes: 2 additions & 0 deletions src/Makefile.am
View file
Expand Up @@ -62,6 +62,7 @@ ibus_engine_m17n_CFLAGS = \
@M17N_CFLAGS@ \
-DPKGDATADIR=\"$(pkgdatadir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DSETUPDIR=\"$(setupdir)\" \
$(NULL)
ibus_engine_m17n_LDADD = \
@IBUS_LIBS@ \
Expand All @@ -70,6 +71,7 @@ ibus_engine_m17n_LDADD = \

setup_DATA = \
ibus-m17n-preferences.ui \
default.xml \
$(NULL)
setupdir = $(pkgdatadir)/setup

Expand Down
227 changes: 227 additions & 0 deletions src/default.xml
View file
@@ -0,0 +1,227 @@
<?xml version="1.0" encoding="utf-8"?>
<engines>
<!-- Indic engines which represent languages. -->
<engine>
<name>m17n:as:phonetic</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:bn:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:gu:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:hi:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:kn:kgp</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ks:kbd</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:mai:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ml:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:mr:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ne:rom</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:or:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:pa:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:sa:harvard-kyoto</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:sd:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:si:wijesekera</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ta:tamil99</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:te:inscript</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<!-- Other Indic engines should be selected by default:
https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
<engine>
<name>m17n:as:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:bn:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:gu:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:hi:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:kn:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ks:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:mai:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ml:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:mr:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ne:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:or:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:pa:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:sa:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:sd:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:si:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:ta:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<engine>
<name>m17n:te:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
</engine>
<!-- Chinese and Japanese engines which require preedit decoration. -->
<engine>
<name>m17n:ja:anthy</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:cangjie</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:py-b5</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:py-gb</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:py</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:quick</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:tonepy-b5</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:tonepy-gb</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:tonepy</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
<engine>
<name>m17n:zh:util</name>
<rank>0</rank>
<preedit-highlight>TRUE</preedit-highlight>
</engine>
</engines>
8 changes: 4 additions & 4 deletions src/engine.c
View file
Expand Up @@ -268,8 +268,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
IBusObjectClass *ibus_object_class = IBUS_OBJECT_CLASS (klass);
IBusEngineClass *engine_class = IBUS_ENGINE_CLASS (klass);
GValue value = { 0 };
gboolean preedit_highlight;
gchar *engine_name, *lang, *name;
IBusM17NEngineConfig *engine_config;

if (parent_class == NULL)
parent_class = (IBusEngineClass *) g_type_class_peek_parent (klass);
Expand Down Expand Up @@ -306,7 +306,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
klass->preedit_underline = IBUS_ATTR_UNDERLINE_NONE;
klass->lookup_table_orientation = IBUS_ORIENTATION_SYSTEM;

preedit_highlight = ibus_m17n_preedit_highlight (engine_name);
engine_config = ibus_m17n_get_engine_config (engine_name);
g_free (engine_name);

if (ibus_config_get_value (config,
Expand All @@ -317,7 +317,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)

klass->preedit_foreground = ibus_m17n_parse_color (hex);
g_value_unset (&value);
} else if (preedit_highlight)
} else if (engine_config->preedit_highlight)
klass->preedit_foreground = PREEDIT_FOREGROUND;

if (ibus_config_get_value (config,
Expand All @@ -328,7 +328,7 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)

klass->preedit_background = ibus_m17n_parse_color (hex);
g_value_unset (&value);
} else if (preedit_highlight)
} else if (engine_config->preedit_highlight)
klass->preedit_background = PREEDIT_BACKGROUND;

if (ibus_config_get_value (config,
Expand Down

0 comments on commit e564a69

Please sign in to comment.