From: handa <handa>
Date: Thu, 20 May 2004 05:48:27 +0000 (+0000)
Subject: (render_glyphs): If a font is not found, use
X-Git-Tag: withdl~210
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef5cd0353b1e2e0de2c076660c5acf5eef23047;p=m17n%2Fm17n-lib.git

(render_glyphs): If a font is not found, use
mwin__draw_empty_boxes.
(alloc_gstring): Initialized gstring->tick.
(get_gstring): Check gstring->tick.
---

diff --git a/src/draw.c b/src/draw.c
index 348e365..a1d86ca 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -1182,14 +1182,12 @@ render_glyphs (MFrame *frame, MDrawWindow win, int x, int y, int width,
 
 	  if (from_g->type == GLYPH_CHAR)
 	    {
-	      MFontDriver *driver;
-
 	      if (rface->rfont && from_g->code >= 0)
-		driver = rface->rfont->driver;
+		(rface->rfont->driver->render) (win, x, y, gstring, from_g, g,
+						reverse, region);
 	      else
-		driver = mfont__driver_list[MFONT_TYPE_WIN];
-	      (driver->render) (win, x, y, gstring, from_g, g,
-				reverse, region);
+		mwin__draw_empty_boxes (win, x, y, gstring, from_g, g,
+					reverse, region);
 	    }
 	  else if (from_g->type == GLYPH_BOX)
 	    {
@@ -1385,6 +1383,8 @@ alloc_gstring (MFrame *frame, MText *mt, int pos, MDrawControl *control,
       gstring_num++;
     }
 
+  gstring->frame = frame;
+  gstring->tick = frame->tick;
   gstring->top = gstring;
   gstring->mt = mt;
   gstring->control = *control;
@@ -1465,9 +1465,11 @@ get_gstring (MFrame *frame, MText *mt, int pos, int to, MDrawControl *control)
       if (prop)
 	{
 	  gstring = prop->val;
-	  if (memcmp (control, &gstring->control,
-		      (char *) (&control->with_cursor)
-		      - (char *) (control)))
+	  if (gstring->frame != frame
+	      || gstring->tick != frame->tick
+	      || memcmp (control, &gstring->control,
+			 (char *) (&control->with_cursor)
+			 - (char *) (control)))
 	    {
 	      mtext_detach_property (prop);
 	      gstring = NULL;