xdisp.c 129 KB
Newer Older
Jim Blandy's avatar
Jim Blandy committed
1
/* Display generation from window structure and buffer text.
Karl Heuer's avatar
Karl Heuer committed
2
   Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc.
Jim Blandy's avatar
Jim Blandy committed
3 4 5 6 7

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
8
the Free Software Foundation; either version 2, or (at your option)
Jim Blandy's avatar
Jim Blandy committed
9 10 11 12 13 14 15 16 17
any later version.

GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING.  If not, write to
18 19
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */
Jim Blandy's avatar
Jim Blandy committed
20 21


22
#include <config.h>
Jim Blandy's avatar
Jim Blandy committed
23 24 25 26
#include <stdio.h>
/*#include <ctype.h>*/
#undef NULL
#include "lisp.h"
Jim Blandy's avatar
Jim Blandy committed
27
#include "frame.h"
Jim Blandy's avatar
Jim Blandy committed
28 29 30 31 32 33 34 35
#include "window.h"
#include "termchar.h"
#include "dispextern.h"
#include "buffer.h"
#include "indent.h"
#include "commands.h"
#include "macros.h"
#include "disptab.h"
36
#include "termhooks.h"
37
#include "intervals.h"
Karl Heuer's avatar
Karl Heuer committed
38
#include "keyboard.h"
Jim Blandy's avatar
Jim Blandy committed
39

40
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
41 42 43
extern void set_frame_menubar ();
#endif

Jim Blandy's avatar
Jim Blandy committed
44 45 46
extern int interrupt_input;
extern int command_loop_level;

47 48
extern Lisp_Object Qface;

49 50 51
extern Lisp_Object Voverriding_local_map;
extern Lisp_Object Voverriding_local_map_menu_flag;

52
Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
53
Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
54
Lisp_Object Qredisplay_end_trigger_functions;
55

56
/* Nonzero means print newline to stdout before next minibuffer message.  */
Jim Blandy's avatar
Jim Blandy committed
57 58 59

int noninteractive_need_newline;

60 61
/* Nonzero means print newline to message log before next message.  */

62
static int message_log_need_newline;
63

Jim Blandy's avatar
Jim Blandy committed
64 65
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
Karl Heuer's avatar
Karl Heuer committed
66 67
#define minmax(floor, val, ceil) \
	((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val))
Jim Blandy's avatar
Jim Blandy committed
68 69

/* The buffer position of the first character appearing
Jim Blandy's avatar
Jim Blandy committed
70 71
 entirely or partially on the current frame line.
 Or zero, which disables the optimization for the current frame line. */
Jim Blandy's avatar
Jim Blandy committed
72 73 74 75 76 77
static int this_line_bufpos;

/* Number of characters past the end of this line,
   including the terminating newline */
static int this_line_endpos;

Jim Blandy's avatar
Jim Blandy committed
78
/* The vertical position of this frame line. */
Jim Blandy's avatar
Jim Blandy committed
79 80
static int this_line_vpos;

Jim Blandy's avatar
Jim Blandy committed
81
/* Hpos value for start of display on this frame line.
Jim Blandy's avatar
Jim Blandy committed
82 83 84 85 86 87 88 89
   Usually zero, but negative if first character really began
   on previous line */
static int this_line_start_hpos;

/* Buffer that this_line variables are describing. */
static struct buffer *this_line_buffer;

/* Value of echo_area_glyphs when it was last acted on.
Jim Blandy's avatar
Jim Blandy committed
90
  If this is nonzero, there is a message on the frame
Jim Blandy's avatar
Jim Blandy committed
91 92 93 94
  in the minibuffer and it should be erased as soon
  as it is no longer requested to appear. */
char *previous_echo_glyphs;

Jim Blandy's avatar
Jim Blandy committed
95
/* Nonzero means truncate lines in all windows less wide than the frame */
Jim Blandy's avatar
Jim Blandy committed
96 97
int truncate_partial_width_windows;

98 99 100 101
/* Nonzero means we have more than one non-minibuffer-only frame.
   Not guaranteed to be accurate except while parsing frame-title-format.  */
int multiple_frames;

Jim Blandy's avatar
Jim Blandy committed
102 103 104 105 106 107 108 109
Lisp_Object Vglobal_mode_string;

/* Marker for where to display an arrow on top of the buffer text.  */
Lisp_Object Voverlay_arrow_position;

/* String to display for the arrow.  */
Lisp_Object Voverlay_arrow_string;

110 111 112 113 114 115
/* Like mode-line-format, but for the titlebar on a visible frame.  */
Lisp_Object Vframe_title_format;

/* Like mode-line-format, but for the titlebar on an iconified frame.  */
Lisp_Object Vicon_title_format;

116 117 118 119 120
/* List of functions to call when a window's size changes.  These
   functions get one arg, a frame on which one or more windows' sizes
   have changed.  */
static Lisp_Object Vwindow_size_change_functions;

Jim Blandy's avatar
Jim Blandy committed
121
/* Values of those variables at last redisplay.  */
122
static Lisp_Object last_arrow_position, last_arrow_string;
Jim Blandy's avatar
Jim Blandy committed
123

124 125
Lisp_Object Qmenu_bar_update_hook;

Jim Blandy's avatar
Jim Blandy committed
126 127 128
/* Nonzero if overlay arrow has been displayed once in this window.  */
static int overlay_arrow_seen;

Karl Heuer's avatar
Karl Heuer committed
129 130 131 132 133
/* Nonzero if visible end of buffer has already been displayed once
   in this window.  (We need this variable in case there are overlay
   strings that get displayed there.)  */
static int zv_strings_seen;

134 135 136
/* Nonzero means highlight the region even in nonselected windows.  */
static int highlight_nonselected_windows;

Jim Blandy's avatar
Jim Blandy committed
137
/* If cursor motion alone moves point off frame,
Jim Blandy's avatar
Jim Blandy committed
138
   Try scrolling this many lines up or down if that will bring it back.  */
139
static int scroll_step;
Jim Blandy's avatar
Jim Blandy committed
140 141 142 143 144

/* Nonzero if try_window_id has made blank lines at window bottom
 since the last redisplay that paused */
static int blank_end_of_window;

145 146
/* Number of windows showing the buffer of the selected window
   (or another buffer with the same base buffer).
Jim Blandy's avatar
Jim Blandy committed
147 148 149
   keyboard.c refers to this.  */
int buffer_shared;

Jim Blandy's avatar
Jim Blandy committed
150
/* display_text_line sets these to the frame position (origin 0) of point,
Jim Blandy's avatar
Jim Blandy committed
151 152 153 154 155 156
   whether the window is selected or not.
   Set one to -1 first to determine whether point was found afterwards.  */

static int cursor_vpos;
static int cursor_hpos;

157
static int debug_end_pos;
Jim Blandy's avatar
Jim Blandy committed
158 159 160 161

/* Nonzero means display mode line highlighted */
int mode_line_inverse_video;

162
static int message_log_check_duplicate ();
Jim Blandy's avatar
Jim Blandy committed
163 164 165 166
static void echo_area_display ();
void mark_window_display_accurate ();
static void redisplay_windows ();
static void redisplay_window ();
167
static void update_menu_bar ();
Jim Blandy's avatar
Jim Blandy committed
168 169 170 171 172 173 174
static void try_window ();
static int try_window_id ();
static struct position *display_text_line ();
static void display_mode_line ();
static int display_mode_element ();
static char *decode_mode_spec ();
static int display_string ();
175
static void display_menu_bar ();
176
static int display_count_lines ();
Jim Blandy's avatar
Jim Blandy committed
177 178

/* Prompt to display in front of the minibuffer contents */
179
Lisp_Object minibuf_prompt;
Jim Blandy's avatar
Jim Blandy committed
180 181 182 183 184 185 186 187 188 189

/* Width in columns of current minibuffer prompt.  */
int minibuf_prompt_width;

/* Message to display instead of minibuffer contents
   This is what the functions error and message make,
   and command echoing uses it as well.
   It overrides the minibuf_prompt as well as the buffer.  */
char *echo_area_glyphs;

190 191 192
/* This is the length of the message in echo_area_glyphs.  */
int echo_area_glyphs_length;

193 194 195 196 197
/* This is the window where the echo area message was displayed.
   It is always a minibuffer window, but it may not be the
   same window currently active as a minibuffer.  */
Lisp_Object echo_area_window;

Jim Blandy's avatar
Jim Blandy committed
198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219
/* true iff we should redraw the mode lines on the next redisplay */
int update_mode_lines;

/* Smallest number of characters before the gap
   at any time since last redisplay that finished.
   Valid for current buffer when try_window_id can be called.  */
int beg_unchanged;

/* Smallest number of characters after the gap
   at any time since last redisplay that finished.
   Valid for current buffer when try_window_id can be called.  */
int end_unchanged;

/* MODIFF as of last redisplay that finished;
   if it matches MODIFF, beg_unchanged and end_unchanged
   contain no useful information */
int unchanged_modified;

/* Nonzero if window sizes or contents have changed
   since last redisplay that finished */
int windows_or_buffers_changed;

220 221 222 223 224
/* Nonzero after display_mode_line if %l was used
   and it displayed a line number.  */
int line_number_displayed;

/* Maximum buffer size for which to display line numbers.  */
225
static int line_number_display_limit;
Karl Heuer's avatar
Karl Heuer committed
226 227 228 229

/* Number of lines to keep in the message log buffer.
   t means infinite.  nil means don't log at all.  */
Lisp_Object Vmessage_log_max;
Jim Blandy's avatar
Jim Blandy committed
230

231 232
/* Output a newline in the *Messages* buffer if "needs" one.  */

233 234 235 236 237 238 239 240
void
message_log_maybe_newline ()
{
  if (message_log_need_newline)
    message_dolog ("", 0, 1);
}


241 242 243
/* Add a string to the message log, optionally terminated with a newline.
   This function calls low-level routines in order to bypass text property
   hooks, etc. which might not be safe to run.  */
244 245

void
246
message_dolog (m, len, nlflag)
247
     char *m;
248
     int len, nlflag;
Karl Heuer's avatar
Karl Heuer committed
249
{
250
  if (!NILP (Vmessage_log_max))
Karl Heuer's avatar
Karl Heuer committed
251 252 253
    {
      struct buffer *oldbuf;
      int oldpoint, oldbegv, oldzv;
254
      int old_windows_or_buffers_changed = windows_or_buffers_changed;
Karl Heuer's avatar
Karl Heuer committed
255 256

      oldbuf = current_buffer;
257
      Fset_buffer (Fget_buffer_create (build_string ("*Messages*")));
258
      current_buffer->undo_list = Qt;
Karl Heuer's avatar
Karl Heuer committed
259 260 261
      oldpoint = PT;
      oldbegv = BEGV;
      oldzv = ZV;
262 263
      BEGV = BEG;
      ZV = Z;
Karl Heuer's avatar
Karl Heuer committed
264
      if (oldpoint == Z)
265
	oldpoint += len + nlflag;
Karl Heuer's avatar
Karl Heuer committed
266
      if (oldzv == Z)
267
	oldzv += len + nlflag;
Karl Heuer's avatar
Karl Heuer committed
268
      TEMP_SET_PT (Z);
269 270 271
      if (len)
	insert_1 (m, len, 1, 0);
      if (nlflag)
Karl Heuer's avatar
Karl Heuer committed
272
	{
273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
	  int this_bol, prev_bol, dup;
	  insert_1 ("\n", 1, 1, 0);

	  this_bol = scan_buffer ('\n', Z, 0, -2, 0, 0);
	  if (this_bol > BEG)
	    {
	      prev_bol = scan_buffer ('\n', this_bol, 0, -2, 0, 0);
	      dup = message_log_check_duplicate (prev_bol, this_bol);
	      if (dup)
		{
		  if (oldpoint > prev_bol)
		    oldpoint -= min (this_bol, oldpoint) - prev_bol;
		  if (oldbegv > prev_bol)
		    oldbegv -= min (this_bol, oldbegv) - prev_bol;
		  if (oldzv > prev_bol)
		    oldzv -= min (this_bol, oldzv) - prev_bol;
		  del_range_1 (prev_bol, this_bol, 0);
		  if (dup > 1)
		    {
		      char dupstr[40];
		      int duplen;

		      /* If you change this format, don't forget to also
			 change message_log_check_duplicate.  */
		      sprintf (dupstr, " [%d times]", dup);
		      duplen = strlen (dupstr);
		      TEMP_SET_PT (Z-1);
		      if (oldpoint == Z)
			oldpoint += duplen;
		      if (oldzv == Z)
			oldzv += duplen;
		      insert_1 (dupstr, duplen, 1, 0);
		    }
		}
	    }

	  if (NATNUMP (Vmessage_log_max))
	    {
	      int pos = scan_buffer ('\n', Z, 0,
				     -XFASTINT (Vmessage_log_max) - 1, 0, 0);
	      oldpoint -= min (pos, oldpoint) - BEG;
	      oldbegv -= min (pos, oldbegv) - BEG;
	      oldzv -= min (pos, oldzv) - BEG;
	      del_range_1 (BEG, pos, 0);
	    }
Karl Heuer's avatar
Karl Heuer committed
318 319 320 321 322
	}
      BEGV = oldbegv;
      ZV = oldzv;
      TEMP_SET_PT (oldpoint);
      set_buffer_internal (oldbuf);
323
      windows_or_buffers_changed = old_windows_or_buffers_changed;
324
      message_log_need_newline = !nlflag;
Karl Heuer's avatar
Karl Heuer committed
325
    }
326 327
}

328 329 330 331 332
/* We are at the end of the buffer after just having inserted a newline.
   (Note: We depend on the fact we won't be crossing the gap.)
   Check to see if the most recent message looks a lot like the previous one.
   Return 0 if different, 1 if the new one should just replace it, or a
   value N > 1 if we should also append " [N times]".  */
333

334 335 336 337 338 339 340
static int
message_log_check_duplicate (prev_bol, this_bol)
     int prev_bol, this_bol;
{
  int i;
  int len = Z - 1 - this_bol;
  int seen_dots = 0;
341 342
  unsigned char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol);
  unsigned char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol);
343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364

  for (i = 0; i < len; i++)
    {
      if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.'
	  && p1[i] != '\n')
	seen_dots = 1;
      if (p1[i] != p2[i])
	return seen_dots;
    }
  p1 += len;
  if (*p1 == '\n')
    return 2;
  if (*p1++ == ' ' && *p1++ == '[')
    {
      int n = 0;
      while (*p1 >= '0' && *p1 <= '9')
	n = n * 10 + *p1++ - '0';
      if (strncmp (p1, " times]\n", 8) == 0)
	return n+1;
    }
  return 0;
}
365

366
/* Display an echo area message M with a specified length of LEN chars.
367
   The string may include null characters.  If M is 0, clear out any
368
   existing message, and let the minibuffer text show through.
369 370 371 372 373 374

   The buffer M must continue to exist until after the echo area
   gets cleared or some other message gets displayed there.

   Do not pass text that is stored in a Lisp string.
   Do not pass text in a buffer that was alloca'd.  */
375 376 377 378 379 380 381

void
message2 (m, len)
     char *m;
     int len;
{
  /* First flush out any partial line written with print.  */
382
  message_log_maybe_newline ();
383 384
  if (m)
    message_dolog (m, len, 1);
Karl Heuer's avatar
Karl Heuer committed
385 386 387 388
  message2_nolog (m, len);
}


389
/* The non-logging counterpart of message2.  */
Karl Heuer's avatar
Karl Heuer committed
390 391 392 393 394

void
message2_nolog (m, len)
     char *m;
     int len;
395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410
{
  if (noninteractive)
    {
      if (noninteractive_need_newline)
	putc ('\n', stderr);
      noninteractive_need_newline = 0;
      fwrite (m, len, 1, stderr);
      if (cursor_in_echo_area == 0)
	fprintf (stderr, "\n");
      fflush (stderr);
    }
  /* A null message buffer means that the frame hasn't really been
     initialized yet.  Error messages get reported properly by
     cmd_error, so this must be just an informative message; toss it.  */
  else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
    {
411 412
      Lisp_Object mini_window;
      FRAME_PTR f;
413

414 415 416 417 418 419 420
      /* Get the frame containing the minibuffer
	 that the selected frame is using.  */
      mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
      f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));

#ifdef MULTI_FRAME
      FRAME_SAMPLE_VISIBILITY (f);
421
      if (FRAME_VISIBLE_P (selected_frame)
422 423
	  && ! FRAME_VISIBLE_P (f))
	Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window)));
424 425 426 427 428 429 430
#endif

      if (m)
	{
	  echo_area_glyphs = m;
	  echo_area_glyphs_length = len;
	}
431 432 433 434 435
      else
	echo_area_glyphs = previous_echo_glyphs = 0;

      do_pending_window_change ();
      echo_area_display ();
436
      update_frame (f, 1, 1);
437
      do_pending_window_change ();
438
      if (frame_up_to_date_hook != 0 && ! gc_in_progress)
439
	(*frame_up_to_date_hook) (f);
440 441
    }
}
442 443 444 445 446 447 448 449 450

/* Display a null-terminated echo area message M.  If M is 0, clear out any
   existing message, and let the minibuffer text show through.

   The buffer M must continue to exist until after the echo area
   gets cleared or some other message gets displayed there.

   Do not pass text that is stored in a Lisp string.
   Do not pass text in a buffer that was alloca'd.  */
451

452 453 454 455 456 457 458
void
message1 (m)
     char *m;
{
  message2 (m, (m ? strlen (m) : 0));
}

Karl Heuer's avatar
Karl Heuer committed
459 460 461 462 463 464 465
void
message1_nolog (m)
     char *m;
{
  message2_nolog (m, (m ? strlen (m) : 0));
}

466 467 468 469 470 471 472 473 474 475 476 477 478 479
/* Truncate what will be displayed in the echo area
   the next time we display it--but don't redisplay it now.  */

void
truncate_echo_area (len)
     int len;
{
  /* A null message buffer means that the frame hasn't really been
     initialized yet.  Error messages get reported properly by
     cmd_error, so this must be just an informative message; toss it.  */
  if (!noninteractive && INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
    echo_area_glyphs_length = len;
}

Jim Blandy's avatar
Jim Blandy committed
480
/* Nonzero if FRAME_MESSAGE_BUF (selected_frame) is being used by print;
Jim Blandy's avatar
Jim Blandy committed
481 482 483
   zero if being used by message.  */
int message_buf_print;

484
/* Dump an informative message to the minibuf.  If M is 0, clear out
485
   any existing message, and let the minibuffer text show through.  */
486

Jim Blandy's avatar
Jim Blandy committed
487 488 489 490
/* VARARGS 1 */
void
message (m, a1, a2, a3)
     char *m;
491
     EMACS_INT a1, a2, a3;
Jim Blandy's avatar
Jim Blandy committed
492 493 494
{
  if (noninteractive)
    {
495 496 497 498 499 500
      if (m)
	{
	  if (noninteractive_need_newline)
	    putc ('\n', stderr);
	  noninteractive_need_newline = 0;
	  fprintf (stderr, m, a1, a2, a3);
501 502
	  if (cursor_in_echo_area == 0)
	    fprintf (stderr, "\n");
503 504
	  fflush (stderr);
	}
Jim Blandy's avatar
Jim Blandy committed
505
    }
506
  else if (INTERACTIVE)
Jim Blandy's avatar
Jim Blandy committed
507
    {
508 509 510
      /* The frame whose minibuffer we're going to display the message on.
	 It may be larger than the selected frame, so we need
	 to use its buffer, not the selected frame's buffer.  */
511 512 513 514 515 516 517
      Lisp_Object mini_window;
      FRAME_PTR f;

      /* Get the frame containing the minibuffer
	 that the selected frame is using.  */
      mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
      f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
518 519 520 521

      /* A null message buffer means that the frame hasn't really been
	 initialized yet.  Error messages get reported properly by
	 cmd_error, so this must be just an informative message; toss it.  */
522
      if (FRAME_MESSAGE_BUF (f))
523
	{
524 525
	  if (m)
	    {
526
	      int len;
Jim Blandy's avatar
Jim Blandy committed
527
#ifdef NO_ARG_ARRAY
528
	      EMACS_INT a[3];
529 530 531
	      a[0] = a1;
	      a[1] = a2;
	      a[2] = a3;
Jim Blandy's avatar
Jim Blandy committed
532

533 534
	      len = doprnt (FRAME_MESSAGE_BUF (f),
			    FRAME_WIDTH (f), m, (char *)0, 3, a);
Jim Blandy's avatar
Jim Blandy committed
535
#else
536 537
	      len = doprnt (FRAME_MESSAGE_BUF (f),
			    FRAME_WIDTH (f), m, (char *)0, 3, &a1);
538 539
#endif /* NO_ARG_ARRAY */

540
	      message2 (FRAME_MESSAGE_BUF (f), len);
541 542 543 544 545 546 547
	    }
	  else
	    message1 (0);

	  /* Print should start at the beginning of the message
	     buffer next time.  */
	  message_buf_print = 0;
548
	}
Jim Blandy's avatar
Jim Blandy committed
549 550 551
    }
}

552
/* The non-logging version of message.  */
Karl Heuer's avatar
Karl Heuer committed
553 554 555 556 557 558 559 560 561 562 563 564
void
message_nolog (m, a1, a2, a3)
     char *m;
     EMACS_INT a1, a2, a3;
{
  Lisp_Object old_log_max;
  old_log_max = Vmessage_log_max;
  Vmessage_log_max = Qnil;
  message (m, a1, a2, a3);
  Vmessage_log_max = old_log_max;
}

565 566 567 568 569
void
update_echo_area ()
{
  message2 (echo_area_glyphs, echo_area_glyphs_length);
}
570

Jim Blandy's avatar
Jim Blandy committed
571 572 573 574
static void
echo_area_display ()
{
  register int vpos;
Jim Blandy's avatar
Jim Blandy committed
575
  FRAME_PTR f;
576
  Lisp_Object mini_window;
Jim Blandy's avatar
Jim Blandy committed
577

578 579 580 581 582
  /* Choose the minibuffer window for this display.
     It is the minibuffer window used by the selected frame.  */
  mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
  /* This is the frame that window is in.  */
  f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
Jim Blandy's avatar
Jim Blandy committed
583

Jim Blandy's avatar
Jim Blandy committed
584
  if (! FRAME_VISIBLE_P (f))
Jim Blandy's avatar
Jim Blandy committed
585 586
    return;

Jim Blandy's avatar
Jim Blandy committed
587
  if (frame_garbaged)
Jim Blandy's avatar
Jim Blandy committed
588
    {
589
      redraw_garbaged_frames ();
Jim Blandy's avatar
Jim Blandy committed
590
      frame_garbaged = 0;
Jim Blandy's avatar
Jim Blandy committed
591 592 593 594
    }

  if (echo_area_glyphs || minibuf_level == 0)
    {
595 596 597
      echo_area_window = mini_window;

      vpos = XFASTINT (XWINDOW (mini_window)->top);
Jim Blandy's avatar
Jim Blandy committed
598
      get_display_line (f, vpos, 0);
599
      display_string (XWINDOW (mini_window), vpos,
Jim Blandy's avatar
Jim Blandy committed
600
		      echo_area_glyphs ? echo_area_glyphs : "",
601
		      echo_area_glyphs ? echo_area_glyphs_length : -1,
602
		      0, 0, 0, 0, FRAME_WIDTH (f));
Jim Blandy's avatar
Jim Blandy committed
603

604
#if 0 /* This just gets in the way.  update_frame does the job.  */
Jim Blandy's avatar
Jim Blandy committed
605
      /* If desired cursor location is on this line, put it at end of text */
606 607
      if (cursor_in_echo_area)
	FRAME_CURSOR_Y (f) = vpos;
Jim Blandy's avatar
Jim Blandy committed
608 609
      if (FRAME_CURSOR_Y (f) == vpos)
	FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos];
610
#endif
Jim Blandy's avatar
Jim Blandy committed
611 612 613 614 615

      /* Fill the rest of the minibuffer window with blank lines.  */
      {
	int i;

616
	for (i = vpos + 1;
617
	     i < vpos + XFASTINT (XWINDOW (mini_window)->height); i++)
Jim Blandy's avatar
Jim Blandy committed
618
	  {
Jim Blandy's avatar
Jim Blandy committed
619
	    get_display_line (f, i, 0);
620
	    display_string (XWINDOW (mini_window), vpos,
621
			    "", 0, 0, 0, 0, 0, FRAME_WIDTH (f));
Jim Blandy's avatar
Jim Blandy committed
622 623
	  }
      }
Jim Blandy's avatar
Jim Blandy committed
624
    }
625
  else if (!EQ (mini_window, selected_window))
Jim Blandy's avatar
Jim Blandy committed
626 627
    windows_or_buffers_changed++;

628
  if (EQ (mini_window, selected_window))
Jim Blandy's avatar
Jim Blandy committed
629 630 631 632
    this_line_bufpos = 0;

  previous_echo_glyphs = echo_area_glyphs;
}
633 634

/* Update frame titles.  */
635

636
#ifdef HAVE_WINDOW_SYSTEM
637 638
static char frame_title_buf[512];
static char *frame_title_ptr;
639

640 641 642 643 644 645 646 647 648 649 650 651 652 653 654
static int
store_frame_title (str, mincol, maxcol)
     char *str;
     int mincol, maxcol;
{
  char *limit;
  if (maxcol < 0 || maxcol >= sizeof(frame_title_buf))
    maxcol = sizeof (frame_title_buf);
  limit = &frame_title_buf[maxcol];
  while (*str != '\0' && frame_title_ptr < limit)
    *frame_title_ptr++ = *str++;
  while (frame_title_ptr < &frame_title_buf[mincol])
    *frame_title_ptr++ = ' ';
  return frame_title_ptr - frame_title_buf;
}
655 656 657 658 659

static void
x_consider_frame_title (frame)
     Lisp_Object frame;
{
660 661 662
  Lisp_Object fmt;
  struct buffer *obuf;
  int len;
663 664
  FRAME_PTR f = XFRAME (frame);

665
  if (!(FRAME_WINDOW_P (f) || FRAME_MINIBUF_ONLY_P (f) || f->explicit_name))
666
    return;
667 668 669 670 671 672 673 674 675

  /* Do we have more than one visible frame on this X display?  */
  {
    Lisp_Object tail;

    for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
      {
	FRAME_PTR tf = XFRAME (XCONS (tail)->car);

676 677
	if (tf != f && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
	    && !FRAME_MINIBUF_ONLY_P (tf)
678 679 680 681 682 683 684
	    && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
	  break;
      }

    multiple_frames = CONSP (tail);
  }

685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700
  obuf = current_buffer;
  Fset_buffer (XWINDOW (f->selected_window)->buffer);
  fmt = (FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format);
  frame_title_ptr = frame_title_buf;
  len = display_mode_element (XWINDOW (f->selected_window), 0, 0, 0,
			      0, sizeof (frame_title_buf), fmt);
  frame_title_ptr = 0;
  set_buffer_internal (obuf);
  /* Set the name only if it's changed.  This avoids consing
     in the common case where it hasn't.  (If it turns out that we've
     already wasted too much time by walking through the list with
     display_mode_element, then we might need to optimize at a higher
     level than this.)  */
  if (! STRINGP (f->name) || XSTRING (f->name)->size != len
      || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0)
    x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil);
701
}
702 703
#else
#define frame_title_ptr ((char *)0)
704
#define store_frame_title(str, mincol, maxcol) 0
705
#endif
Jim Blandy's avatar
Jim Blandy committed
706

707
/* Prepare for redisplay by updating menu-bar item lists when appropriate.
Richard M. Stallman's avatar
Richard M. Stallman committed
708
   This can call eval.  */
709 710 711 712 713 714

void
prepare_menu_bars ()
{
  register struct window *w = XWINDOW (selected_window);
  int all_windows;
715
  struct gcpro gcpro1, gcpro2;
716

717
  all_windows = (update_mode_lines || buffer_shared > 1
718
		 || windows_or_buffers_changed);
719

720 721 722 723 724 725 726 727 728 729
  /* Update all frame titles based on their buffer names, etc.
     We do this before the menu bars so that the buffer-menu
     will show the up-to-date frame titles.

     This used to be done after the menu bars, for a reason that
     was stated as follows but which I do not understand:
     "We do this after the menu bars so that the frame will first
     create its menu bar using the name `emacs' if no other name
     has yet been specified."
     I think that is no longer a concern.  */
730
#ifdef HAVE_WINDOW_SYSTEM
731
  if (windows_or_buffers_changed || update_mode_lines)
732 733 734 735 736 737 738 739 740 741
    {
      Lisp_Object tail, frame;

      FOR_EACH_FRAME (tail, frame)
	if (FRAME_VISIBLE_P (XFRAME (frame))
	    || FRAME_ICONIFIED_P (XFRAME (frame)))
	  x_consider_frame_title (frame);
    }
#endif

742 743 744 745 746 747
  /* Update the menu bar item lists, if appropriate.
     This has to be done before any actual redisplay
     or generation of display lines.  */
  if (all_windows)
    {
      Lisp_Object tail, frame;
748 749 750
      int count = specpdl_ptr - specpdl;

      record_unwind_protect (Fstore_match_data, Fmatch_data ());
751 752

      FOR_EACH_FRAME (tail, frame)
753 754 755 756 757 758
	{
	  /* If a window on this frame changed size,
	     report that to the user and clear the size-change flag.  */
	  if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)))
	    {
	      Lisp_Object functions;
759 760
	      /* Clear flag first in case we get error below.  */
	      FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)) = 0;
761 762 763 764 765 766 767 768 769 770
	      functions = Vwindow_size_change_functions;
	      GCPRO2 (tail, functions);
	      while (CONSP (functions))
		{
		  call1 (XCONS (functions)->car, frame);
		  functions = XCONS (functions)->cdr;
		}
	      UNGCPRO;
	    }
	  GCPRO1 (tail);
771
	  update_menu_bar (XFRAME (frame), 0);
772 773
	  UNGCPRO;
	}
774 775

      unbind_to (count, Qnil);
776
    }
777
  else
778
    update_menu_bar (selected_frame, 1);
779 780
}

Jim Blandy's avatar
Jim Blandy committed
781
/* Do a frame update, taking possible shortcuts into account.
Jim Blandy's avatar
Jim Blandy committed
782 783 784 785 786 787
   This is the main external entry point for redisplay.

   If the last redisplay displayed an echo area message and that
   message is no longer requested, we clear the echo area
   or bring back the minibuffer if that is in use.

788 789 790 791 792 793
   Do not call eval from within this function.
   Calls to eval after the call to echo_area_display would confuse
   the display_line mechanism and would cause a crash.
   Calls to eval before that point will work most of the time,
   but can still lose, because  this function
   can be called from signal handlers; with alarms set up;
Jim Blandy's avatar
Jim Blandy committed
794
   or with synchronous processes running.
795

Jim Blandy's avatar
Jim Blandy committed
796 797 798
   See Fcall_process; if you called it from here, it could be
   entered recursively.  */

799 800
static int do_verify_charstarts;

801 802 803 804
/* Counter is used to clear the face cache
   no more than once ever 1000 redisplays.  */
static int clear_face_cache_count;

805 806 807
/* Record the previous terminal frame we displayed.  */
static FRAME_PTR previous_terminal_frame;

Jim Blandy's avatar
Jim Blandy committed
808 809 810 811 812 813 814 815 816 817 818 819 820
void
redisplay ()
{
  register struct window *w = XWINDOW (selected_window);
  register int pause;
  int must_finish = 0;
  int all_windows;
  register int tlbufpos, tlendpos;
  struct position pos;

  if (noninteractive)
    return;

821 822 823 824 825 826 827 828 829 830 831 832 833
#ifdef MULTI_FRAME
  if (FRAME_TERMCAP_P (selected_frame)
      && previous_terminal_frame != selected_frame)
    {
      /* Since frames on an ASCII terminal share the same display area,
	 displaying a different frame means redisplay the whole thing.  */
      windows_or_buffers_changed++;
      SET_FRAME_GARBAGED (selected_frame);
      XSETFRAME (Vterminal_frame, selected_frame);
    }
  previous_terminal_frame = selected_frame;
#endif

834 835 836 837 838
  /* Set the visible flags for all frames.
     Do this before checking for resized or garbaged frames; they want
     to know if their frames are visible.
     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
839
    Lisp_Object tail, frame;
840

841
    FOR_EACH_FRAME (tail, frame)
842 843 844 845 846 847 848
      {
	FRAME_SAMPLE_VISIBILITY (XFRAME (frame));

	/* Clear out all the display lines in which we will generate the
	   glyphs to display.  */
	init_desired_glyphs (XFRAME (frame));
      }
849 850
  }

Jim Blandy's avatar
Jim Blandy committed
851
  /* Notice any pending interrupt request to change frame size.  */
Jim Blandy's avatar
Jim Blandy committed
852 853
  do_pending_window_change ();

Jim Blandy's avatar
Jim Blandy committed
854
  if (frame_garbaged)
Jim Blandy's avatar
Jim Blandy committed
855
    {
856
      redraw_garbaged_frames ();
Jim Blandy's avatar
Jim Blandy committed
857
      frame_garbaged = 0;
Jim Blandy's avatar
Jim Blandy committed
858 859
    }

860 861
  prepare_menu_bars ();

862
  if (windows_or_buffers_changed)
Jim Blandy's avatar
Jim Blandy committed
863 864 865 866
    update_mode_lines++;

  /* Detect case that we need to write a star in the mode line.  */
  if (XFASTINT (w->last_modified) < MODIFF
867
      && XFASTINT (w->last_modified) <= SAVE_MODIFF)
Jim Blandy's avatar
Jim Blandy committed
868 869 870 871 872 873
    {
      w->update_mode_line = Qt;
      if (buffer_shared > 1)
	update_mode_lines++;
    }

874 875 876 877 878 879 880 881 882
  /* If %c is in use, update it if needed.  */
  if (!NILP (w->column_number_displayed)
      /* This alternative quickly identifies a common case
	 where no change is needed.  */
      && !(PT == XFASTINT (w->last_point)
	   && XFASTINT (w->last_modified) >= MODIFF)
      && XFASTINT (w->column_number_displayed) != current_column ())
    w->update_mode_line = Qt; 

Jim Blandy's avatar
Jim Blandy committed
883
  FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
Jim Blandy's avatar
Jim Blandy committed
884 885 886 887 888

  all_windows = update_mode_lines || buffer_shared > 1;

  /* If specs for an arrow have changed, do thorough redisplay
     to ensure we remove any arrow that should no longer exist.  */
889 890
  if (! EQ (Voverlay_arrow_position, last_arrow_position)
      || ! EQ (Voverlay_arrow_string, last_arrow_string))
891
    all_windows = 1;
Jim Blandy's avatar
Jim Blandy committed
892

893 894 895 896 897 898 899 900 901 902
  /* Normally the message* functions will have already displayed and
     updated the echo area, but the frame may have been trashed, or
     the update may have been preempted, so display the echo area
     again here.  */
  if (echo_area_glyphs || previous_echo_glyphs)
    {
      echo_area_display ();
      must_finish = 1;
    }

903 904 905 906
  /* If showing region, and mark has changed, must redisplay whole window.  */
  if (((!NILP (Vtransient_mark_mode)
	&& !NILP (XBUFFER (w->buffer)->mark_active))
       != !NILP (w->region_showing))
907 908 909
      || (!NILP (w->region_showing)
	  && !EQ (w->region_showing,
		  Fmarker_position (XBUFFER (w->buffer)->mark))))
910 911
    this_line_bufpos = -1;

Jim Blandy's avatar
Jim Blandy committed
912 913
  tlbufpos = this_line_bufpos;
  tlendpos = this_line_endpos;
Jim Blandy's avatar
Jim Blandy committed
914
  if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line)
915
      && !current_buffer->clip_changed
Jim Blandy's avatar
Jim Blandy committed
916
      && FRAME_VISIBLE_P (XFRAME (w->frame))
Jim Blandy's avatar
Jim Blandy committed
917 918 919
      /* Make sure recorded data applies to current buffer, etc */
      && this_line_buffer == current_buffer
      && current_buffer == XBUFFER (w->buffer)
Jim Blandy's avatar
Jim Blandy committed
920
      && NILP (w->force_start)
Jim Blandy's avatar
Jim Blandy committed
921
      /* Point must be on the line that we have info recorded about */
Karl Heuer's avatar
Karl Heuer committed
922 923
      && PT >= tlbufpos
      && PT <= Z - tlendpos
Jim Blandy's avatar
Jim Blandy committed
924 925 926 927 928
      /* All text outside that line, including its final newline,
	 must be unchanged */
      && (XFASTINT (w->last_modified) >= MODIFF
	  || (beg_unchanged >= tlbufpos - 1
	      && GPT >= tlbufpos
Jim Blandy's avatar
Jim Blandy committed
929 930
	      /* If selective display, can't optimize
		 if the changes start at the beginning of the line.  */
931
	      && ((INTEGERP (current_buffer->selective_display)
Jim Blandy's avatar
Jim Blandy committed
932 933 934 935
		   && XINT (current_buffer->selective_display) > 0
		   ? (beg_unchanged >= tlbufpos
		      && GPT > tlbufpos)
		   : 1))
Jim Blandy's avatar
Jim Blandy committed
936 937 938 939 940 941 942 943 944 945 946 947 948
	      && end_unchanged >= tlendpos
	      && Z - GPT >= tlendpos)))
    {
      if (tlbufpos > BEGV && FETCH_CHAR (tlbufpos - 1) != '\n'
	  && (tlbufpos == ZV
	      || FETCH_CHAR (tlbufpos) == '\n'))
	/* Former continuation line has disappeared by becoming empty */
	goto cancel;
      else if (XFASTINT (w->last_modified) < MODIFF
	       || MINI_WINDOW_P (w))
	{
	  cursor_vpos = -1;
	  overlay_arrow_seen = 0;
Karl Heuer's avatar
Karl Heuer committed
949
	  zv_strings_seen = 0;
Jim Blandy's avatar
Jim Blandy committed
950 951 952 953 954 955 956
	  display_text_line (w, tlbufpos, this_line_vpos, this_line_start_hpos,
			     pos_tab_offset (w, tlbufpos));
	  /* If line contains point, is not continued,
		 and ends at same distance from eob as before, we win */
	  if (cursor_vpos >= 0 && this_line_bufpos
	      && this_line_endpos == tlendpos)
	    {
957 958 959 960
	      /* If this is not the window's last line,
		 we must adjust the charstarts of the lines below.  */
	      if (this_line_vpos + 1
		  < XFASTINT (w->top) + window_internal_height (w))
961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978
		{
		  int left = XFASTINT (w->left);
		  int *charstart_next_line
		    = FRAME_CURRENT_GLYPHS (XFRAME (WINDOW_FRAME (w)))->charstarts[this_line_vpos + 1];
		  int adjust;

		  if (Z - tlendpos == ZV)
		    /* This line ends at end of (accessible part of) buffer.
		       There is no newline to count.  */
		    adjust = Z - tlendpos - charstart_next_line[left];
		  else
		    /* This line ends in a newline.
		       Must take account of the newline and the rest of the
		       text that follows.  */
		    adjust = Z - tlendpos + 1 - charstart_next_line[left];

		  adjust_window_charstarts (w, this_line_vpos, adjust);
		}
979

Jim Blandy's avatar
Jim Blandy committed
980
	      if (XFASTINT (w->width) != FRAME_WIDTH (XFRAME (WINDOW_FRAME (w))))
Jim Blandy's avatar
Jim Blandy committed
981 982 983 984 985 986
		preserve_other_columns (w);
	      goto update;
	    }
	  else
	    goto cancel;
	}
987 988 989 990 991 992
      else if (PT == XFASTINT (w->last_point)
	       /* Make sure the cursor was last displayed
		  in this window.  Otherwise we have to reposition it.  */
	       && XINT (w->top) <= FRAME_CURSOR_Y (selected_frame)
	       && (XINT (w->top) + XINT (w->height)
		   > FRAME_CURSOR_Y (selected_frame)))
Jim Blandy's avatar
Jim Blandy committed
993 994 995 996 997 998 999 1000
	{
	  if (!must_finish)
	    {
	      do_pending_window_change ();
	      return;
	    }
	  goto update;
	}
1001 1002
      /* If highlighting the region, or if the cursor is in the echo area,
	 then we can't just move the cursor.  */
1003 1004
      else if (! (!NILP (Vtransient_mark_mode)
		  && !NILP (current_buffer->mark_active))
1005 1006
	       && NILP (w->region_showing)
	       && !cursor_in_echo_area)
Jim Blandy's avatar
Jim Blandy committed
1007 1008 1009
	{
	  pos = *compute_motion (tlbufpos, 0,
				 XINT (w->hscroll) ? 1 - XINT (w->hscroll) : 0,
Karl Heuer's avatar
Karl Heuer committed
1010
				 0,
1011
				 PT, 2, - (1 << (BITS_PER_SHORT - 1)),
1012
				 window_internal_width (w) - 1,
Jim Blandy's avatar
Jim Blandy committed
1013
				 XINT (w->hscroll),
1014
				 pos_tab_offset (w, tlbufpos), w);
Jim Blandy's avatar
Jim Blandy committed
1015 1016
	  if (pos.vpos < 1)
	    {
Karl Heuer's avatar
Karl Heuer committed
1017
	      int width = window_internal_width (w) - 1;
Jim Blandy's avatar
Jim Blandy committed
1018
	      FRAME_CURSOR_X (selected_frame)
Karl Heuer's avatar
Karl Heuer committed
1019
		= XFASTINT (w->left) + minmax (0, pos.hpos, width);
Jim Blandy's avatar
Jim Blandy committed
1020
	      FRAME_CURSOR_Y (selected_frame) = this_line_vpos;
Jim Blandy's avatar
Jim Blandy committed
1021 1022 1023 1024 1025 1026 1027
	      goto update;
	    }
	  else
	    goto cancel;
	}
    cancel:
      /* Text changed drastically or point moved off of line */
Jim Blandy's avatar
Jim Blandy committed
1028
      cancel_line (this_line_vpos, selected_frame);
Jim Blandy's avatar
Jim Blandy committed
1029 1030 1031 1032 1033
    }

  this_line_bufpos = 0;
  all_windows |= buffer_shared > 1;

1034 1035
  clear_face_cache_count++;

Jim Blandy's avatar
Jim Blandy committed
1036 1037
  if (all_windows)
    {
1038
      Lisp_Object tail, frame;
Jim Blandy's avatar
Jim Blandy committed
1039

Morten Welinder's avatar
Morten Welinder committed
1040
#ifdef HAVE_FACES
1041 1042 1043 1044 1045 1046 1047
      /* Clear the face cache, only when we do a full redisplay
	 and not too often either.  */
      if (clear_face_cache_count > 1000)
	{
	  clear_face_cache ();
	  clear_face_cache_count = 0;
	}
1048 1049
#endif

Jim Blandy's avatar
Jim Blandy committed
1050
      /* Recompute # windows showing selected buffer.
Jim Blandy's avatar
Jim Blandy committed
1051
	 This will be incremented each time such a window is displayed.  */
Jim Blandy's avatar
Jim Blandy committed
1052 1053
      buffer_shared = 0;

1054
      FOR_EACH_FRAME (tail, frame)
1055
	{
1056
	  FRAME_PTR f = XFRAME (frame);
1057 1058
	  if (! FRAME_TERMCAP_P (f) || f == selected_frame)
	    {
1059

1060 1061 1062 1063
	      /* Mark all the scroll bars to be removed; we'll redeem the ones
		 we want when we redisplay their windows.  */
	      if (condemn_scroll_bars_hook)
		(*condemn_scroll_bars_hook) (f);
1064

1065 1066
	      if (FRAME_VISIBLE_P (f))
		redisplay_windows (FRAME_ROOT_WINDOW (f));
1067

1068 1069 1070 1071 1072
	      /* Any scroll bars which redisplay_windows should have nuked
		 should now go away.  */
	      if (judge_scroll_bars_hook)
		(*judge_scroll_bars_hook) (f);
	    }
1073
	}
Jim Blandy's avatar
Jim Blandy committed
1074
    }
Jim Blandy's avatar
Jim Blandy committed
1075
  else if (FRAME_VISIBLE_P (selected_frame))
Jim Blandy's avatar
Jim Blandy committed
1076 1077
    {
      redisplay_window (selected_window, 1);
Jim Blandy's avatar
Jim Blandy committed
1078
      if (XFASTINT (w->width) != FRAME_WIDTH (selected_frame))
Jim Blandy's avatar
Jim Blandy committed
1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089
	preserve_other_columns (w);
    }

update: 
  /* Prevent various kinds of signals during display update.
     stdio is not robust about handling signals,
     which can cause an apparent I/O error.  */
  if (interrupt_input)
    unrequest_sigio ();
  stop_polling ();

Jim Blandy's avatar
Jim Blandy committed
1090
#ifdef MULTI_FRAME
Jim Blandy's avatar
Jim Blandy committed
1091 1092 1093 1094 1095 1096
  if (all_windows)
    {
      Lisp_Object tail;

      pause = 0;

Jim Blandy's avatar
Jim Blandy committed
1097
      for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
Jim Blandy's avatar
Jim Blandy committed
1098
	{
Jim Blandy's avatar
Jim Blandy committed
1099
	  FRAME_PTR f;
Jim Blandy's avatar
Jim Blandy committed
1100

1101
	  if (!FRAMEP (XCONS (tail)->car))
Jim Blandy's avatar
Jim Blandy committed
1102 1103
	    continue;

Jim Blandy's avatar
Jim Blandy committed
1104
	  f = XFRAME (XCONS (tail)->car);
1105 1106 1107

	  if ((! FRAME_TERMCAP_P (f) || f == selected_frame)
	      && FRAME_VISIBLE_P (f))
Jim Blandy's avatar
Jim Blandy committed
1108
	    {
Jim Blandy's avatar
Jim Blandy committed
1109
	      pause |= update_frame (f, 0, 0);
Jim Blandy's avatar
Jim Blandy committed
1110
	      if (!pause)
1111 1112 1113 1114 1115
		{
		  mark_window_display_accurate (f->root_window, 1);
		  if (frame_up_to_date_hook != 0)
		    (*frame_up_to_date_hook) (f);
		}
Jim Blandy's avatar
Jim Blandy committed
1116 1117 1118 1119
	    }
	}
    }
  else
Jim Blandy's avatar
Jim Blandy committed
1120
#endif /* MULTI_FRAME */
Jim Blandy's avatar
Jim Blandy committed
1121
    {
Jim Blandy's avatar
Jim Blandy committed
1122 1123
      if (FRAME_VISIBLE_P (selected_frame))
	pause = update_frame (selected_frame, 0, 0);
1124 1125
      else
	pause = 0;
1126

Jim Blandy's avatar
Jim Blandy committed
1127
      /* We may have called echo_area_display at the top of this
Jim Blandy's avatar
Jim Blandy committed
1128 1129 1130
	 function.  If the echo area is on another frame, that may
	 have put text on a frame other than the selected one, so the
	 above call to update_frame would not have caught it.  Catch
Jim Blandy's avatar
Jim Blandy committed
1131 1132
	 it here.  */
      {
1133 1134 1135 1136 1137
	Lisp_Object mini_window;
	FRAME_PTR mini_frame;

	mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
	mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
Jim Blandy's avatar
Jim Blandy committed
1138
	
1139 1140
	if (mini_frame != selected_frame
	    && ! FRAME_TERMCAP_P (mini_frame))
Jim Blandy's avatar
Jim Blandy committed
1141
	  pause |= update_frame (mini_f