client/x11: Enhance Xutf8TextListToTextProperty

XCompoundTextStyle depends on the current locale and some locales fail
to to get the compound text style.
If Xutf8TextListToTextProperty() fails, now ibus-x11 tries to get
the compound text style with UTF-8 encoding.

BUG=https://github.com/ibus/ibus/issues/2422

1 files changed, 34 insertions, 7 deletions

diff --git a/client/x11/main.c b/client/x11/main.c
index fe30c1d6..6057cc03 100644
--- a/client/x11/main.c
+++ b/client/x11/main.c
@@ -2,7 +2,7 @@
 /* vim:set et sts=4: */
 /* ibus
  * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
  * Copyright (C) 2007-2015 Red Hat, Inc.
  *
  * main.c:
@@ -48,6 +48,8 @@
 
 #include <getopt.h>
 
+#define ESC_SEQUENCE_ISO10646_1 "\033%G"
+
 #define LOG(level, fmt_args...) \
     if (g_debug_level >= (level)) { \
         g_debug (fmt_args); \
@@ -254,9 +256,17 @@ _xim_preedit_callback_draw (XIMS xims, X11IC *x11ic, const gchar *preedit_string
     text.feedback = feedback;
 
     if (len > 0) {
-        Xutf8TextListToTextProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                     (char **)&preedit_string,
-                                     1, XCompoundTextStyle, &tp);
+        int ret = Xutf8TextListToTextProperty (
+                GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                (char **)&preedit_string,
+                1, XCompoundTextStyle, &tp);
+        if (ret == EXIT_FAILURE) {
+            XFree (tp.value);
+            tp.value = (unsigned char *)g_strdup_printf (
+                    "%s%s",
+                    ESC_SEQUENCE_ISO10646_1,
+                    preedit_string);
+        }
         text.encoding_is_wchar = 0;
         text.length = strlen ((char*)tp.value);
         text.string.multi_byte = (char*)tp.value;
@@ -883,9 +893,26 @@ _context_commit_text_cb (IBusInputContext *context,
 
     XTextProperty tp;
     IMCommitStruct cms = {0};
-
-    Xutf8TextListToTextProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-        (gchar **)&(text->text), 1, XCompoundTextStyle, &tp);
+    int ret;
+
+    ret = Xutf8TextListToTextProperty (
+            GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+            (gchar **)&(text->text), 1, XCompoundTextStyle, &tp);
+    /* XCompoundTextStyle uses the encoding escaped sequence + encoded chars
+     * matched to the specified multibyte characters: text->text, and
+     * libX11.so sorts the encoding sets by locale.
+     * If an encoded string fails to be matched, ibus-x11 specifies the
+     * ISO10641-1 encoding and that escaped sequence is "\033%G":
+     * https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/src/xlibi18n/lcCT.c
+     * , and the encoding is UTF-8 with utf8_wctomb():
+     * https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/src/xlibi18n/lcUniConv/utf8.h
+     */
+    if (ret == EXIT_FAILURE) {
+        XFree (tp.value);
+        tp.value = (unsigned char *)g_strdup_printf ("%s%s",
+                                                     ESC_SEQUENCE_ISO10646_1,
+                                                     text->text);
+    }
 
     cms.major_code = XIM_COMMIT;
     cms.icid = x11ic->icid;