xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 20:859a2309aef8 r19-15b93

Import from CVS: tag r19-15b93

author	cvs
date	Mon, 13 Aug 2007 08:50:05 +0200
parents	0293115a14e9
children	ec9a17fef872

comparison

equal deleted inserted replaced

-:ac1f612d5250
+:859a2309aef8
 			   add_emchar_rune(). */
 Lisp_Object last_charset; /* The charset of the previous character.
 			       Used to optimize some lookups -- we
 			       only have to do some things when
 			       the charset changes. */
+face_index last_findex;   /* The face index of the previous character.
+			       Needed to ensure the validity of the
+			       last_charset optimization. */
 int last_char_width;	/* The width of the previous character. */
 int font_is_bogus;	/* If true, it means we couldn't instantiate
 			   the font for this charset, so we substitute
 			   ~'s from the ASCII charset. */
 Bytind bi_bufpos;
 width = data->blank_width;
 }
 else
 {
 Lisp_Object charset = CHAR_CHARSET (data->ch);
-if (!EQ (charset, data->last_charset))
+if (!EQ (charset, data->last_charset) ||
+	  data->findex != data->last_findex)
 	{
 	  /* OK, we need to do things the hard way. */
 	  struct window *w = XWINDOW (data->window);
 	  struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
 	  Lisp_Object font_instance =
 	    data->last_char_width = fi->width;
 	  else
 	    data->last_char_width = -1;
 	  data->new_ascent  = max (data->new_ascent,  (int) fi->ascent);
 	  data->new_descent = max (data->new_descent, (int) fi->descent);
-	  /* The following line causes display goobers and I don't know why */
+	  data->last_charset = charset;
-	  /*data->last_charset = charset;*/
+	  data->last_findex = data->findex;
 	}
 width = data->last_char_width;
 if (width < 0)
 	{
 data.dl = dl;
 data.bi_bufpos = bi_start_pos;
 data.pixpos = dl->bounds.left_in;
 data.last_charset = Qunbound;
+data.last_findex = DEFAULT_INDEX;
 data.result_str = Qnil;
 /* Set the right boundary adjusting it to take into account any end
 glyph.  Save the width of the end glyph for later use. */
 data.max_pixpos = dl->bounds.right_in;
 data.max_pixpos = dl->bounds.right_in;
 data.cursor_type = NO_CURSOR;
 data.cursor_x = -1;
 data.findex = DEFAULT_INDEX;
 data.last_charset = Qunbound;
+data.last_findex = DEFAULT_INDEX;
 data.result_str = Qnil;
 Dynarr_reset (data.db->runes);
 if (STRINGP (Voverlay_arrow_string))
 data.findex = findex;
 data.pixpos = min_pixpos;
 data.max_pixpos = max_pixpos;
 data.cursor_type = NO_CURSOR;
 data.last_charset = Qunbound;
+data.last_findex = DEFAULT_INDEX;
 data.result_str = result_str;
 data.is_modeline = 1;
 XSETWINDOW (data.window, w);
 Dynarr_reset (formatted_string_extent_dynarr);
 /*									   */
 /*                             Lisp functions                              */
 /*									   */
 /***************************************************************************/
-DEFUN ("redisplay-echo-area", Fredisplay_echo_area, Sredisplay_echo_area,
+DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
-0, 0, 0 /*
 Ensure that all minibuffers are correctly showing the echo area.
-*/ )
+*/
-()
+())
 {
 Lisp_Object devcons, concons;
 DEVICE_LOOP_NO_BREAK (devcons, concons)
 {
 {
 disable_preemption = XINT (value);
 return Qnil;
 }
-DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 0, 2, 0 /*
+DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
 Clear frame FRAME and output again what is supposed to appear on it.
 FRAME defaults to the selected frame if omitted.
 Normally, redisplay is preempted as normal if input arrives.  However,
 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
 input and is guaranteed to proceed to completion.
-*/ )
+*/
-(frame, no_preempt)
+(frame, no_preempt))
-Lisp_Object frame, no_preempt;
 {
 struct frame *f = decode_frame (frame);
 int count = specpdl_depth ();
 if (!NILP (no_preempt))
 redisplay_frame (f, 1);
 return unbind_to (count, Qnil);
 }
-DEFUN ("redisplay-frame", Fredisplay_frame, Sredisplay_frame, 0, 2, 0 /*
+DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
 Ensure that FRAME's contents are correctly displayed.
 This differs from `redraw-frame' in that it only redraws what needs to
 be updated, as opposed to unconditionally clearing and redrawing
 the frame.
 FRAME defaults to the selected frame if omitted.
 Normally, redisplay is preempted as normal if input arrives.  However,
 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
 input and is guaranteed to proceed to completion.
-*/ )
+*/
-(frame, no_preempt)
+(frame, no_preempt))
-Lisp_Object frame, no_preempt;
 {
 struct frame *f = decode_frame (frame);
 int count = specpdl_depth ();
 if (!NILP (no_preempt))
 redisplay_frame (f, 1);
 return unbind_to (count, Qnil);
 }
-DEFUN ("redraw-device", Fredraw_device, Sredraw_device, 0, 2, 0 /*
+DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
 Clear device DEVICE and output again what is supposed to appear on it.
 DEVICE defaults to the selected device if omitted.
 Normally, redisplay is preempted as normal if input arrives.  However,
 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
 input and is guaranteed to proceed to completion.
-*/ )
+*/
-(device, no_preempt)
+(device, no_preempt))
-Lisp_Object device, no_preempt;
 {
 struct device *d = decode_device (device);
 Lisp_Object frmcons;
 int count = specpdl_depth ();
 redisplay_device (d);
 return unbind_to (count, Qnil);
 }
-DEFUN ("redisplay-device", Fredisplay_device, Sredisplay_device, 0, 2, 0 /*
+DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
 Ensure that DEVICE's contents are correctly displayed.
 This differs from `redraw-device' in that it only redraws what needs to
 be updated, as opposed to unconditionally clearing and redrawing
 the device.
 DEVICE defaults to the selected device if omitted.
 Normally, redisplay is preempted as normal if input arrives.  However,
 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
 input and is guaranteed to proceed to completion.
-*/ )
+*/
-(device, no_preempt)
+(device, no_preempt))
-Lisp_Object device, no_preempt;
 {
 struct device *d = decode_device (device);
 int count = specpdl_depth ();
 if (!NILP (no_preempt))
 }
 /* Big lie.  Big lie.  This will force all modelines to be updated
 regardless if the all flag is set or not.  It remains in existence
 solely for backwards compatibility. */
-DEFUN ("redraw-modeline", Fredraw_modeline, Sredraw_modeline, 0, 1, 0 /*
+DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
 Force the modeline of the current buffer to be redisplayed.
 With optional non-nil ALL, force redisplay of all modelines.
-*/ )
+*/
-(all)
+(all))
-Lisp_Object all;
 {
 MARK_MODELINE_CHANGED;
 return Qnil;
 }
-DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay,
+DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
-Sforce_cursor_redisplay, 0, 1, 0 /*
 Force an immediate update of the cursor on FRAME.
 FRAME defaults to the selected frame if omitted.
-*/ )
+*/
-(frame)
+(frame))
-Lisp_Object frame;
 {
 redisplay_redraw_cursor (decode_frame (frame), 1);
 return Qnil;
 }
 defsymbol (&Qbar_cursor, "bar-cursor");
 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
 defsymbol (&Qredisplay_end_trigger_functions,
 	     "redisplay-end-trigger-functions");
-defsubr (&Sredisplay_echo_area);
+DEFSUBR (Fredisplay_echo_area);
-defsubr (&Sredraw_frame);
+DEFSUBR (Fredraw_frame);
-defsubr (&Sredisplay_frame);
+DEFSUBR (Fredisplay_frame);
-defsubr (&Sredraw_device);
+DEFSUBR (Fredraw_device);
-defsubr (&Sredisplay_device);
+DEFSUBR (Fredisplay_device);
-defsubr (&Sredraw_modeline);
+DEFSUBR (Fredraw_modeline);
-defsubr (&Sforce_cursor_redisplay);
+DEFSUBR (Fforce_cursor_redisplay);
 }
 void
 vars_of_redisplay (void)
 {

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 20:859a2309aef8 r19-15b93