comparison src/xdisp.c @ 29473:80835e075d87

(display_line): Set row's and iterator's starts_in_middle_of_char_p and ends_in_middle_of_char_p flags. Set cursor even if row ends in the middle of a character. (dump_glyph_row): Print values of new flags. (redisplay_window) <cursor movement in unchanged window>: When point has been moved forward, and PT is at the end of the cursor row, don't place the cursor in the next row if the cursor row ends in the middle of a character or at ZV.

29472:9c2d98569dca

      if (PT > XFASTINT (w->last_point))
	{
	  /* Point has moved forward.  */
	  int last_y = window_text_bottom_y (w) - this_scroll_margin;
	  
	  while ((MATRIX_ROW_END_CHARPOS (row) < PT
		  /* The end position of a row equals the start
		     position of the next row.  If PT is there, we
		     would rather display it in the next line, except
		     when this line ends in ZV.  */
		  || (MATRIX_ROW_END_CHARPOS (row) == PT
		      && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
			  || !row->ends_at_zv_p)))
		 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
	    {
	      xassert (row->enabled_p);
	      ++row;
	    }

  if (vpos < 0 || vpos >= matrix->nrows)
    return;

  row = MATRIX_ROW (matrix, vpos);
  
  fprintf (stderr, "Row Start   End Used oEI><O\\CTZF    X   Y   W\n");
  fprintf (stderr, "=============================================\n");
  
  fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d\n",
	   row - matrix->rows,
	   MATRIX_ROW_START_CHARPOS (row),
	   MATRIX_ROW_END_CHARPOS (row),
	   row->used[TEXT_AREA],
	   row->contains_overlapping_glyphs_p,

	   row->continued_p,
	   MATRIX_ROW_CONTINUATION_LINE_P (row),
	   row->displays_text_p,
	   row->ends_at_zv_p,
	   row->fill_line_p,
	   row->x,
	   row->y,
	   row->pixel_width);
  fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
	   row->end.overlay_string_index);

  row->y = it->current_y;
  row->start = it->current;
  row->continuation_lines_width = it->continuation_lines_width;
  row->displays_text_p = 1;

  /* Arrange the overlays nicely for our purposes.  Usually, we call
     display_line on only one line at a time, in which case this
     can't really hurt too much, or we call it on lines which appear
     one after another in the buffer, in which case all calls to

			produce_special_glyphs (it, IT_CONTINUATION);
		      row->continued_p = 1;
		      
		      it->current_x = x;
		      it->continuation_lines_width += x;
		      
		      /* Restore the height to what it was before the
			 element not fitting on the line.  */
		      it->max_ascent = ascent;
		      it->max_descent = descent;

  compute_line_metrics (it);

  /* Remember the position at which this line ends.  */
  row->end = it->current;

  /* Maybe set the cursor.  If you change this, it's probably a good
     idea to also change the code in redisplay_window for cursor
     movement in an unchanged window.  */
  if (it->w->cursor.vpos < 0
      && PT >= MATRIX_ROW_START_CHARPOS (row)
      && MATRIX_ROW_END_CHARPOS (row) >= PT
      && !(MATRIX_ROW_END_CHARPOS (row) == PT
	   && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
	       || !row->ends_at_zv_p)))
    set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);

  /* Highlight trailing whitespace.  */
  if (!NILP (Vshow_trailing_whitespace))
    highlight_trailing_whitespace (it->f, it->glyph_row);

29473:80835e075d87

      if (PT > XFASTINT (w->last_point))
	{
	  /* Point has moved forward.  */
	  int last_y = window_text_bottom_y (w) - this_scroll_margin;
	  
	  while (MATRIX_ROW_END_CHARPOS (row) < PT
		 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
	    {
	      xassert (row->enabled_p);
	      ++row;
	    }

	  /* The end position of a row equals the start position of
	     the next row.  If PT is there, we would rather display it
	     in the next line.  Exceptions are when the row ends in
	     the middle of a character, or ends in ZV.  */
	  if (MATRIX_ROW_BOTTOM_Y (row) < last_y
	      && MATRIX_ROW_END_CHARPOS (row) == PT
	      && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
	      && !row->ends_at_zv_p)
	    {
	      xassert (row->enabled_p);
	      ++row;
	    }

  if (vpos < 0 || vpos >= matrix->nrows)
    return;

  row = MATRIX_ROW (matrix, vpos);
  
  fprintf (stderr, "Row Start   End Used oEI><O\\CTZFes    X   Y   W\n");
  fprintf (stderr, "=============================================\n");
  
  fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d\n",
	   row - matrix->rows,
	   MATRIX_ROW_START_CHARPOS (row),
	   MATRIX_ROW_END_CHARPOS (row),
	   row->used[TEXT_AREA],
	   row->contains_overlapping_glyphs_p,

	   row->continued_p,
	   MATRIX_ROW_CONTINUATION_LINE_P (row),
	   row->displays_text_p,
	   row->ends_at_zv_p,
	   row->fill_line_p,
	   row->ends_in_middle_of_char_p,
	   row->starts_in_middle_of_char_p,
	   row->x,
	   row->y,
	   row->pixel_width);
  fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
	   row->end.overlay_string_index);

  row->y = it->current_y;
  row->start = it->current;
  row->continuation_lines_width = it->continuation_lines_width;
  row->displays_text_p = 1;
  row->starts_in_middle_of_char_p = it->starts_in_middle_of_char_p;
  it->starts_in_middle_of_char_p = 0;

  /* Arrange the overlays nicely for our purposes.  Usually, we call
     display_line on only one line at a time, in which case this
     can't really hurt too much, or we call it on lines which appear
     one after another in the buffer, in which case all calls to

			produce_special_glyphs (it, IT_CONTINUATION);
		      row->continued_p = 1;
		      
		      it->current_x = x;
		      it->continuation_lines_width += x;
		      if (nglyphs > 1 && i > 0)
			{
			  row->ends_in_middle_of_char_p = 1;
			  it->starts_in_middle_of_char_p = 1;
			}
		      
		      /* Restore the height to what it was before the
			 element not fitting on the line.  */
		      it->max_ascent = ascent;
		      it->max_descent = descent;

  compute_line_metrics (it);

  /* Remember the position at which this line ends.  */
  row->end = it->current;

  /* Maybe set the cursor.  We want to set the cursor on the first
     glyph having position PT.  This means it doesn't matter if the
     row is continued and ends in the middle of the character at PT.
     If some glyphs of that character are in this row, this is the
     right row to put the cursor on.  */
  if (it->w->cursor.vpos < 0
      && PT >= MATRIX_ROW_START_CHARPOS (row)
      && PT <= MATRIX_ROW_END_CHARPOS (row)
      && !(PT == ZV && !row->ends_at_zv_p))
    set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);

  /* Highlight trailing whitespace.  */
  if (!NILP (Vshow_trailing_whitespace))
    highlight_trailing_whitespace (it->f, it->glyph_row);