comparison src/xterm.c @ 95245:4e2f379d6e44

(x_draw_glyph_string): Be sure to draw underline within the current line area.

95244:91375185a2f2

		    position = s->font->underline_position;
		  else if (s->font)
		    position = (s->font->descent + 1) / 2;
		}
	    }
	  s->underline_thickness = thickness;
	  s->underline_position = position;
	  y = s->ybase + position;
	  if (s->face->underline_defaulted_p)
	    XFillRectangle (s->display, s->window, s->gc,

95245:4e2f379d6e44

		    position = s->font->underline_position;
		  else if (s->font)
		    position = (s->font->descent + 1) / 2;
		}
	    }
	  /* Check the sanity of thickness and position.  We should
	     avoid drawing underline out of the current line area.  */
	  if (s->y + s->height <= s->ybase + position)
	    position = s->y + s->height - 1;
	  if (s->y + s->height < s->ybase + position + thickness)
	    thickness = (s->y + s->height) - (s->ybase + position);
	  s->underline_thickness = thickness;
	  s->underline_position = position;
	  y = s->ybase + position;
	  if (s->face->underline_defaulted_p)
	    XFillRectangle (s->display, s->window, s->gc,