diff options
| author | Yichao Yu <yyc1992@gmail.com> | 2020-12-28 04:17:43 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-12-28 04:17:43 +0100 |
| commit | 2a64de5e982fb8b868b76626ac2e92ddfafc9ca5 (patch) | |
| tree | 98812b40f684d8cdbf874e4466b55095da62371d /src/xterm.c | |
| parent | 40e9cec7d2b81d1dd1c7254acfdd5075f52040b5 (diff) | |
| download | emacs-2a64de5e982fb8b868b76626ac2e92ddfafc9ca5.tar.gz | |
Make XIM to work with non-CJK locales
* src/xfns.c (best_xim_style): Don't rely on supported_xim_styles
(bug#10867).
* src/xterm.c (x_draw_window_cursor): Adjust to modern input styles.
(xim_instantiate_callback): Ditto.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/xterm.c b/src/xterm.c index 7f8728e47c4..b3632a375ad 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9706,7 +9706,7 @@ x_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x, #ifdef HAVE_X_I18N if (w == XWINDOW (f->selected_window)) - if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMPreeditPosition)) + if (FRAME_XIC (f)) xic_set_preeditarea (w, x, y); #endif } @@ -10389,11 +10389,8 @@ xim_instantiate_callback (Display *display, XPointer client_data, XPointer call_ create_frame_xic (f); if (FRAME_XIC_STYLE (f) & XIMStatusArea) xic_set_statusarea (f); - if (FRAME_XIC_STYLE (f) & XIMPreeditPosition) - { - struct window *w = XWINDOW (f->selected_window); - xic_set_preeditarea (w, w->cursor.x, w->cursor.y); - } + struct window *w = XWINDOW (f->selected_window); + xic_set_preeditarea (w, w->cursor.x, w->cursor.y); } } |