comparison src/xdisp.c @ 19120:1ba82399f2b1

(redisplay_internal): Count number of visible frames instead of number of frames that were redisplayed. (redisplay_window): Fix previous change.

19119:e772b77b919e

  register int pause;
  int must_finish = 0;
  int all_windows;
  register int tlbufpos, tlendpos;
  struct position pos;
  int number_of_frames_redisplayed;

  if (noninteractive)
    return;

#ifdef USE_X_TOOLKIT

     to know if their frames are visible.
     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
    Lisp_Object tail, frame;

    FOR_EACH_FRAME (tail, frame)
      {
	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));
      }

       != !NILP (w->region_showing))
      || (!NILP (w->region_showing)
	  && !EQ (w->region_showing,
		  Fmarker_position (XBUFFER (w->buffer)->mark))))
    this_line_bufpos = -1;

  /* This is in case we goto update, below.  */
  number_of_frames_redisplayed = 1;

  tlbufpos = this_line_bufpos;
  tlendpos = this_line_endpos;
  if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line)
      && !current_buffer->clip_changed

#endif

      /* Recompute # windows showing selected buffer.
	 This will be incremented each time such a window is displayed.  */
      buffer_shared = 0;
      number_of_frames_redisplayed = 0;

      FOR_EACH_FRAME (tail, frame)
	{
	  FRAME_PTR f = XFRAME (frame);
	  if (FRAME_WINDOW_P (f) || f == selected_frame)

		 we want when we redisplay their windows.  */
	      if (condemn_scroll_bars_hook)
		(*condemn_scroll_bars_hook) (f);

	      if (FRAME_VISIBLE_P (f))
		{
		  redisplay_windows (FRAME_ROOT_WINDOW (f), preserve_echo_area);
		  number_of_frames_redisplayed++;
		}

	      /* Any scroll bars which redisplay_windows should have nuked
		 should now go away.  */
	      if (judge_scroll_bars_hook)
		(*judge_scroll_bars_hook) (f);

  else if (FRAME_VISIBLE_P (selected_frame))
    {
      redisplay_window (selected_window, 1, preserve_echo_area);
      if (!WINDOW_FULL_WIDTH_P (w))
	preserve_other_columns (w);
      number_of_frames_redisplayed = 1;
    }

update: 
  /* Prevent various kinds of signals during display update.
     stdio is not robust about handling signals,

	  if (this_is_visible)
	    new_count++;
	}

      if (new_count != number_of_frames_redisplayed)
	windows_or_buffers_changed++;
    }

  /* Change frame size now if a change is pending.  */
  do_pending_window_change ();

		  && val.vpos)
		{
		  this_line_bufpos = start;
		  this_line_buffer = current_buffer;
		  this_line_vpos = cursor_vpos;
		  this_line_start_hpos = hpos;
		  this_line_endpos = Z - lastpos;
		}
	      else
		this_line_bufpos = 0;
	    }

19120:1ba82399f2b1

  register int pause;
  int must_finish = 0;
  int all_windows;
  register int tlbufpos, tlendpos;
  struct position pos;
  int number_of_visible_frames;

  if (noninteractive)
    return;

#ifdef USE_X_TOOLKIT

     to know if their frames are visible.
     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
    Lisp_Object tail, frame;

    number_of_visible_frames = 0;

    FOR_EACH_FRAME (tail, frame)
      {
	FRAME_SAMPLE_VISIBILITY (XFRAME (frame));

	number_of_visible_frames++;

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

       != !NILP (w->region_showing))
      || (!NILP (w->region_showing)
	  && !EQ (w->region_showing,
		  Fmarker_position (XBUFFER (w->buffer)->mark))))
    this_line_bufpos = -1;

  tlbufpos = this_line_bufpos;
  tlendpos = this_line_endpos;
  if (!all_windows && tlbufpos > 0 && NILP (w->update_mode_line)
      && !current_buffer->clip_changed

#endif

      /* Recompute # windows showing selected buffer.
	 This will be incremented each time such a window is displayed.  */
      buffer_shared = 0;

      FOR_EACH_FRAME (tail, frame)
	{
	  FRAME_PTR f = XFRAME (frame);
	  if (FRAME_WINDOW_P (f) || f == selected_frame)

		 we want when we redisplay their windows.  */
	      if (condemn_scroll_bars_hook)
		(*condemn_scroll_bars_hook) (f);

	      if (FRAME_VISIBLE_P (f))
		redisplay_windows (FRAME_ROOT_WINDOW (f), preserve_echo_area);

	      /* Any scroll bars which redisplay_windows should have nuked
		 should now go away.  */
	      if (judge_scroll_bars_hook)
		(*judge_scroll_bars_hook) (f);

  else if (FRAME_VISIBLE_P (selected_frame))
    {
      redisplay_window (selected_window, 1, preserve_echo_area);
      if (!WINDOW_FULL_WIDTH_P (w))
	preserve_other_columns (w);
    }

update: 
  /* Prevent various kinds of signals during display update.
     stdio is not robust about handling signals,

	  if (this_is_visible)
	    new_count++;
	}

      if (new_count != number_of_visible_frames)
	windows_or_buffers_changed++;
    }

  /* Change frame size now if a change is pending.  */
  do_pending_window_change ();

		  && val.vpos)
		{
		  this_line_bufpos = start;
		  this_line_buffer = current_buffer;
		  this_line_vpos = cursor_vpos;
		  this_line_start_hpos = hpos - WINDOW_LEFT_MARGIN (w);
		  this_line_endpos = Z - lastpos;
		}
	      else
		this_line_bufpos = 0;
	    }