comparison src/xterm.c @ 25079:3a09aae52441

(x_get_glyph_string_clip_rect): Take internal border into account for full-width windows. Don't add scroll bar width to width of clip rect. (x_draw_glyph_string_box): Add 1 to right x of full width lines. (x_set_glyph_string_background_width): Add 1 to background width. (x_draw_glyphs): Take internal border into account for full-width lines.

25078:6de9d21f8a24

     XRectangle *r;
{
  if (s->row->full_width_p)
    {
      /* Draw full-width.  X coordinates are relative to S->w->left.  */
      r->x = WINDOW_LEFT_MARGIN (s->w) * CANON_X_UNIT (s->f);
      r->width = XFASTINT (s->w->width) * CANON_X_UNIT (s->f);

      if (FRAME_HAS_VERTICAL_SCROLL_BARS (s->f))
	{
	  int width = FRAME_SCROLL_BAR_WIDTH (s->f) * CANON_X_UNIT (s->f);
	  r->width += width;
	  if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (s->f))
	    r->x -= width;
	}
      
      /* Unless displaying a mode or menu bar line, which are always
	 fully visible, clip to the visible part of the row.  */
      if (s->w->pseudo_window_p)
	r->height = s->row->visible_height;

  width = s->face->box_line_width;
  raised_p = s->face->box == FACE_RAISED_BOX;
  left_x = s->x;
  right_x = ((s->row->full_width_p
	      ? last_x
	      : min (last_x, s->x + s->width) - 1));
  top_y = s->y;
  bottom_y = top_y + s->height - 1;

  left_p = (s->first_glyph->left_box_line_p

  
  /* If S extends its face to the end of the line, set its
     background_width to the distance to the right edge of the drawing
     area.  */
  if (s->extends_to_end_of_line_p)
    s->background_width = last_x - s->x;
  else
    s->background_width = s->width;
}

	    x -= width;
	}

      /* If row should extend over internal borders, adjust x and
         width accordingly.  */
      if (row->internal_border_p)
	{
	  x += FRAME_INTERNAL_BORDER_WIDTH (f);
	  width -= 2 * FRAME_INTERNAL_BORDER_WIDTH (f);
	}
    }
  else
    {
      x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, area, x);

25079:3a09aae52441

     XRectangle *r;
{
  if (s->row->full_width_p)
    {
      /* Draw full-width.  X coordinates are relative to S->w->left.  */
      int canon_x = CANON_X_UNIT (s->f);
      
      r->x = WINDOW_LEFT_MARGIN (s->w) * canon_x;
      r->width = XFASTINT (s->w->width) * canon_x;

      if (FRAME_HAS_VERTICAL_SCROLL_BARS (s->f))
	{
	  int width = FRAME_SCROLL_BAR_WIDTH (s->f) * canon_x;
	  if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (s->f))
	    r->x -= width;
	}
      
      /* If row should not extend over internal borders, adjust x.  */
      if (!s->row->internal_border_p)
	r->x += FRAME_INTERNAL_BORDER_WIDTH (s->f);
      
      /* Unless displaying a mode or menu bar line, which are always
	 fully visible, clip to the visible part of the row.  */
      if (s->w->pseudo_window_p)
	r->height = s->row->visible_height;

  width = s->face->box_line_width;
  raised_p = s->face->box == FACE_RAISED_BOX;
  left_x = s->x;
  right_x = ((s->row->full_width_p
	      ? last_x - 1
	      : min (last_x, s->x + s->width) - 1));
  top_y = s->y;
  bottom_y = top_y + s->height - 1;

  left_p = (s->first_glyph->left_box_line_p

  
  /* If S extends its face to the end of the line, set its
     background_width to the distance to the right edge of the drawing
     area.  */
  if (s->extends_to_end_of_line_p)
    s->background_width = last_x - s->x + 1;
  else
    s->background_width = s->width;
}

	    x -= width;
	}

      /* If row should extend over internal borders, adjust x and
         width accordingly.  */
      if (!row->internal_border_p)
	{
	  x += FRAME_INTERNAL_BORDER_WIDTH (f);
	  last_x -= FRAME_INTERNAL_BORDER_WIDTH (f);
	}
    }
  else
    {
      x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, area, x);