Mercurial > emacs
changeset 9446:be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
(x_make_frame_visible, x_iconify_frame):
Call x_bitmap_icon if frame wants a bitmap icon.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 11 Oct 1994 09:27:47 +0000 |
| parents | 712af9626dc0 |
| children | 1ff618ef732b |
| files | src/xterm.c |
| diffstat | 1 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Tue Oct 11 09:22:44 1994 +0000 +++ b/src/xterm.c Tue Oct 11 09:27:47 1994 +0000 @@ -4924,6 +4924,9 @@ BLOCK_INPUT; + if (x_icon_type (f)) + x_bitmap_icon (f); + if (! FRAME_VISIBLE_P (f)) { #ifndef USE_X_TOOLKIT @@ -5092,8 +5095,12 @@ if (f->async_iconified) return; + BLOCK_INPUT; + + if (x_icon_type (f)) + x_bitmap_icon (f); + #ifdef USE_X_TOOLKIT - BLOCK_INPUT; if (! FRAME_VISIBLE_P (f)) { @@ -5120,8 +5127,6 @@ UNBLOCK_INPUT; #else /* not USE_X_TOOLKIT */ - BLOCK_INPUT; - /* Make sure the X server knows where the window should be positioned, in case the user deiconifies with the window manager. */ if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f)) @@ -5439,6 +5444,10 @@ x_focus_frame = x_highlight_frame = 0; #ifdef USE_X_TOOLKIT +#ifdef HAVE_X11R5 + XtSetLanguageProc (NULL, NULL, NULL); +#endif + argv = (char **) XtMalloc (7 * sizeof (char *)); argv[0] = ""; argv[1] = "-display"; @@ -5460,6 +5469,9 @@ x_current_display = XtDisplay (Xt_app_shell); #else /* not USE_X_TOOLKIT */ +#ifdef HAVE_X11R5 + XSetLocaleModifiers (""); +#endif x_current_display = XOpenDisplay (display_name); #endif /* not USE_X_TOOLKIT */ if (x_current_display == 0)