comparison src/xdisp.c @ 56894:8beec197715e

(set_cursor_from_row): Look for non-nil `cursor' property in overlay or text-property strings; set cursor on corresponding glyph rather than at end of the string.

56893:b3e23208cc2a

Lisp_Object Qmargin, Qpointer;
Lisp_Object Qline_height, Qtotal;
extern Lisp_Object Qheight;
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;

/* Non-nil means highlight trailing whitespace.  */

Lisp_Object Vshow_trailing_whitespace;

     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
     frames.  */

	{
	  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.  */

56894:8beec197715e

Lisp_Object Qmargin, Qpointer;
Lisp_Object Qline_height, Qtotal;
extern Lisp_Object Qheight;
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;
extern Lisp_Object Qcursor;

/* Non-nil means highlight trailing whitespace.  */

Lisp_Object Vshow_trailing_whitespace;

     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];
  struct glyph *cursor = NULL;
  /* 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 cursor_x = 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
     frames.  */

	{
	  string_before_pos = last_pos;
	  string_start = glyph;
	  string_start_x = x;
	  /* Skip all glyphs from string.  */
	  do
	    {
	      if ((cursor == NULL || glyph > cursor)
		  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
						Qcursor, (glyph)->object)))
		{
		  cursor = glyph;
		  cursor_x = x;
		}
	      x += glyph->pixel_width;
	      ++glyph;
	    }
	  while (glyph < end && STRINGP (glyph->object));
	}
    }

  if (cursor != NULL)
    {
      glyph = cursor;
      x = cursor_x;
    }
  else 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.  */