comparison src/xterm.c @ 38586:fde4f76bf531

(x_get_glyph_string_clip_rect): Minor cleanup.

38585:f2c0f6df43ab

      r->x = WINDOW_AREA_TO_FRAME_PIXEL_X (s->w, s->area, 0);
      r->width = window_box_width (s->w, s->area);
      r->height = s->row->visible_height;
    }

  /* 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->w == XWINDOW (s->f->tool_bar_window))
    r->y -= s->f->output_data.x->internal_border_width;

  /* 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);
}


/* Set clipping for output of glyph string S.  S may be part of a mode

38586:fde4f76bf531

      r->x = WINDOW_AREA_TO_FRAME_PIXEL_X (s->w, s->area, 0);
      r->width = window_box_width (s->w, s->area);
      r->height = s->row->visible_height;
    }

  /* 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;
    }
  else
    {
      /* 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->w == XWINDOW (s->f->tool_bar_window))
	r->y -= s->f->output_data.x->internal_border_width;
    }

  r->y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r->y);
}


/* Set clipping for output of glyph string S.  S may be part of a mode