comparison src/xdisp.c @ 9572:b36d5e88cccc

*** empty log message ***

9571:b37425ecb3f0

  if (all_windows)
    {
      Lisp_Object tail, frame;

#ifdef HAVE_X_WINDOWS
      /* Clear the face cache, only when we do a full redisplay
	 and not too often either.  */
      if (clear_face_cache_count > 1000)
	{
	  clear_face_cache ();

  register Lisp_Object *fp = from;
  /* These cache the results of the last call to compute_glyph_face.  */
  int last_code = -1;
  int last_merged = 0;

#ifdef HAVE_X_WINDOWS
  if (! FRAME_TERMCAP_P (f))
    while (n--)
      {
	int glyph = (INTEGERP (*fp) ? XFASTINT (*fp) : 0);
	int facecode;

fix_glyph (f, glyph, cface)
     FRAME_PTR f;
     GLYPH glyph;
     int cface;
{
#ifdef HAVE_X_WINDOWS
  if (! FRAME_TERMCAP_P (f))
    {
      if (FAST_GLYPH_FACE (glyph) != 0)
	cface = compute_glyph_face (f, FAST_GLYPH_FACE (glyph), cface);
      glyph = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), cface);

	    }
	  if (pos >= end)
	    break;
#endif

#ifdef HAVE_X_WINDOWS
	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos >= next_face_change && FRAME_X_P (f))
	    current_face = compute_char_face (f, w, pos,

	      if (p1 - leftmargin > width)
		p1 = endp;
	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
				 (p1 - p1prev), current_face);
	    }
#ifdef HAVE_X_WINDOWS
	  /* Draw the face of the newline character as extending all the 
	     way to the end of the frame line.  */
	  if (current_face)
	    {
	      if (p1 < leftmargin)

	      if (p1 - leftmargin > width)
		p1 = endp;
	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
				 (p1 - p1prev), current_face);
	    }
#ifdef HAVE_X_WINDOWS
	  /* Draw the face of the newline character as extending all the 
	     way to the end of the frame line.  */
	  if (current_face)
	    {
	      if (p1 < leftmargin)

      int len = XSTRING (Voverlay_arrow_string)->size;
      int arrow_end;

      if (len > width)
	len = width;
#ifdef HAVE_X_WINDOWS
      if (!NULL_INTERVAL_P (XSTRING (Voverlay_arrow_string)->intervals))
	{
	  /* If the arrow string has text props, obey them when displaying.  */
	  for (i = 0; i < len; i++)
	    {

	      newface = compute_glyph_face_1 (f, face, 0);
	      leftmargin[i] = FAST_MAKE_GLYPH (c, newface);
	    }
	}
      else
#endif /* HAVE_X_WINDOWS */
	{
	  for (i = 0; i < len; i++)
	    leftmargin[i] = p[i];
	}

     (which implies that that window is split side-by-side
     and the rest of this line is mode lines of the sibling windows).  */
  if (XFASTINT (w->width) == FRAME_WIDTH (f)
      || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f))
    FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
#ifdef HAVE_X_WINDOWS
  else if (! FRAME_TERMCAP_P (f))
    {
      /* For a partial width window, explicitly set face of each glyph. */
      int i;
      GLYPH *ptr = FRAME_DESIRED_GLYPHS (f)->glyphs[vpos];

9572:b36d5e88cccc

  if (all_windows)
    {
      Lisp_Object tail, frame;

#ifdef HAVE_FACES
      /* Clear the face cache, only when we do a full redisplay
	 and not too often either.  */
      if (clear_face_cache_count > 1000)
	{
	  clear_face_cache ();

  register Lisp_Object *fp = from;
  /* These cache the results of the last call to compute_glyph_face.  */
  int last_code = -1;
  int last_merged = 0;

#ifdef HAVE_FACES
  if (! FRAME_TERMCAP_P (f))
    while (n--)
      {
	int glyph = (INTEGERP (*fp) ? XFASTINT (*fp) : 0);
	int facecode;

fix_glyph (f, glyph, cface)
     FRAME_PTR f;
     GLYPH glyph;
     int cface;
{
#ifdef HAVE_FACES
  if (! FRAME_TERMCAP_P (f))
    {
      if (FAST_GLYPH_FACE (glyph) != 0)
	cface = compute_glyph_face (f, FAST_GLYPH_FACE (glyph), cface);
      glyph = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), cface);

	    }
	  if (pos >= end)
	    break;
#endif

#ifdef HAVE_FACES
	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos >= next_face_change && FRAME_X_P (f))
	    current_face = compute_char_face (f, w, pos,

	      if (p1 - leftmargin > width)
		p1 = endp;
	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
				 (p1 - p1prev), current_face);
	    }
#ifdef HAVE_FACES
	  /* Draw the face of the newline character as extending all the 
	     way to the end of the frame line.  */
	  if (current_face)
	    {
	      if (p1 < leftmargin)

	      if (p1 - leftmargin > width)
		p1 = endp;
	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
				 (p1 - p1prev), current_face);
	    }
#ifdef HAVE_FACES
	  /* Draw the face of the newline character as extending all the 
	     way to the end of the frame line.  */
	  if (current_face)
	    {
	      if (p1 < leftmargin)

      int len = XSTRING (Voverlay_arrow_string)->size;
      int arrow_end;

      if (len > width)
	len = width;
#ifdef HAVE_FACES
      if (!NULL_INTERVAL_P (XSTRING (Voverlay_arrow_string)->intervals))
	{
	  /* If the arrow string has text props, obey them when displaying.  */
	  for (i = 0; i < len; i++)
	    {

	      newface = compute_glyph_face_1 (f, face, 0);
	      leftmargin[i] = FAST_MAKE_GLYPH (c, newface);
	    }
	}
      else
#endif /* HAVE_FACES */
	{
	  for (i = 0; i < len; i++)
	    leftmargin[i] = p[i];
	}

     (which implies that that window is split side-by-side
     and the rest of this line is mode lines of the sibling windows).  */
  if (XFASTINT (w->width) == FRAME_WIDTH (f)
      || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f))
    FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
#ifdef HAVE_FACES
  else if (! FRAME_TERMCAP_P (f))
    {
      /* For a partial width window, explicitly set face of each glyph. */
      int i;
      GLYPH *ptr = FRAME_DESIRED_GLYPHS (f)->glyphs[vpos];