emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 36285:df398b248a30

(handle_single_display_prop): Add parameter DISPLAY_REPLACED_BEFORE_P. If it is non-zero ignore display properties which replace the display of text with something else. (handle_display_prop): Call handle_single_display_prop with additional argument saying if we already replaced text display with something else. Use AREF. (with_echo_area_buffer_unwind_data, display_menu_bar) (decode_mode_spec_coding): Use AREF and ASIZE.

author	Gerd Moellmann <gerd@gnu.org>
date	Thu, 22 Feb 2001 13:25:41 +0000
parents	54f26d21b7a7
children	ce84015c0c41

comparison

equal deleted inserted replaced

-:57b4ef5b9089
+:df398b248a30
 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_prop P_ ((struct it *, Lisp_Object,
-					   Lisp_Object, struct text_pos *));
+					   Lisp_Object, struct text_pos *,
+					   int));
 static int underlying_face_id P_ ((struct it *));
 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1)
 #define face_after_it_pos(IT)  face_before_or_after_it_pos ((IT), 0)
 handle_display_prop (it)
 struct it *it;
 {
 Lisp_Object prop, object;
 struct text_pos *position;
-int space_or_image_found_p;
+int display_replaced_p = 0;
 if (STRINGP (it->string))
 {
 object = it->string;
 position = &it->current.string_pos;
 prop = Fget_char_property (make_number (position->charpos),
 			     Qdisplay, object);
 if (NILP (prop))
 return HANDLED_NORMALLY;
-space_or_image_found_p = 0;
 if (CONSP (prop)
 && CONSP (XCAR (prop))
 && !EQ (Qmargin, XCAR (XCAR (prop))))
 {
 /* A list of sub-properties.  */
-while (CONSP (prop))
+for (; CONSP (prop); prop = XCDR (prop))
 	{
-	  if (handle_single_display_prop (it, XCAR (prop), object, position))
+	  if (handle_single_display_prop (it, XCAR (prop), object,
-	    space_or_image_found_p = 1;
+					  position, display_replaced_p))
-	  prop = XCDR (prop);
+	    display_replaced_p = 1;
 	}
 }
 else if (VECTORP (prop))
 {
 int i;
-for (i = 0; i < XVECTOR (prop)->size; ++i)
+for (i = 0; i < ASIZE (prop); ++i)
-	if (handle_single_display_prop (it, XVECTOR (prop)->contents[i],
+	if (handle_single_display_prop (it, AREF (prop, i), object,
-					object, position))
+					position, display_replaced_p))
-	  space_or_image_found_p = 1;
+	  display_replaced_p = 1;
 }
 else
 {
-if (handle_single_display_prop (it, prop, object, position))
+if (handle_single_display_prop (it, prop, object, position, 0))
-	space_or_image_found_p = 1;
+	display_replaced_p = 1;
 }
-return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
+return display_replaced_p ? HANDLED_RETURN : HANDLED_NORMALLY;
 }
 /* Value is the position of the end of the `display' property starting
 at START_POS in OBJECT.  */
 }
 /* Set up IT from a single `display' sub-property value PROP.  OBJECT
 is the object in which the `display' property was found.  *POSITION
-is the position at which it was found.
+is the position at which it was found.  DISPLAY_REPLACED_P non-zero
+means that we previously saw a display sub-property which already
+replaced text display with something else, for example an image;
+ignore such properties after the first one has been processed.
 If PROP is a `space' or `image' sub-property, set *POSITION to the
 end position of the `display' property.
-Value is non-zero if a `space' or `image' property value was found.  */
+Value is non-zero something was found which replaces the display
+of buffer or string text.  */
 static int
-handle_single_display_prop (it, prop, object, position)
+handle_single_display_prop (it, prop, object, position,
+			    display_replaced_before_p)
 struct it *it;
 Lisp_Object prop;
 Lisp_Object object;
 struct text_pos *position;
+int display_replaced_before_p;
 {
 Lisp_Object value;
-int space_or_image_found_p = 0;
+int replaces_text_display_p = 0;
 Lisp_Object form;
 /* If PROP is a list of the form `(when FORM . VALUE)', FORM is
 evaluated.  If the result is nil, VALUE is ignored. */
 form = Qt;
 #endif /* not HAVE_WINDOW_SYSTEM */
 if ((EQ (location, Qleft_margin)
 	   || EQ (location, Qright_margin)
 	   || NILP (location))
-	  && valid_p)
+	  && valid_p
-	{
+	  && !display_replaced_before_p)
-	  space_or_image_found_p = 1;
+	{
+	  replaces_text_display_p = 1;
 	  /* Save current settings of IT so that we can restore them
 	     when we are finished with the glyph property value.  */
 	  push_it (it);
 	/* Invalid property or property not supported.  Restore
 	   the position to what it was before.  */
 	*position = start_pos;
 }
-return space_or_image_found_p;
+return replaces_text_display_p;
 }
 /* Check if PROP is a display sub-property value whose text should be
 treated as intangible.  */
 }
 else if (VECTORP (prop))
 {
 /* A vector of sub-properties.  */
 int i;
-for (i = 0; i < XVECTOR (prop)->size; ++i)
+for (i = 0; i < ASIZE (prop); ++i)
-	if (single_display_prop_intangible_p (XVECTOR (prop)->contents[i]))
+	if (single_display_prop_intangible_p (AREF (prop, i)))
 	  return 1;
 }
 else
 return single_display_prop_intangible_p (prop);
 Vwith_echo_area_save_vector = Qnil;
 if (NILP (vector))
 vector = Fmake_vector (make_number (7), Qnil);
-XSETBUFFER (XVECTOR (vector)->contents[i], current_buffer); ++i;
+XSETBUFFER (AREF (vector, i), current_buffer); ++i;
-XVECTOR (vector)->contents[i++] = Vdeactivate_mark;
+AREF (vector, i) = Vdeactivate_mark, ++i;
-XVECTOR (vector)->contents[i++] = make_number (windows_or_buffers_changed);
+AREF (vector, i) = make_number (windows_or_buffers_changed), ++i;
 if (w)
 {
-XSETWINDOW (XVECTOR (vector)->contents[i], w); ++i;
+XSETWINDOW (AREF (vector, i), w); ++i;
-XVECTOR (vector)->contents[i++] = w->buffer;
+AREF (vector, i) = w->buffer; ++i;
-XVECTOR (vector)->contents[i++]
+AREF (vector, i) = make_number (XMARKER (w->pointm)->charpos); ++i;
-	= make_number (XMARKER (w->pointm)->charpos);
+AREF (vector, i) = make_number (XMARKER (w->pointm)->bytepos); ++i;
-XVECTOR (vector)->contents[i++]
-	= make_number (XMARKER (w->pointm)->bytepos);
 }
 else
 {
 int end = i + 4;
-while (i < end)
+for (; i < end; ++i)
-	XVECTOR (vector)->contents[i++] = Qnil;
+	AREF (vector, i) = Qnil;
 }
-xassert (i == XVECTOR (vector)->size);
+xassert (i == ASIZE (vector));
 return vector;
 }
 /* Restore global state from VECTOR which was created by
 for (i = 0; i < XVECTOR (items)->size; i += 4)
 {
 Lisp_Object string;
 /* Stop at nil string.  */
-string = XVECTOR (items)->contents[i + 1];
+string = AREF (items, i + 1);
 if (NILP (string))
 	break;
 /* Remember where item was displayed.  */
-XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos);
+AREF (items, i + 3) = make_number (it.hpos);
 /* Display the item, pad with one space.  */
 if (it.current_x < it.last_visible_x)
 	display_string (NULL, string, Qnil, 0, 0, &it,
 			XSTRING (string)->size + 1, 0, 0, -1);
 Lisp_Object eolvalue;
 eolvalue = Fget (coding_system, Qeol_type);
 if (multibyte)
-	*buf++ = XFASTINT (XVECTOR (val)->contents[1]);
+	*buf++ = XFASTINT (AREF (val, 1));
 if (eol_flag)
 	{
 	  /* The EOL conversion that is normal on this system.  */

Mercurial > emacs

comparison src/xdisp.c @ 36285:df398b248a30