# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 976044095 0
# Node ID 7e09cff3b2abe4d8d1d6843904873c9912338dd2
# Parent  e31ac0d22ff8db833dc45562ef6fd8da5a99f592
(x_produce_glyphs): If a font for a component of
a composition is not found, use 1 pixel dot ascent and 0 dot
descent value to avoid displaying terribly tall empty boxes.
(expose_area): Pass x-coordinate relative to the exposed
area to x_draw_glyphs instead of a window-relative coordinate.

diff -r e31ac0d22ff8 -r 7e09cff3b2ab src/w32term.c
--- a/src/w32term.c	Tue Dec 05 19:18:23 2000 +0000
+++ b/src/w32term.c	Tue Dec 05 19:21:35 2000 +0000
@@ -2287,8 +2287,8 @@
             font_type = UNICODE_FONT;
 
 	  /* Initialize the bounding box.  */
-	  pcm = w32_per_char_metric (font, &char2b, font_type);
-	  if (pcm)
+	  if (font_info
+              && (pcm = w32_per_char_metric (font, &char2b, font_type)))
 	    {
 	      width = pcm->width;
 	      ascent = pcm->ascent;
@@ -2352,8 +2352,8 @@
               else
                 font_type = UNICODE_FONT;
 
-	      pcm = w32_per_char_metric (font, &char2b, font_type);
-	      if (pcm)
+	      if (font_info
+                  && (pcm = w32_per_char_metric (font, &char2b, font_type)))
 		{
 		  width = pcm->width;
 		  ascent = pcm->ascent;
@@ -2362,8 +2362,8 @@
 	      else
 		{
 		  width = FONT_WIDTH (font);
-		  ascent = FONT_BASE (font);
-		  descent = FONT_DESCENT (font);
+		  ascent = 1;
+		  descent = 0;
 		}
 
 	      if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
@@ -5546,7 +5546,7 @@
       
       /* Repaint.  */
       if (last > first)
-        x_draw_glyphs (w, first_x, row, area,
+        x_draw_glyphs (w, first_x - start_x, row, area,
                        first - row->glyphs[area],
                        last - row->glyphs[area],
                        row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,