comparison src/xdisp.c @ 30652:4ed1978642cb

(start_display): WHen starting display on a continuation line, clear ascent and descent members of the iterator structure; the height of the continued line does not affect the height of the continuation line. (make_cursor_line_fully_visible): Do nothing if cursor is on a line taller than the window. (redisplay_window) <forced window start>: Handle case that the middle of the window is not found in any row. (dump_glyph_row): Show more information. (compute_line_metrics): Use MATRIX_FIRST_TEXT_ROW to determine the first text line in a glyph matrix.

30651:61c2f9fcb8f6

      /* If lines are continued, this line may end in the middle of a
	 multi-glyph character (e.g. a control character displayed as
	 \003, or in the middle of an overlay string).  In this case
	 move_it_to above will not have taken us to the start of
	 the continuation line but to the end of the continued line.  */
      if (!it->truncate_lines_p && it->current_x > 0)
	{
	  if (it->current.dpvec_index >= 0
	      || it->current.overlay_string_index >= 0)
	    {
	      set_iterator_to_next (it);
	      move_it_in_display_line_to (it, -1, -1, 0);
	    }
	  it->continuation_lines_width += it->current_x;
	}
      
      it->current_y = first_y;
      it->vpos = 0;
      it->current_x = it->hpos = 0;

make_cursor_line_fully_visible (w)
     struct window *w;
{
  struct glyph_matrix *matrix;
  struct glyph_row *row;
  
  /* It's not always possible to find the cursor, e.g, when a window
     is full of overlay strings.  Don't do anything in that case.  */
  if (w->cursor.vpos < 0)
    return;
  
  matrix = w->desired_matrix;
  row = MATRIX_ROW (matrix, w->cursor.vpos);

  if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row)
      /* The row may be partially visible at the top because we
	 already have chosen a vscroll to align the bottom of the
	 row with the bottom of the window.  This happens for rows
	 taller than the window.  */
      && row->y + row->height < window_box_height (w))
    {
      int dy = row->height - row->visible_height;
      w->vscroll = 0;
      w->cursor.y += dy;
      shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
    }
  else if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)
	   /* The row may be partially visible at the bottom because
	      we chose a vscroll to align the row's top with the
	      window's top.  This happens for rows taller than the
	      window.  */
	   && row->y > WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w))
    {
      int dy = - (row->height - row->visible_height);
      w->vscroll = dy;
      w->cursor.y += dy;
      shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
    }

  /* When we change the cursor y-position of the selected window,
     change this_line_y as well so that the display optimization for
     the cursor line of the selected window in redisplay_internal uses
     the correct y-position.  */
  if (w == XWINDOW (selected_window))

	  goto restore_buffers;
	}

      if (w->cursor.vpos < 0 && !w->frozen_window_start_p)
	{
	  /* If point does not appear, or on a line that is not fully
	     visible, move point so it does appear.  The desired
	     matrix has been built above, so we can use it.  */
	  int height = window_box_height (w) / 2;
	  struct glyph_row *row = MATRIX_ROW (w->desired_matrix, 0);
	  
	  while (row->y < height)
	    ++row;

	  TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),
			    MATRIX_ROW_START_BYTEPOS (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->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);
  fprintf (stderr, "%9d %5d\n",
	   CHARPOS (row->start.string_pos),
	   CHARPOS (row->end.string_pos));

			    || MATRIX_ROW_OVERLAPS_PRED_P (row));

      /* If first line's physical ascent is larger than its logical
         ascent, use the physical ascent, and make the row taller.
         This makes accented characters fully visible.  */
      if (row == it->w->desired_matrix->rows
	  && row->phys_ascent > row->ascent)
	{
	  row->height += row->phys_ascent - row->ascent;
	  row->ascent = row->phys_ascent;
	}

  while (1)
    {
      int n_glyphs_before, hpos_before, x_before;
      int x, i, nglyphs;
      int ascent, descent, phys_ascent, phys_descent;
      
      /* Retrieve the next thing to display.  Value is zero if end of
	 buffer reached.  */
      if (!get_next_display_element (it))
	{
	  /* Maybe add a space at the end of this line that is used to

30652:4ed1978642cb

      /* If lines are continued, this line may end in the middle of a
	 multi-glyph character (e.g. a control character displayed as
	 \003, or in the middle of an overlay string).  In this case
	 move_it_to above will not have taken us to the start of
	 the continuation line but to the end of the continued line.  */
      if (!it->truncate_lines_p)
	{
	  if (it->current_x > 0)
	    {
	      if (it->current.dpvec_index >= 0
		  || it->current.overlay_string_index >= 0)
		{
		  set_iterator_to_next (it);
		  move_it_in_display_line_to (it, -1, -1, 0);
		}
	  
	      it->continuation_lines_width += it->current_x;
	    }

	  /* We're starting a new display line, not affected by the
	     height of the continued line, so clear the appropriate
	     fields in the iterator structure.  */
	  it->max_ascent = it->max_descent = 0;
	  it->max_phys_ascent = it->max_phys_descent = 0;
	}
      
      it->current_y = first_y;
      it->vpos = 0;
      it->current_x = it->hpos = 0;

make_cursor_line_fully_visible (w)
     struct window *w;
{
  struct glyph_matrix *matrix;
  struct glyph_row *row;
  int window_height, header_line_height;
  
  /* It's not always possible to find the cursor, e.g, when a window
     is full of overlay strings.  Don't do anything in that case.  */
  if (w->cursor.vpos < 0)
    return;
  
  matrix = w->desired_matrix;
  row = MATRIX_ROW (matrix, w->cursor.vpos);

  /* If the cursor row is not partially visible, there's nothing
     to do.  */
  if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
    return;

  /* If the row the cursor is in is taller than the window's height,
     it's not clear what to do, so do nothing.  */
  window_height = window_box_height (w);
  if (row->height >= window_height)
    return;

  if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
    {
      int dy = row->height - row->visible_height;
      w->vscroll = 0;
      w->cursor.y += dy;
      shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
    }
  else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */
    {
      int dy = - (row->height - row->visible_height);
      w->vscroll = dy;
      w->cursor.y += dy;
      shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
    }
  
  /* When we change the cursor y-position of the selected window,
     change this_line_y as well so that the display optimization for
     the cursor line of the selected window in redisplay_internal uses
     the correct y-position.  */
  if (w == XWINDOW (selected_window))

	  goto restore_buffers;
	}

      if (w->cursor.vpos < 0 && !w->frozen_window_start_p)
	{
	  /* If point does not appear, try to move point so it does
	     appear. The desired matrix has been built above, so we
	     can use it here.  */
	  int window_height;
	  struct glyph_row *row;

	  window_height = window_box_height (w) / 2;
	  row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix);
	  while (MATRIX_ROW_BOTTOM_Y (row) < window_height)
	    ++row;

	  TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),
			    MATRIX_ROW_START_BYTEPOS (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    H    V    A    P\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 %4d %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->fill_line_p,
	   row->ends_in_middle_of_char_p,
	   row->starts_in_middle_of_char_p,
	   row->x,
	   row->y,
	   row->pixel_width,
	   row->height,
	   row->visible_height,
	   row->ascent,
	   row->phys_ascent);
  fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
	   row->end.overlay_string_index);
  fprintf (stderr, "%9d %5d\n",
	   CHARPOS (row->start.string_pos),
	   CHARPOS (row->end.string_pos));

			    || MATRIX_ROW_OVERLAPS_PRED_P (row));

      /* If first line's physical ascent is larger than its logical
         ascent, use the physical ascent, and make the row taller.
         This makes accented characters fully visible.  */
      if (row == MATRIX_FIRST_TEXT_ROW (it->w->desired_matrix)
	  && row->phys_ascent > row->ascent)
	{
	  row->height += row->phys_ascent - row->ascent;
	  row->ascent = row->phys_ascent;
	}

  while (1)
    {
      int n_glyphs_before, hpos_before, x_before;
      int x, i, nglyphs;
      int ascent, descent, phys_ascent, phys_descent;

      /* Retrieve the next thing to display.  Value is zero if end of
	 buffer reached.  */
      if (!get_next_display_element (it))
	{
	  /* Maybe add a space at the end of this line that is used to