Mercurial > emacs

comparison src/xterm.c @ 9446:be58ba7c209d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 97cfba406b7b
children c84536ef5fa9
comparison
equal deleted inserted replaced
9445:712af9626dc0 9446:be58ba7c209d
4922 { 4922 {
4923 int mask; 4923 int mask;
4924 4924
4925 BLOCK_INPUT; 4925 BLOCK_INPUT;
4926 4926
4927 if (x_icon_type (f))
4928 x_bitmap_icon (f);
4929
4927 if (! FRAME_VISIBLE_P (f)) 4930 if (! FRAME_VISIBLE_P (f))
4928 { 4931 {
4929 #ifndef USE_X_TOOLKIT 4932 #ifndef USE_X_TOOLKIT
4930 if (! FRAME_ICONIFIED_P (f)) 4933 if (! FRAME_ICONIFIED_P (f))
4931 x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0); 4934 x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
5090 x_highlight_frame = 0; 5093 x_highlight_frame = 0;
5091 5094
5092 if (f->async_iconified) 5095 if (f->async_iconified)
5093 return; 5096 return;
5094 5097
5098 BLOCK_INPUT;
5099
5100 if (x_icon_type (f))
5101 x_bitmap_icon (f);
5102
5095 #ifdef USE_X_TOOLKIT 5103 #ifdef USE_X_TOOLKIT
5096 BLOCK_INPUT;
5097 5104
5098 if (! FRAME_VISIBLE_P (f)) 5105 if (! FRAME_VISIBLE_P (f))
5099 { 5106 {
5100 if (! EQ (Vx_no_window_manager, Qt)) 5107 if (! EQ (Vx_no_window_manager, Qt))
5101 x_wm_set_window_state (f, IconicState); 5108 x_wm_set_window_state (f, IconicState);
5117 5124
5118 BLOCK_INPUT; 5125 BLOCK_INPUT;
5119 XFlushQueue (); 5126 XFlushQueue ();
5120 UNBLOCK_INPUT; 5127 UNBLOCK_INPUT;
5121 #else /* not USE_X_TOOLKIT */ 5128 #else /* not USE_X_TOOLKIT */
5122
5123 BLOCK_INPUT;
5124 5129
5125 /* Make sure the X server knows where the window should be positioned, 5130 /* Make sure the X server knows where the window should be positioned,
5126 in case the user deiconifies with the window manager. */ 5131 in case the user deiconifies with the window manager. */
5127 if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f)) 5132 if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
5128 x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0); 5133 x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
5437 x_noop_count = 0; 5442 x_noop_count = 0;
5438 5443
5439 x_focus_frame = x_highlight_frame = 0; 5444 x_focus_frame = x_highlight_frame = 0;
5440 5445
5441 #ifdef USE_X_TOOLKIT 5446 #ifdef USE_X_TOOLKIT
5447 #ifdef HAVE_X11R5
5448 XtSetLanguageProc (NULL, NULL, NULL);
5449 #endif
5450
5442 argv = (char **) XtMalloc (7 * sizeof (char *)); 5451 argv = (char **) XtMalloc (7 * sizeof (char *));
5443 argv[0] = ""; 5452 argv[0] = "";
5444 argv[1] = "-display"; 5453 argv[1] = "-display";
5445 argv[2] = display_name; 5454 argv[2] = display_name;
5446 argv[3] = "-name"; 5455 argv[3] = "-name";
5458 NULL, NULL, 0); 5467 NULL, NULL, 0);
5459 XtFree ((char *)argv); 5468 XtFree ((char *)argv);
5460 x_current_display = XtDisplay (Xt_app_shell); 5469 x_current_display = XtDisplay (Xt_app_shell);
5461 5470
5462 #else /* not USE_X_TOOLKIT */ 5471 #else /* not USE_X_TOOLKIT */
5472 #ifdef HAVE_X11R5
5473 XSetLocaleModifiers ("");
5474 #endif
5463 x_current_display = XOpenDisplay (display_name); 5475 x_current_display = XOpenDisplay (display_name);
5464 #endif /* not USE_X_TOOLKIT */ 5476 #endif /* not USE_X_TOOLKIT */
5465 if (x_current_display == 0) 5477 if (x_current_display == 0)
5466 fatal ("X server %s not responding.\n\ 5478 fatal ("X server %s not responding.\n\
5467 Check the DISPLAY environment variable or use \"-d\"\n", 5479 Check the DISPLAY environment variable or use \"-d\"\n",