diff options
| author | Theppitak Karoonboonyanan <thep@linux.thai.net> | 2009-04-09 11:25:25 +0700 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-04-13 17:25:14 +0100 |
| commit | d108d3c706af3502820b5202564488ea19908b77 (patch) | |
| tree | 00c7d39bf302a87bb5a3665c7fdab6b49dd97238 | |
| parent | fd62d3318c846cd43d66a505946e94704d7d83dc (diff) | |
CharSet-to-CompoundText Conversion Failed for Thai Locales
SCIM fails to commit Thai input characters on Thai locales, because it commits
string in compound text form, which was converted via
XwcTextListToTextProperty(). But the XLC_LOCALE for th_TH and th_TH.UTF-8
declares cs1's ct_encoding as TIS620-0:GR, which was commented out in
src/xlibi18n/lcCT.c default_ct_data, in favor of ISO8859-11 ESC sequence.
So, declaring cs1 as ISO8859-11:GR instead makes it work.
Besides, for th_TH.UTF-8, adding cs2 class with ISO10646-1 encoding also adds
support for UTF-8 input.
And, along discussion in the bug, a similar problem was found for fontset, too,
by causing delays on X apps startups on systems without tis620-0 fonts. This
is normally the case, as mkfontdir and mkfontscale generate iso8859-11 entries
by default for Thai X fonts. So, Thai fontset charset is also patched.
X.Org Bug 16475 <http://bugs.freedesktop.org/show_bug.cgi?id=16475>
Signed-off-by: Theppitak Karoonboonyanan <thep@linux.thai.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | nls/th_TH.UTF-8/XLC_LOCALE.pre | 12 | ||||
| -rw-r--r-- | nls/th_TH/XLC_LOCALE.pre | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/nls/th_TH.UTF-8/XLC_LOCALE.pre b/nls/th_TH.UTF-8/XLC_LOCALE.pre index 9f1caf7e..caede144 100644 --- a/nls/th_TH.UTF-8/XLC_LOCALE.pre +++ b/nls/th_TH.UTF-8/XLC_LOCALE.pre @@ -27,8 +27,8 @@ fs1 { } XCOMM fs1 class (Thai) fs2 { - charset TIS620-0:GR - font TIS620-0:GR + charset ISO8859-11:GR + font ISO8859-11:GR } END XLC_FONTSET @@ -69,7 +69,13 @@ cs1 { length 1 wc_encoding \x30000000 - ct_encoding TIS620-0:GR + ct_encoding ISO8859-11:GR +} + +XCOMM cs2 class +cs2 { + side none + ct_encoding ISO10646-1 } END XLC_XLOCALE diff --git a/nls/th_TH/XLC_LOCALE.pre b/nls/th_TH/XLC_LOCALE.pre index 7d55d851..c67d6837 100644 --- a/nls/th_TH/XLC_LOCALE.pre +++ b/nls/th_TH/XLC_LOCALE.pre @@ -16,8 +16,8 @@ fs0 { } XCOMM fs1 class (Thai) fs1 { - charset TIS620-0:GR - font TIS620-0:GR + charset ISO8859-11:GR + font ISO8859-11:GR } END XLC_FONTSET @@ -61,7 +61,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding TIS620-0:GR + ct_encoding ISO8859-11:GR } END XLC_XLOCALE |