emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 107617:c5f9e4613394

Merge from mainline.

author	Eli Zaretskii <eliz@gnu.org>
date	Sat, 16 Jan 2010 06:57:09 -0500
parents	937f2da537a4 731b62c1f5cb
children	d615810795cd

comparison

equal deleted inserted replaced

-:fa5ad3eee9f5
+:c5f9e4613394
 /* Display generation from window structure and buffer text.
 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010
+2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 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
 static int display_line P_ ((struct it *));
 static int display_mode_lines P_ ((struct window *));
 static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object));
 static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object, Lisp_Object, int));
 static int store_mode_line_string P_ ((char *, Lisp_Object, int, int, int, Lisp_Object));
-static char *decode_mode_spec P_ ((struct window *, int, int, int, int *));
+static char *decode_mode_spec P_ ((struct window *, int, int, int,
+				   Lisp_Object *));
 static void display_menu_bar P_ ((struct window *));
 static int display_count_lines P_ ((int, int, int, int, int *));
 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object,
 			       EMACS_INT, EMACS_INT, struct it *, int, int, int, int));
 static void compute_line_metrics P_ ((struct it *));
 	 after CHARPOS.  (ii) If CHARPOS is in a display vector,
 	 move_it_to stops on its last glyph.  */
 int top_x = it.current_x;
 int top_y = it.current_y;
 enum it_method it_method = it.method;
-/* Calling line_bottom_y may change it.method.  */
+/* Calling line_bottom_y may change it.method, it.position, etc.  */
 int bottom_y = (last_height = 0, line_bottom_y (&it));
 int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
 if (top_y < window_top_y)
 	visible_p = bottom_y > window_top_y;
 	  if (it_method == GET_FROM_BUFFER)
 	    {
 	      Lisp_Object window, prop;
 	      XSETWINDOW (window, w);
-	      prop = Fget_char_property (make_number (it.position.charpos),
+	      prop = Fget_char_property (make_number (charpos),
 					 Qinvisible, window);
 	      /* If charpos coincides with invisible text covered with an
 		 ellipsis, use the first glyph of the ellipsis to compute
 		 the pixel positions.  */
 /* Use the standard display table for displaying strings.  */
 if (DISP_TABLE_P (Vstandard_display_table))
 it->dp = XCHAR_TABLE (Vstandard_display_table);
 it->stop_charpos = charpos;
+if (s == NULL && it->multibyte_p)
+composition_compute_stop_pos (&it->cmp_it, charpos, -1, it->end_charpos,
+				  it->string);
 CHECK_IT (it);
 }
 /* Return 1 iff a character at CHARPOS (and BYTEPOS) is composed
 (possibly with the following characters).  */
-#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS)				\
+#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS,END_CHARPOS)			\
 ((IT)->cmp_it.id >= 0							\
 || ((IT)->cmp_it.stop_pos == (CHARPOS)				\
 && composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS,	\
-				 (IT)->end_charpos, (IT)->w,		\
+				 END_CHARPOS, (IT)->w,			\
 				 FACE_FROM_ID ((IT)->f, (IT)->face_id),	\
 				 (IT)->string)))
 /* Load IT's display element fields with information about the next
 	{
 	  it->what = IT_EOB;
 	  return 0;
 	}
 else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-				IT_STRING_BYTEPOS (*it))
+				IT_STRING_BYTEPOS (*it), SCHARS (it->string))
 	       && next_element_from_composition (it))
 	{
 	  return 1;
 	}
 else if (STRING_MULTIBYTE (it->string))
 	  /* Pad with spaces.  */
 	  it->c = ' ', it->len = 1;
 	  CHARPOS (position) = BYTEPOS (position) = -1;
 	}
 else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-				IT_STRING_BYTEPOS (*it))
+				IT_STRING_BYTEPOS (*it), it->string_nchars)
 	       && next_element_from_composition (it))
 	{
 	  return 1;
 	}
 else if (STRING_MULTIBYTE (it->string))
 if (it->redisplay_end_trigger_charpos
 	  && it->glyph_row
 	  && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
 	run_redisplay_end_trigger_hook (it);
-if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it))
+if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it),
+			   it->end_charpos)
 	  && next_element_from_composition (it))
 	{
 	  return 1;
 	}
 		else if (c != 0)
 		  {
 		    int multibyte;
 		    int bytepos, charpos;
 		    unsigned char *spec;
+		    Lisp_Object string;
 		    bytepos = percent_position;
 		    charpos = (STRING_MULTIBYTE (elt)
 			       ? string_byte_to_char (elt, bytepos)
 			       : bytepos);
-		    spec
+		    spec = decode_mode_spec (it->w, c, field, prec, &string);
-		      = decode_mode_spec (it->w, c, field, prec, &multibyte);
+		    multibyte = STRINGP (string) && STRING_MULTIBYTE (string);
 		    switch (mode_line_target)
 		      {
 		      case MODE_LINE_NOPROP:
 		      case MODE_LINE_TITLE:
 		      case MODE_LINE_DISPLAY:
 			{
 			  int nglyphs_before, nwritten;
 			  nglyphs_before = it->glyph_row->used[TEXT_AREA];
-			  nwritten = display_string (spec, Qnil, elt,
+			  nwritten = display_string (spec, string, elt,
 						     charpos, 0, it,
 						     field, prec, 0,
 						     multibyte);
 			  /* Assign to the glyphs written above the
 }
 /* Return a string for the output of a mode line %-spec for window W,
 generated by character C.  PRECISION >= 0 means don't return a
 string longer than that value.  FIELD_WIDTH > 0 means pad the
-string returned with spaces to that value.  Return 1 in *MULTIBYTE
+string returned with spaces to that value.  Return a Lisp string in
-if the result is multibyte text.
+*STRING if the resulting string is taken from that Lisp string.
 Note we operate on the current buffer for most purposes,
 the exception being w->base_line_pos.  */
 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------";
 static char *
-decode_mode_spec (w, c, field_width, precision, multibyte)
+decode_mode_spec (w, c, field_width, precision, string)
 struct window *w;
 register int c;
 int field_width, precision;
-int *multibyte;
+Lisp_Object *string;
 {
 Lisp_Object obj;
 struct frame *f = XFRAME (WINDOW_FRAME (w));
 char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
 struct buffer *b = current_buffer;
 obj = Qnil;
-*multibyte = 0;
+*string = Qnil;
 switch (c)
 {
 case '*':
 if (!NILP (b->read_only))
 }
 }
 if (STRINGP (obj))
 {
-*multibyte = STRING_MULTIBYTE (obj);
+*string = obj;
 return (char *) SDATA (obj);
 }
 else
 return "";
 }
 ***********************************************************************/
 /* Display a NUL-terminated string, starting with index START.
 If STRING is non-null, display that C string.  Otherwise, the Lisp
-string LISP_STRING is displayed.
+string LISP_STRING is displayed.  There's a case that STRING is
+non-null and LISP_STRING is not nil.  It means STRING is a string
+data of LISP_STRING.  In that case, we display LISP_STRING while
+ignoring its text properties.
 If FACE_STRING is not nil, FACE_STRING_POS is a position in
 FACE_STRING.  Display STRING or LISP_STRING with the face at
 FACE_STRING_POS in FACE_STRING:
 int saved_face_id = it->face_id;
 struct glyph_row *row = it->glyph_row;
 /* Initialize the iterator IT for iteration over STRING beginning
 with index START.  */
-reseat_to_string (it, string, lisp_string, start,
+reseat_to_string (it, NILP (lisp_string) ? string : NULL, lisp_string, start,
 		    precision, field_width, multibyte);
+if (string && STRINGP (lisp_string))
+/* LISP_STRING is the one returned by decode_mode_spec.  We should
+ignore its text properties.  */
+it->stop_charpos = -1;
 /* If displaying STRING, set up the face of the iterator
 from LISP_STRING, if that's given.  */
 if (STRINGP (face_string))
 {

Mercurial > emacs

comparison src/xdisp.c @ 107617:c5f9e4613394