changeset 90492:e33114b32ce5

(x_draw_glyph_string) [USE_FONT_BACKEND]: Check s->face->font on determining underline position.
author Kenichi Handa <handa@m17n.org>
date Fri, 23 Jun 2006 05:07:12 +0000
parents f894dd8d64ea
children c5c4ee67b82e
files src/xterm.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Wed Jun 21 01:25:10 2006 +0000
+++ b/src/xterm.c	Fri Jun 23 05:07:12 2006 +0000
@@ -2866,8 +2866,13 @@
 
 #ifdef USE_FONT_BACKEND
 	  if (enable_font_backend)
-	    /* In the future, we must use information of font.  */
-	    y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+	    {
+	      if (s->face->font)
+		/* In the future, we must use information of font.  */
+		y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+	      else
+		y = s->y + s->height - h;
+	    }
 	  else
 #endif
 	  if (x_use_underline_position_properties