comparison src/xdisp.c @ 27000:d7f15cd9c4ad

All codes adjusted for the change of struct glyph.

26999:5d0057e6170e

		       "  %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
		       glyph - row->glyphs[TEXT_AREA],
		       'C',
		       glyph->charpos,
		       glyph->pixel_width,
		       glyph->u.ch.code,
		       (glyph->u.ch.code < 0x80 && glyph->u.ch.code >= ' '
			? glyph->u.ch.code
			: '.'),
		       glyph->u.ch.face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  else if (glyph->type == STRETCH_GLYPH)
	    {

		       'S',
		       glyph->charpos,
		       glyph->pixel_width,
		       0,
		       '.',
		       glyph->u.stretch.face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  else if (glyph->type == IMAGE_GLYPH)
	    {

		       "  %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
		       glyph - row->glyphs[TEXT_AREA],
		       'I',
		       glyph->charpos,
		       glyph->pixel_width,
		       glyph->u.img.id,
		       '.',
		       glyph->u.img.face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  ++glyph;
	}

  row->hash = 0;
  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
    for (i = 0; i < row->used[area]; ++i)
      row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
		   + row->glyphs[area][i].u.val
		   + (row->glyphs[area][i].type << 2));

  it->max_ascent = it->max_descent = 0;
  it->max_phys_ascent = it->max_phys_descent = 0;
}

      /* If the row is empty, add a space with the current face of IT,
	 so that we know which face to draw.  */
      if (it->glyph_row->used[TEXT_AREA] == 0)
	{
	  it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
	  it->glyph_row->glyphs[TEXT_AREA][0].u.ch.face_id = it->face_id;
	  it->glyph_row->used[TEXT_AREA] = 1;
	}
    }
  else
    {

      struct glyph *glyph = start + used - 1;

      /* Skip over the space glyph inserted to display the
	 cursor at the end of a line.  */
      if (glyph->type == CHAR_GLYPH
	  && glyph->u.ch.code == ' '
	  && glyph->object == 0)
	--glyph;

      /* If last glyph is a space or stretch, and it's trailing
	 whitespace, set the face of all trailing whitespace glyphs in
	 IT->glyph_row to `trailing-whitespace'.  */
      if (glyph >= start
	  && BUFFERP (glyph->object)
	  && (glyph->type == STRETCH_GLYPH
	      || (glyph->type == CHAR_GLYPH
		  && glyph->u.ch.code == ' '))
	  && trailing_whitespace_p (glyph->charpos))
	{
	  int face_id = lookup_named_face (f, Qtrailing_whitespace,
					   CHARSET_ASCII);
	  
	  while (glyph >= start
		 && BUFFERP (glyph->object)
		 && (glyph->type == STRETCH_GLYPH
		     || (glyph->type == CHAR_GLYPH
			 && glyph->u.ch.code == ' ')))
	    {
	      if (glyph->type == STRETCH_GLYPH)
		glyph->u.stretch.face_id = face_id;
	      else
		glyph->u.ch.face_id = face_id;
	      --glyph;
	    }
	}
    }
}

27000:d7f15cd9c4ad

		       "  %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
		       glyph - row->glyphs[TEXT_AREA],
		       'C',
		       glyph->charpos,
		       glyph->pixel_width,
		       glyph->u.ch,
		       (glyph->u.ch < 0x80 && glyph->u.ch >= ' '
			? glyph->u.ch
			: '.'),
		       glyph->face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  else if (glyph->type == STRETCH_GLYPH)
	    {

		       'S',
		       glyph->charpos,
		       glyph->pixel_width,
		       0,
		       '.',
		       glyph->u.face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  else if (glyph->type == IMAGE_GLYPH)
	    {

		       "  %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
		       glyph - row->glyphs[TEXT_AREA],
		       'I',
		       glyph->charpos,
		       glyph->pixel_width,
		       glyph->u.img_id,
		       '.',
		       glyph->u.face_id,
		       glyph->left_box_line_p,
		       glyph->right_box_line_p);
	    }
	  ++glyph;
	}

  row->hash = 0;
  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
    for (i = 0; i < row->used[area]; ++i)
      row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
		   + row->glyphs[area][i].u.val
		   + row->glyphs[area][i].face_id
		   + row->glyphs[area][i].padding_p
		   + (row->glyphs[area][i].type << 2));

  it->max_ascent = it->max_descent = 0;
  it->max_phys_ascent = it->max_phys_descent = 0;
}

      /* If the row is empty, add a space with the current face of IT,
	 so that we know which face to draw.  */
      if (it->glyph_row->used[TEXT_AREA] == 0)
	{
	  it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
	  it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id;
	  it->glyph_row->used[TEXT_AREA] = 1;
	}
    }
  else
    {

      struct glyph *glyph = start + used - 1;

      /* Skip over the space glyph inserted to display the
	 cursor at the end of a line.  */
      if (glyph->type == CHAR_GLYPH
	  && glyph->u.ch == ' '
	  && glyph->object == 0)
	--glyph;

      /* If last glyph is a space or stretch, and it's trailing
	 whitespace, set the face of all trailing whitespace glyphs in
	 IT->glyph_row to `trailing-whitespace'.  */
      if (glyph >= start
	  && BUFFERP (glyph->object)
	  && (glyph->type == STRETCH_GLYPH
	      || (glyph->type == CHAR_GLYPH
		  && glyph->u.ch == ' '))
	  && trailing_whitespace_p (glyph->charpos))
	{
	  int face_id = lookup_named_face (f, Qtrailing_whitespace,
					   CHARSET_ASCII);
	  
	  while (glyph >= start
		 && BUFFERP (glyph->object)
		 && (glyph->type == STRETCH_GLYPH
		     || (glyph->type == CHAR_GLYPH
			 && glyph->u.ch == ' ')))
	    (glyph--)->face_id = face_id;
	}
    }
}