libX11: Changes to 'master'

[Julien Cristau]

 modules/im/ximcp/imThaiFlt.c   |   50 ++++++++++++++++++++++++++++++++++++-----
 nls/th_TH.UTF-8/XLC_LOCALE.pre |   12 +++++++--
 nls/th_TH/XLC_LOCALE.pre       |    6 ++--
 3 files changed, 57 insertions(+), 11 deletions(-)

New commits:
commit 128daff4422f973ea40dd1e31b2db230e643549e
Author: Theppitak Karoonboonyanan <thep at linux.thai.net>
Date:   Thu Apr 9 12:01:07 2009 +0700

    Thai XIM not retrieve MB surrounding on UTF-8 LC
    
    On th_TH.UTF-8 locale, Thai XIM rejects all combining characters for GTK+ apps
    that use X Input Method.
    
    This is because GTK+ imxim immodule passes surrounding text in locale encoding,
    which is UTF-8 for UTF-8 locales. But current Thai XIM in Xlib assumes the
    multi-byte StringConversionText response for the StringConversionCallback to
    always be TIS-620, by retrieving a single byte and using it as-is.
    
    If the Thai XIM tries to convert the multi-byte text based on locale codeset
    before using it, it will work again.
    
    X.Org But 12759 <http://bugs.freedesktop.org/show_bug.cgi?id=12759>
    
    Signed-off-by: Theppitak Karoonboonyanan <thep at linux.thai.net>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

commit e09f0d227fbf95b6252759af9d426efd57686f9f
Author: Theppitak Karoonboonyanan <thep at linux.thai.net>
Date:   Thu Apr 9 11:47:55 2009 +0700

    Thai XIM not filters when NumLock or CapsLock is on
    
    The Thai XIM component in libx11 activated on 'th*' locales normally filters
    input sequence according to orthographic rules. However, when NumLock/CapsLock
    is on, this stops working. All sequences are passed through.
    
    This is caused by missing masks in _XimThaiFilter(), which normally screens out
    certain special keys from entering orthographic rules. Unfortunately, this
    included events with NumLock/CapsLock on. Negating the masks from the check
    allows the events to be tested by the rules.
    
    X.Org Bug 12517 <http://bugs.freedesktop.org/show_bug.cgi?id=12517>
    
    Signed-off-by: Theppitak Karoonboonyanan <thep at linux.thai.net>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

commit d108d3c706af3502820b5202564488ea19908b77
Author: Theppitak Karoonboonyanan <thep at linux.thai.net>
Date:   Thu Apr 9 11:25:25 2009 +0700

    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 at linux.thai.net>
    Signed-off-by: Julien Cristau <jcristau at debian.org>