emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 79337:c81a71ff50d9

(handle_face_prop): Test for strings that came from overlays, not just for after-strings and before-strings. Call face_for_overlay_string and pass the overlay to it. (handle_display_prop): Determine whether property came from an overlay. Pass OVERLAY arg to handle_single_display_spec. (handle_single_display_spec): New arg OVERLAY sets it->from_overlay. (load_overlay_strings): Fill in it->string_overlays. (get_overlay_strings_1, push_it, pop_it): Handle it->from_overlays.

author	Richard M. Stallman <rms@gnu.org>
date	Sun, 04 Nov 2007 07:42:21 +0000
parents	6afb61db1b95
children	998a04e48f58

comparison

equal deleted inserted replaced

-:6c386e3cec2a
+:c81a71ff50d9
 static void compute_string_pos P_ ((struct text_pos *, struct text_pos,
 				    Lisp_Object));
 static int face_before_or_after_it_pos P_ ((struct it *, int));
 static int next_overlay_change P_ ((int));
 static int handle_single_display_spec P_ ((struct it *, Lisp_Object,
-					   Lisp_Object, struct text_pos *,
+					   Lisp_Object, Lisp_Object,
-					   int));
+					   struct text_pos *, int));
 static int underlying_face_id P_ ((struct it *));
 static int in_ellipses_for_invisible_text_p P_ ((struct display_pos *,
 						 struct window *));
 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1)
 	}
 }
 else
 {
 int base_face_id, bufpos;
+int i;
-if (it->current.overlay_string_index >= 0)
+Lisp_Object from_overlay
+	= (it->current.overlay_string_index >= 0
+	   ? it->string_overlays[it->current.overlay_string_index]
+	   : from_overlay);
+/* See we got to this string directly or indirectly from
+	 an overlay property.  That includes the before-string or
+	 after-string of an overlay, strings in display properties
+	 provided by an overlay, their text properties, etc.
+	 FROM_OVERLAY is the overlay that brought us here, or nil if none.  */
+if (! NILP (from_overlay))
+	for (i = it->sp - 1; i >= 0; i--)
+	  {
+	    if (it->stack[i].current.overlay_string_index >= 0)
+	      from_overlay
+		= it->string_overlays[it->stack[i].current.overlay_string_index];
+	    else if (! NILP (it->stack[i].from_overlay))
+	      from_overlay = it->stack[i].from_overlay;
+	    if (!NILP (from_overlay))
+	      break;
+	  }
+if (! NILP (from_overlay))
 	{
 	  bufpos = IT_CHARPOS (*it);
-	  /* For an overlay face, the base face depends
+	  /* For a string from an overlay, the base face depends
 	     only on text properties and ignores overlays.  */
 	  base_face_id
-	    = face_at_buffer_position_no_overlays (it->w,
+	    = face_for_overlay_string (it->w,
-						   IT_CHARPOS (*it),
+				       IT_CHARPOS (*it),
-						   it->region_beg_charpos,
+				       it->region_beg_charpos,
-						   it->region_end_charpos,
+				       it->region_end_charpos,
-						   &next_stop,
+				       &next_stop,
-						   (IT_CHARPOS (*it)
+				       (IT_CHARPOS (*it)
-						    + TEXT_PROP_DISTANCE_LIMIT),
+					+ TEXT_PROP_DISTANCE_LIMIT),
-						   0);
+				       0,
+				       from_overlay);
 	}
 else
 	{
 	  bufpos = 0;
 static enum prop_handled
 handle_display_prop (it)
 struct it *it;
 {
-Lisp_Object prop, object;
+Lisp_Object prop, object, overlay;
 struct text_pos *position;
 /* Nonzero if some property replaces the display of the text itself.  */
 int display_replaced_p = 0;
 if (STRINGP (it->string))
 values that have a string `display' property, that have a string
 `display' property etc.  */
 if (!it->string_from_display_prop_p)
 it->area = TEXT_AREA;
-prop = Fget_char_property (make_number (position->charpos),
+prop = get_char_property_and_overlay (make_number (position->charpos),
-			     Qdisplay, object);
+					Qdisplay, object, &overlay);
 if (NILP (prop))
 return HANDLED_NORMALLY;
+/* Now OVERLAY is the overlay that gave us this property, or nil
+if it was a text property.  */
 if (!STRINGP (it->string))
 object = it->w->buffer;
 if (CONSP (prop)
 && !EQ (XCAR (prop), Qright_fringe)
 && !NILP (XCAR (prop)))
 {
 for (; CONSP (prop); prop = XCDR (prop))
 	{
-	  if (handle_single_display_spec (it, XCAR (prop), object,
+	  if (handle_single_display_spec (it, XCAR (prop), object, overlay,
 					  position, display_replaced_p))
 	    {
 	      display_replaced_p = 1;
 	      /* If some text in a string is replaced, `position' no
 		 longer points to the position of `object'.  */
 }
 else if (VECTORP (prop))
 {
 int i;
 for (i = 0; i < ASIZE (prop); ++i)
-	if (handle_single_display_spec (it, AREF (prop, i), object,
+	if (handle_single_display_spec (it, AREF (prop, i), object, overlay,
 					position, display_replaced_p))
 	  {
 	    display_replaced_p = 1;
 	    /* If some text in a string is replaced, `position' no
 	       longer points to the position of `object'.  */
 	      break;
 	  }
 }
 else
 {
-int ret = handle_single_display_spec (it, prop, object, position, 0);
+int ret = handle_single_display_spec (it, prop, object, overlay,
+					    position, 0);
 if (ret < 0)  /* Replaced by "", i.e. nothing. */
 	return HANDLED_RECOMPUTE_PROPS;
 if (ret)
 	display_replaced_p = 1;
 }
 is the position at which it was found.  DISPLAY_REPLACED_P non-zero
 means that we previously saw a display specification which already
 replaced text display with something else, for example an image;
 we ignore such properties after the first one has been processed.
+OVERLAY is the overlay this `display' property came from,
+or nil if it was a text property.
 If PROP is a `space' or `image' specification, and in some other
 cases too, set *POSITION to the position where the `display'
 property ends.
 Value is non-zero if something was found which replaces the display
 of buffer or string text.  Specifically, the value is -1 if that
 "something" is "nothing". */
 static int
-handle_single_display_spec (it, spec, object, position,
+handle_single_display_spec (it, spec, object, overlay, position,
 			    display_replaced_before_p)
 struct it *it;
 Lisp_Object spec;
 Lisp_Object object;
+Lisp_Object overlay;
 struct text_pos *position;
 int display_replaced_before_p;
 {
 Lisp_Object form;
 Lisp_Object location, value;
 	}
 return 0;
 }
-/* Handle `(space_width WIDTH)'.  */
+/* Handle `(space-width WIDTH)'.  */
 if (CONSP (spec)
 && EQ (XCAR (spec), Qspace_width)
 && CONSP (XCDR (spec)))
 {
 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
 it->what = IT_IMAGE;
 it->image_id = -1; /* no image */
 it->position = start_pos;
 it->object = NILP (object) ? it->w->buffer : object;
 it->method = GET_FROM_IMAGE;
+it->from_overlay = Qnil;
 it->face_id = face_id;
 /* Say that we haven't consumed the characters with
 	 `display' property yet.  The call to pop_it in
 	 set_iterator_to_next will clean this up.  */
 	 when we are finished with the glyph property value.  */
 save_pos = it->position;
 it->position = *position;
 push_it (it);
 it->position = save_pos;
+it->from_overlay = overlay;
 if (NILP (location))
 	it->area = TEXT_AREA;
 else if (EQ (location, Qleft_margin))
 	it->area = LEFT_MARGIN_AREA;
 that have already been consumed by IT.  Copy some of the
 remaining overlay strings to IT->overlay_strings.  */
 i = 0;
 j = it->current.overlay_string_index;
 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
-it->overlay_strings[i++] = entries[j++].string;
+{
+it->overlay_strings[i++] = entries[j++].string;
+it->string_overlays[i++] = entries[j++].overlay;
+}
 CHECK_IT (it);
 }
 /* Set up IT to deliver display elements from the first overlay
 	 string.  */
 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
 it->string = it->overlay_strings[0];
+it->from_overlay = Qnil;
 it->stop_charpos = 0;
 xassert (STRINGP (it->string));
 it->end_charpos = SCHARS (it->string);
 it->multibyte_p = STRING_MULTIBYTE (it->string);
 it->method = GET_FROM_STRING;
 p->stop_charpos = it->stop_charpos;
 xassert (it->face_id >= 0);
 p->face_id = it->face_id;
 p->string = it->string;
 p->method = it->method;
+p->from_overlay = it->from_overlay;
 switch (p->method)
 {
 case GET_FROM_IMAGE:
 p->u.image.object = it->object;
 p->u.image.image_id = it->image_id;
 it->stop_charpos = p->stop_charpos;
 it->face_id = p->face_id;
 it->current = p->current;
 it->position = p->position;
 it->string = p->string;
+it->from_overlay = p->from_overlay;
 if (NILP (it->string))
 SET_TEXT_POS (it->current.string_pos, -1, -1);
 it->method = p->method;
 switch (it->method)
 {

Mercurial > emacs

comparison src/xdisp.c @ 79337:c81a71ff50d9