comparison src/xdisp.c @ 25316:561aa7ea85a7

(unwind_redisplay): New. Resets flag redisplaying_p. (redisplay_internal): Register unwind_redisplay with register_unwind_protect. (try_window_reusing_current_matrix): If new start > old start, give up if start pos of first reusable row is not equal to new start.

25315:79bb4978ab2e


/* Function prototypes.  */

static int string_char_and_length P_ ((unsigned char *, int, int *));
static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
					     struct text_pos));
static int compute_window_start_on_continuation_line P_ ((struct window *));
static Lisp_Object eval_handler P_ ((Lisp_Object));

  struct frame *f = XFRAME (w->frame);
  int pause;
  int must_finish = 0;
  struct text_pos tlbufpos, tlendpos;
  int number_of_visible_frames;

  /* Non-zero means redisplay has to consider all windows on all
     frames.  Zero means, only selected_window is considered.  */
  int consider_all_windows_p;
  

#ifdef USE_X_TOOLKIT
  if (popup_activated ())
    return;
#endif

  if (redisplaying_p)
    return;
  ++redisplaying_p;

 retry:

  /* If new fonts have been loaded that make a glyph matrix adjustment
     necessary, do it.  */
  if (fonts_changed_p)

  if (windows_or_buffers_changed && !pause)
    goto retry;

 end_of_redisplay:;
  
  if (--redisplaying_p < 0)
    redisplaying_p = 0;
}


/* Redisplay, but leave alone any recent echo area message unless
   another message has been requested in its place.

      echo_area_glyphs = NULL;
      echo_area_message = Qnil;
    }
  else
    redisplay_internal (1);
}


/* Mark the display of windows in the window tree rooted at WINDOW as
   accurate or inaccurate.  If FLAG is non-zero mark display of WINDOW

		 < CHARPOS (new_start)))
	++first_reusable_row;

      /* Give up if there is no row to reuse.  */
      if (MATRIX_ROW_BOTTOM_Y (first_reusable_row) >= yb
	  || !first_reusable_row->enabled_p)
	return 0;

      /* The row we found must start at new_start, or else something
	 is broken.  */
      xassert (MATRIX_ROW_START_CHARPOS (first_reusable_row)
	       == CHARPOS (new_start));
      
      /* We can reuse fully visible rows beginning with
         first_reusable_row to the end of the window.  Set
         first_row_to_display to the first row that cannot be reused.
         Set pt_row to the row containing point, if there is any.  */
      first_row_to_display = first_reusable_row;

25316:561aa7ea85a7


/* Function prototypes.  */

static Lisp_Object unwind_redisplay P_ ((Lisp_Object));
static int string_char_and_length P_ ((unsigned char *, int, int *));
static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
					     struct text_pos));
static int compute_window_start_on_continuation_line P_ ((struct window *));
static Lisp_Object eval_handler P_ ((Lisp_Object));

  struct frame *f = XFRAME (w->frame);
  int pause;
  int must_finish = 0;
  struct text_pos tlbufpos, tlendpos;
  int number_of_visible_frames;
  int count;

  /* Non-zero means redisplay has to consider all windows on all
     frames.  Zero means, only selected_window is considered.  */
  int consider_all_windows_p;
  

#ifdef USE_X_TOOLKIT
  if (popup_activated ())
    return;
#endif

  /* I don't think this happens but let's be paranoid.  */
  if (redisplaying_p)
    return;

  /* Record a function that resets redisplaying_p to its old value
     when we leave this function.  */
  count = specpdl_ptr - specpdl;
  record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
  ++redisplaying_p;
  
 retry:

  /* If new fonts have been loaded that make a glyph matrix adjustment
     necessary, do it.  */
  if (fonts_changed_p)

  if (windows_or_buffers_changed && !pause)
    goto retry;

 end_of_redisplay:;
  
  unbind_to (count, Qnil);
}


/* Redisplay, but leave alone any recent echo area message unless
   another message has been requested in its place.

      echo_area_glyphs = NULL;
      echo_area_message = Qnil;
    }
  else
    redisplay_internal (1);
}


/* Function registered with record_unwind_protect in
   redisplay_internal.  Clears the flag indicating that a redisplay is
   in progress.  */

static Lisp_Object
unwind_redisplay (old_redisplaying_p)
     Lisp_Object old_redisplaying_p;
{
  redisplaying_p = XFASTINT (old_redisplaying_p);
}


/* Mark the display of windows in the window tree rooted at WINDOW as
   accurate or inaccurate.  If FLAG is non-zero mark display of WINDOW

		 < CHARPOS (new_start)))
	++first_reusable_row;

      /* Give up if there is no row to reuse.  */
      if (MATRIX_ROW_BOTTOM_Y (first_reusable_row) >= yb
	  || !first_reusable_row->enabled_p
	  || (MATRIX_ROW_START_CHARPOS (first_reusable_row)
	      != CHARPOS (new_start)))
	return 0;

      /* We can reuse fully visible rows beginning with
         first_reusable_row to the end of the window.  Set
         first_row_to_display to the first row that cannot be reused.
         Set pt_row to the row containing point, if there is any.  */
      first_row_to_display = first_reusable_row;