comparison src/xterm.c @ 25546:e98819a94512

Change `top-line' and `top_line' to `header-line' and `header_line'. Likewise for similar spellings.

25545:b0a117037bde

     struct glyph_row *row;
{
  struct frame *f = XFRAME (w->frame);
  enum bitmap_type bitmap;
  struct face *face;
  int top_line_height = -1;

  xassert (interrupt_input_blocked);

  /* If row is completely invisible, because of vscrolling, we
     don't have to draw anything.  */

      int border = ((XFASTINT (w->left) > 0
		     && !FRAME_HAS_VERTICAL_SCROLL_BARS (f))
		    ? 1 : 0);
      int left = window_box_left (w, -1);

      if (top_line_height < 0)
	top_line_height = WINDOW_DISPLAY_TOP_LINE_HEIGHT (w);
      
      /* In case the same realized face is used for bitmap areas and
	 for something displayed in the text (e.g. face `region' on
	 mono-displays, the fill style may have been changed to
	 FillSolid in x_draw_glyph_string_background.  */

      XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		      face->gc,
		      (left
		       - FRAME_X_LEFT_FLAGS_AREA_WIDTH (f)
		       + border),
		      WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height,
						       row->y)),
		      FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - border,
		      row->visible_height);
      if (!face->stipple)
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground);

      || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f)
      || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f))
    {
      int right = window_box_right (w, -1);

      if (top_line_height < 0)
	top_line_height = WINDOW_DISPLAY_TOP_LINE_HEIGHT (w);

      /* In case the same realized face is used for bitmap areas and
	 for something displayed in the text (e.g. face `region' on
	 mono-displays, the fill style may have been changed to
	 FillSolid in x_draw_glyph_string_background.  */

      else
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->background);
      XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		      face->gc,
		      right,
		      WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height,
						       row->y)),
		      FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f),
		      row->visible_height);
      if (!face->stipple)
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground);

  /* Don't use S->y for clipping because it doesn't take partially
     visible lines into account.  For example, it can be negative for
     partially visible lines at the top of a window.  */
  if (!s->row->full_width_p
      && MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (s->w, s->row))
    r->y = WINDOW_DISPLAY_TOP_LINE_HEIGHT (s->w);
  else
    r->y = max (0, s->row->y);

  /* If drawing a tool-bar window, draw it over the internal border
     at the top of the window.  */

  /* If S draws overlapping rows, it's sufficient to use the top and
     bottom of the window for clipping because this glyph string
     intentionally draws over other lines.  */
  if (s->for_overlaps_p)
    {
      r->y = WINDOW_DISPLAY_TOP_LINE_HEIGHT (s->w);
      r->height = window_text_bottom_y (s->w) - r->y;
    }
      
  r->y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r->y);
}

    {
      from_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, from_x);
      to_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, to_x);
    }
  
  min_y = WINDOW_DISPLAY_TOP_LINE_HEIGHT (w);
  from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, output_cursor.y));
  to_y = WINDOW_TO_FRAME_PIXEL_Y (w, to_y);
  
  /* Prevent inadvertently clearing to end of the X window.  */
  if (to_x > from_x && to_y > from_y)

  struct glyph_row *row;

  if (mode_line_p)
    row = MATRIX_MODE_LINE_ROW (w->current_matrix);
  else
    row = MATRIX_TOP_LINE_ROW (w->current_matrix);
  
  if (row->enabled_p)
    {
      struct glyph *glyph, *end;
      Lisp_Object help, map;

  /* Maybe clear the display under the cursor.  */
  if (w->phys_cursor_type == HOLLOW_BOX_CURSOR)
    {
      int x;
      int top_line_height = WINDOW_DISPLAY_TOP_LINE_HEIGHT (w);

      cursor_glyph = get_phys_cursor_glyph (w);
      if (cursor_glyph == NULL)
	goto mark_cursor_off;

      x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
      
      XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		  x,
		  WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height,
						   cursor_row->y)),
		  cursor_glyph->pixel_width,
		  cursor_row->visible_height,
		  False);
    }

25546:e98819a94512

     struct glyph_row *row;
{
  struct frame *f = XFRAME (w->frame);
  enum bitmap_type bitmap;
  struct face *face;
  int header_line_height = -1;

  xassert (interrupt_input_blocked);

  /* If row is completely invisible, because of vscrolling, we
     don't have to draw anything.  */

      int border = ((XFASTINT (w->left) > 0
		     && !FRAME_HAS_VERTICAL_SCROLL_BARS (f))
		    ? 1 : 0);
      int left = window_box_left (w, -1);

      if (header_line_height < 0)
	header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
      
      /* In case the same realized face is used for bitmap areas and
	 for something displayed in the text (e.g. face `region' on
	 mono-displays, the fill style may have been changed to
	 FillSolid in x_draw_glyph_string_background.  */

      XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		      face->gc,
		      (left
		       - FRAME_X_LEFT_FLAGS_AREA_WIDTH (f)
		       + border),
		      WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
						       row->y)),
		      FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - border,
		      row->visible_height);
      if (!face->stipple)
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground);

      || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f)
      || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f))
    {
      int right = window_box_right (w, -1);

      if (header_line_height < 0)
	header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);

      /* In case the same realized face is used for bitmap areas and
	 for something displayed in the text (e.g. face `region' on
	 mono-displays, the fill style may have been changed to
	 FillSolid in x_draw_glyph_string_background.  */

      else
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->background);
      XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		      face->gc,
		      right,
		      WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
						       row->y)),
		      FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f),
		      row->visible_height);
      if (!face->stipple)
	XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground);

  /* Don't use S->y for clipping because it doesn't take partially
     visible lines into account.  For example, it can be negative for
     partially visible lines at the top of a window.  */
  if (!s->row->full_width_p
      && MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (s->w, s->row))
    r->y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w);
  else
    r->y = max (0, s->row->y);

  /* If drawing a tool-bar window, draw it over the internal border
     at the top of the window.  */

  /* If S draws overlapping rows, it's sufficient to use the top and
     bottom of the window for clipping because this glyph string
     intentionally draws over other lines.  */
  if (s->for_overlaps_p)
    {
      r->y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w);
      r->height = window_text_bottom_y (s->w) - r->y;
    }
      
  r->y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r->y);
}

    {
      from_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, from_x);
      to_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, to_x);
    }
  
  min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
  from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, output_cursor.y));
  to_y = WINDOW_TO_FRAME_PIXEL_Y (w, to_y);
  
  /* Prevent inadvertently clearing to end of the X window.  */
  if (to_x > from_x && to_y > from_y)

  struct glyph_row *row;

  if (mode_line_p)
    row = MATRIX_MODE_LINE_ROW (w->current_matrix);
  else
    row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
  
  if (row->enabled_p)
    {
      struct glyph *glyph, *end;
      Lisp_Object help, map;

  /* Maybe clear the display under the cursor.  */
  if (w->phys_cursor_type == HOLLOW_BOX_CURSOR)
    {
      int x;
      int header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);

      cursor_glyph = get_phys_cursor_glyph (w);
      if (cursor_glyph == NULL)
	goto mark_cursor_off;

      x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
      
      XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		  x,
		  WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
						   cursor_row->y)),
		  cursor_glyph->pixel_width,
		  cursor_row->visible_height,
		  False);
    }