comparison src/xdisp.c @ 83061:bff8fa30c018

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-113 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-114 Merge some minor redisplay bug-fixes from emacs--tiling--0 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-115 Update from CVS * [e-mail]--gnu-2004/emacs--tiling--0--patch-9 Remove bogus xassert * [e-mail]--gnu-2004/emacs--tiling--0--patch-10 Avoid negative descents for images with ascent > height * [e-mail]--gnu-2004/emacs--tiling--0--patch-13 Fix iterator-inconsistency bug in redisplay git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-101

83060:70063cb10ca9

  if (it->method == next_element_from_string)
    {
      xassert (STRINGP (it->string));
      xassert (IT_STRING_CHARPOS (*it) >= 0);
    }
  else if (it->method == next_element_from_buffer)
    {
      /* Check that character and byte positions agree.  */
      xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
    }

  if (it->dpvec)
    xassert (it->current.dpvec_index >= 0);
  else

  /* Clear IT.  */
  bzero (it, sizeof *it);
  it->current.overlay_string_index = -1;
  it->current.dpvec_index = -1;
  it->base_face_id = base_face_id;

  /* The window in which we iterate over current_buffer:  */
  XSETWINDOW (it->window, w);
  it->w = w;
  it->f = XFRAME (w->frame);

	  it->voffset = - (XFLOATINT (value)
			   * (FONT_HEIGHT (face->font)));
	}
#endif /* HAVE_WINDOW_SYSTEM */
    }
  else if (CONSP (prop)
	   && (EQ (XCAR (prop), Qleft_fringe)
	       || EQ (XCAR (prop), Qright_fringe))
	   && CONSP (XCDR (prop)))
    {
      unsigned face_id = DEFAULT_FACE_ID;

      /* `(left-fringe BITMAP FACE)'.  */
      if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
	return 0;

#ifdef HAVE_WINDOW_SYSTEM
      value = XCAR (XCDR (prop));
      if (!NUMBERP (value)
	  || !valid_fringe_bitmap_id_p (XINT (value)))
	return 0;

      if (CONSP (XCDR (XCDR (prop))))
	{
	  Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
	  face_id = lookup_named_face (it->f, face_name, 'A');
	  if (face_id < 0)
	    return 0;
	}

      if (EQ (XCAR (prop), Qleft_fringe))
	{
	  it->left_user_fringe_bitmap = XINT (value);
	  it->left_user_fringe_face_id = face_id;
	}
      else
	{
	  it->right_user_fringe_bitmap = XINT (value);
	  it->right_user_fringe_face_id = face_id;
	}
#endif /* HAVE_WINDOW_SYSTEM */
    }
  else if (!it->string_from_display_prop_p)
    {
      /* `((margin left-margin) VALUE)' or `((margin right-margin)
	 VALUE) or `((margin nil) VALUE)' or VALUE.  */
      Lisp_Object location, value;

      value = Qnil;

      /* Let's stop at the new position and assume that all
	 text properties change there.  */
      it->stop_charpos = position->charpos;

      location = Qunbound;
      if (CONSP (prop) && CONSP (XCAR (prop)))
	{
	  Lisp_Object tem;

  int face_ascent, glyph_ascent;

  xassert (it->what == IT_IMAGE);

  face = FACE_FROM_ID (it->f, it->face_id);
  img = IMAGE_FROM_ID (it->f, it->image_id);
  xassert (img);

  /* Make sure X resources of the face and image are loaded.  */
  PREPARE_FACE_FOR_DISPLAY (it->f, face);
  prepare_image_for_display (it->f, img);

  it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face);
  it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent;
  it->pixel_width = img->width + 2 * img->hmargin;

  /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent.  */
  face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
  if (face_ascent > it->ascent)
    it->ascent = it->phys_ascent = face_ascent;

83061:bff8fa30c018

  if (it->method == next_element_from_string)
    {
      xassert (STRINGP (it->string));
      xassert (IT_STRING_CHARPOS (*it) >= 0);
    }
  else
    {
      xassert (IT_STRING_CHARPOS (*it) < 0);
      if (it->method == next_element_from_buffer)
	{
	  /* Check that character and byte positions agree.  */
	  xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
	}
    }

  if (it->dpvec)
    xassert (it->current.dpvec_index >= 0);
  else

  /* Clear IT.  */
  bzero (it, sizeof *it);
  it->current.overlay_string_index = -1;
  it->current.dpvec_index = -1;
  it->base_face_id = base_face_id;
  it->string = Qnil;
  IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;

  /* The window in which we iterate over current_buffer:  */
  XSETWINDOW (it->window, w);
  it->w = w;
  it->f = XFRAME (w->frame);

	  it->voffset = - (XFLOATINT (value)
			   * (FONT_HEIGHT (face->font)));
	}
#endif /* HAVE_WINDOW_SYSTEM */
    }
  else if (!it->string_from_display_prop_p)
    {
      /* `((margin left-margin) VALUE)' or `((margin right-margin)
	 VALUE) or `((margin nil) VALUE)' or VALUE.  */
      Lisp_Object location, value;

      value = Qnil;

      /* Let's stop at the new position and assume that all
	 text properties change there.  */
      it->stop_charpos = position->charpos;

      if (CONSP (prop)
	  && (EQ (XCAR (prop), Qleft_fringe)
	      || EQ (XCAR (prop), Qright_fringe))
	  && CONSP (XCDR (prop)))
	{
	  unsigned face_id = DEFAULT_FACE_ID;

	  /* Save current settings of IT so that we can restore them
	     when we are finished with the glyph property value.  */

	  /* `(left-fringe BITMAP FACE)'.  */
	  if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
	    return 0;

#ifdef HAVE_WINDOW_SYSTEM
	  value = XCAR (XCDR (prop));
	  if (!NUMBERP (value)
	      || !valid_fringe_bitmap_id_p (XINT (value)))
	    return 0;

	  if (CONSP (XCDR (XCDR (prop))))
	    {
	      Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));

	      face_id = lookup_named_face (it->f, face_name, 'A');
	      if (face_id < 0)
		return 0;
	    }

	  push_it (it);

	  it->area = TEXT_AREA;
	  it->what = IT_IMAGE;
	  it->image_id = -1; /* no image */
	  it->position = start_pos;
	  it->object = NILP (object) ? it->w->buffer : object;
	  it->method = next_element_from_image;
	  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.  */
	  *position = start_pos;

	  if (EQ (XCAR (prop), Qleft_fringe))
	    {
	      it->left_user_fringe_bitmap = XINT (value);
	      it->left_user_fringe_face_id = face_id;
	    }
	  else
	    {
	      it->right_user_fringe_bitmap = XINT (value);
	      it->right_user_fringe_face_id = face_id;
	    }
#endif /* HAVE_WINDOW_SYSTEM */
	  return 1;
	}

      location = Qunbound;
      if (CONSP (prop) && CONSP (XCAR (prop)))
	{
	  Lisp_Object tem;

  int face_ascent, glyph_ascent;

  xassert (it->what == IT_IMAGE);

  face = FACE_FROM_ID (it->f, it->face_id);
  xassert (face);
  /* Make sure X resources of the face is loaded.  */
  PREPARE_FACE_FOR_DISPLAY (it->f, face);

  if (it->image_id < 0)
    {
      /* Fringe bitmap.  */
      it->nglyphs = 0;
      return;
    }

  img = IMAGE_FROM_ID (it->f, it->image_id);
  xassert (img);
  /* Make sure X resources of the image is loaded.  */
  prepare_image_for_display (it->f, img);

  it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face);
  it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent;
  it->pixel_width = img->width + 2 * img->hmargin;

  /* It's quite possible for images to have an ascent greater than
     their height, so don't get confused in that case.  */
  if (it->descent < 0)
    it->descent = 0;

  /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent.  */
  face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
  if (face_ascent > it->ascent)
    it->ascent = it->phys_ascent = face_ascent;