diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-12 19:55:28 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-12 19:56:36 +0800 |
| commit | ae4ff4f25fbf704446f8f38d8e818f223b79042b (patch) | |
| tree | 38487d1d2276e69d3060f80fccbc96dfebf312a6 /src/emacs.c | |
| parent | 50140585a29f132e5e0562142ec223bc8e6870a0 (diff) | |
| download | emacs-ae4ff4f25fbf704446f8f38d8e818f223b79042b.tar.gz | |
Support input method ``text conversion'' on X Windows
* configure.ac (HAVE_TEXT_CONVERSION): Define on X.
* etc/NEWS: Announce new change.
* src/emacs.c (main): Always call init_xterm.
* src/frame.c (do_switch_frame): Use `fset_selected_window'.
* src/insdel.c (struct safe_del_range_context): New structure.
(safe_del_range_1, safe_del_range_2, safe_del_range): New
functions.
* src/lisp.h: Export new functions.
* src/window.c (run_window_change_functions): Report selected
window and buffer changes so that the input method can be reset.
* src/xfns.c (XICCallback, Xxic_preedit_caret_callback)
(Xxic_preedit_done_callback, Xxic_preedit_start_callback)
(Xxic_preedit_draw_callback): Fix coding style.
(Xxic_string_conversion_callback): New callback.
(create_frame_xic): Register string conversion callback.
(struct x_xim_text_conversion_data): New field `size'.
(x_encode_xim_text_1, x_encode_xim_text): New functions.
(xic_string_conversion_callback): New function.
* src/xterm.c (x_reset_conversion): New function.
(text_conversion_interface): New variable.
(init_xterm): Initialize text conversion interface.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index 214e2e2a296..282e2f48100 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2447,7 +2447,8 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #ifdef HAVE_DBUS init_dbusbind (); #endif -#if defined(USE_GTK) && !defined(HAVE_PGTK) + +#ifdef HAVE_X_WINDOWS init_xterm (); #endif |