comparison src/xdisp.c @ 89381:eaf61dbe44af

(SKIP_GLYPHS): New macro. (set_cursor_from_row): Pay attention to string display properties.

89380:9320c2f4f351

  if (displayed_buffer->display_error_modiff < BUF_MODIFF (displayed_buffer))
    redisplay_window (window, 1);
  return Qnil;
}

/* Set cursor position of W.  PT is assumed to be displayed in ROW.
   DELTA is the number of bytes by which positions recorded in ROW
   differ from current buffer positions.  */

void

     struct glyph_matrix *matrix;
     int delta, delta_bytes, dy, dvpos;
{
  struct glyph *glyph = row->glyphs[TEXT_AREA];
  struct glyph *end = glyph + row->used[TEXT_AREA];
  int x = row->x;
  int pt_old = PT - delta;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal

      {
	x += glyph->pixel_width;
	++glyph;
      }

  while (glyph < end
	 && !INTEGERP (glyph->object)
	 && (!BUFFERP (glyph->object)
	     || glyph->charpos < pt_old))
    {
      x += glyph->pixel_width;
      ++glyph;
    }

  w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
  w->cursor.x = x;
  w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;

89381:eaf61dbe44af

  if (displayed_buffer->display_error_modiff < BUF_MODIFF (displayed_buffer))
    redisplay_window (window, 1);
  return Qnil;
}


/* Increment GLYPH until it reaches END or CONDITION fails while
   adding (GLYPH)->pixel_width to X. */

#define SKIP_GLYPHS(glyph, end, x, condition)	\
  do						\
    {						\
      (x) += (glyph)->pixel_width;		\
      ++(glyph);				\
    }						\
  while ((glyph) < (end) && (condition))


/* Set cursor position of W.  PT is assumed to be displayed in ROW.
   DELTA is the number of bytes by which positions recorded in ROW
   differ from current buffer positions.  */

void

     struct glyph_matrix *matrix;
     int delta, delta_bytes, dy, dvpos;
{
  struct glyph *glyph = row->glyphs[TEXT_AREA];
  struct glyph *end = glyph + row->used[TEXT_AREA];
  /* The first glyph that starts a sequence of glyphs from string.  */
  struct glyph *string_start;
  /* The X coordinate of string_start.  */
  int string_start_x;
  /* The last known character position.  */
  int last_pos = MATRIX_ROW_START_CHARPOS (row) + delta;
  /* The last known character position before string_start.  */
  int string_before_pos;
  int x = row->x;
  int pt_old = PT - delta;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal

      {
	x += glyph->pixel_width;
	++glyph;
      }

  string_start = NULL;
  while (glyph < end
	 && !INTEGERP (glyph->object)
	 && (!BUFFERP (glyph->object)
	     || (last_pos = glyph->charpos) < pt_old))
    {
      if (! STRINGP (glyph->object))
	{
	  string_start = NULL;
	  x += glyph->pixel_width;
	  ++glyph;
	}
      else
	{
	  string_before_pos = last_pos;
	  string_start = glyph;
	  string_start_x = x;
	  /* Skip all glyphs from string.  */
	  SKIP_GLYPHS (glyph, end, x, STRINGP (glyph->object));
	}
    }

  if (string_start
      && (glyph == end || !BUFFERP (glyph->object) || last_pos > pt_old))
    {
      /* We may have skipped over point because the previous glyphs
	 are from string.  As there's no easy way to know the
	 character position of the current glyph, find the correct
	 glyph on point by scanning from string_start again.  */
      Lisp_Object limit;
      Lisp_Object string;
      int pos;

      limit = make_number (pt_old + 1);
      end = glyph;
      glyph = string_start;
      x = string_start_x;
      string = glyph->object;
      pos = string_buffer_position (w, string, string_before_pos);
      /* If STRING is from overlay, LAST_POS == 0.  We skip such glyphs
	 because we always put cursor after overlay strings.  */
      while (pos == 0 && glyph < end)
	{
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	  if (glyph < end)
	    pos = string_buffer_position (w, glyph->object, string_before_pos);
	}

      while (glyph < end)
	{
	  pos = XINT (Fnext_single_char_property_change
		      (make_number (pos), Qdisplay, Qnil, limit));
	  if (pos > pt_old)
	    break;
	  /* Skip glyphs from the same string.  */
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	  /* Skip glyphs from an overlay.  */
	  while (glyph < end
		 && ! string_buffer_position (w, glyph->object, pos))
	    {
	      string = glyph->object;
	      SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	    }
	}
    }

  w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
  w->cursor.x = x;
  w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;