Attachment 17726 Details for Bug 12759 – Cleaner patch, without explicit codeset checks

[patch] Cleaner patch, without explicit codeset checks

022_Thai_xim_surr_conv.diff (text/plain), 1.83 KB, created by Theppitak Karoonboonyanan on 2008-07-17 08:02:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Theppitak Karoonboonyanan

Created: 2008-07-17 08:02:49 UTC

Size: 1.83 KB

patch

obsolete

>Index: libx11-1.1.4/modules/im/ximcp/imThaiFlt.c
>===================================================================
>--- libx11-1.1.4.orig/modules/im/ximcp/imThaiFlt.c	2008-07-17 21:15:44.000000000 +0700
>+++ libx11-1.1.4/modules/im/ximcp/imThaiFlt.c	2008-07-17 21:39:48.000000000 +0700
>@@ -560,13 +560,37 @@
>         {
>             c = 0;
>         } else {
>+            Xim     im;
>+            XlcConv conv;
>+            int     from_left;
>+            int     to_left;
>+            char   *from_buf;
>+            char   *to_buf;
>+
>+            im = (Xim) XIMOfIC((XIC)ic);
>             if (screc.text->encoding_is_wchar) {
>-                c = ucs2tis(screc.text->string.wcs[0]);
>-                XFree(screc.text->string.wcs);
>+                conv = _XlcOpenConverter(im->core.lcd, XlcNWideChar,
>+                                         im->core.lcd, XlcNCharSet);
>+                from_buf = (char *) screc.text->string.wcs;
>+                from_left = screc.text->length * sizeof(wchar_t);
>             } else {
>-                c = screc.text->string.mbs[0];
>-                XFree(screc.text->string.mbs);
>+                conv = _XlcOpenConverter(im->core.lcd, XlcNMultiByte,
>+                                         im->core.lcd, XlcNCharSet);
>+                from_buf = screc.text->string.mbs;
>+                from_left = screc.text->length;
>+            }
>+            to_buf = (char *)&c;
>+            to_left = 1;
>+
>+            _XlcResetConverter(conv);
>+            if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,
>+                            (XPointer *)&to_buf, &to_left, NULL, 0) < 0)
>+            {
>+                c = (unsigned char) b->mb[b->tree[(ic)->private.local.context].mb];
>             }
>+            _XlcCloseConverter(conv);
>+
>+            XFree(screc.text->string.mbs);
>         }
>         XFree(screc.text);
>         return c;

Actions: View | Splinter Review

Attachments on bug 12759: 11963 | 17726

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.