Work around flaky XIM modules

diff --git a/src/ChangeLog b/src/ChangeLog
index 1cce3b5c48e76af2f5b20ad559ce4b61e66ca944..e468197c9683123bf9a0665f69ab3ebea40fecd3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * xfns.c (create_frame_xic): If XCreateIC fails, try again without
+       XNStatusAttributes; works around flaky XIM modules, apparently.
+
 2014-03-23  Daniel Colascione  <dancol@dancol.org>
 
        * term.c (init_tty): Rearrange condition for clarity; print

diff --git a/src/xfns.c b/src/xfns.c
index 5dbc7053fd9ff87a22705cec098a5e42d65667af..de92baa3ce697cd6fb41a0de8fc1f5bf5ed75812 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2021,6 +2021,16 @@ create_frame_xic (struct frame *f)
                       XNStatusAttributes, status_attr,
                       XNPreeditAttributes, preedit_attr,
                       NULL);
+
+      /* Some input methods don't support a status pixel.  */
+      if (xic == NULL)
+        xic = XCreateIC (xim,
+                         XNInputStyle, xic_style,
+                         XNClientWindow, FRAME_X_WINDOW (f),
+                         XNFocusWindow, FRAME_X_WINDOW (f),
+                         XNPreeditAttributes, preedit_attr,
+                         NULL);
+
       XFree (preedit_attr);
       XFree (status_attr);
     }