X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-gd.c;h=58debdb4bd4088b1f0958074cdf0ed503a107456;hb=7ebe3307e5ffe8fa4f5a3151a861ba5ad9625dc7;hp=6ffdc84892ac6f2df0a19fb41ae44ebbf84c9e4d;hpb=d2aefee1a351ff9f485011f493294b2c51a50e36;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-gd.c b/src/m17n-gd.c
index 6ffdc84..58debdb 100644
--- a/src/m17n-gd.c
+++ b/src/m17n-gd.c
@@ -223,6 +223,139 @@ intersect_rectangle (MDrawMetric *r1, MDrawMetric *r2, MDrawMetric *rect)
   gdImageColorResolve ((img), (color) >> 16, ((color) >> 8) & 0xFF,	\
 		       (color) & 0xFF)
 
+static MRealizedFont *gd_font_open (MFrame *, MFont *, MFont *,
+				    MRealizedFont *);
+static void gd_render (MDrawWindow, int, int, MGlyphString *,
+		       MGlyph *, MGlyph *, int, MDrawRegion);
+
+static MFontDriver gd_font_driver =
+  { NULL, gd_font_open, NULL, NULL, NULL, gd_render, NULL };
+
+static MRealizedFont *
+gd_font_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont)
+{
+  double size = font->size ? font->size : spec->size;
+  int reg = spec->property[MFONT_REGISTRY];
+  MRealizedFont *new;
+
+  if (rfont)
+    {
+      MRealizedFont *save = NULL;
+
+      for (; rfont; rfont = rfont->next)
+	if (rfont->font == font
+	    && (rfont->font->size ? rfont->font->size == size
+		: rfont->spec.size == size)
+	    && rfont->spec.property[MFONT_REGISTRY] == reg)
+	  {
+	    if (! save)
+	      save = rfont;
+	    if (rfont->driver == &gd_font_driver)
+	      return rfont;
+	  }
+      rfont = save;
+    }
+  rfont = (mfont__ft_driver.open) (frame, font, spec, rfont);
+  if (! rfont)
+    return NULL;
+  M17N_OBJECT_REF (rfont->info);
+  MSTRUCT_CALLOC (new, MERROR_GD);
+  *new = *rfont;
+  new->driver = &gd_font_driver;
+  new->next = MPLIST_VAL (frame->realized_font_list);
+  MPLIST_VAL (frame->realized_font_list) = new;
+  return new;
+}
+
+static void
+gd_render (MDrawWindow win, int x, int y,
+	   MGlyphString *gstring, MGlyph *from, MGlyph *to,
+	   int reverse, MDrawRegion region)
+{
+  gdImagePtr img = (gdImagePtr) win;
+  FT_Face ft_face;
+  MRealizedFace *rface = from->rface;
+  FT_Int32 load_flags = FT_LOAD_RENDER;
+  int i, j;
+  int color, pixel;
+  int r, g, b;
+  
+  pixel = RESOLVE_COLOR (img, color);
+
+  if (from == to)
+    return;
+
+  /* It is assured that the all glyphs in the current range use the
+     same realized face.  */
+  ft_face = rface->rfont->fontp;
+  color = ((int *) rface->info)[reverse ? COLOR_INVERSE : COLOR_NORMAL];
+  pixel = RESOLVE_COLOR (img, color);
+
+  if (gstring->anti_alias)
+    r = color >> 16, g = (color >> 8) & 0xFF, b = color & 0xFF;
+  else
+    {
+#ifdef FT_LOAD_TARGET_MONO
+      load_flags |= FT_LOAD_TARGET_MONO;
+#else
+      load_flags |= FT_LOAD_MONOCHROME;
+#endif
+    }
+
+  for (; from < to; x += from++->width)
+    {
+      unsigned char *bmp;
+      int xoff, yoff;
+      int width, pitch;
+
+      FT_Load_Glyph (ft_face, (FT_UInt) from->code, load_flags);
+      yoff = y - ft_face->glyph->bitmap_top + from->yoff;
+      bmp = ft_face->glyph->bitmap.buffer;
+      width = ft_face->glyph->bitmap.width;
+      pitch = ft_face->glyph->bitmap.pitch;
+      if (! gstring->anti_alias)
+	pitch *= 8;
+      if (width > pitch)
+	width = pitch;
+
+      if (gstring->anti_alias)
+	for (i = 0; i < ft_face->glyph->bitmap.rows;
+	     i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
+	  {
+	    xoff = x + ft_face->glyph->bitmap_left + from->xoff;
+	    for (j = 0; j < width; j++, xoff++)
+	      if (bmp[j])
+		{
+		  int f = bmp[j] >> 5;
+		  int pixel1 = pixel;
+
+		  if (f < 7)
+		    {
+		      int r1, g1, b1, color1;
+
+		      pixel1 = gdImageGetPixel (img, xoff, yoff);
+		      r1 = gdImageRed (img, pixel1);
+		      g1 = gdImageGreen (img, pixel1);
+		      b1 = gdImageBlue (img, pixel1);
+		      color1 = ((((r * f + r1 * (7 - f)) / 7) << 16)
+				| (((g * f + g1 * (7 - f)) / 7) << 8)
+				| ((b * f + b1 * (7 - f)) / 7));
+		      pixel1 = RESOLVE_COLOR (img, color1);
+		    }
+		  gdImageSetPixel (img, xoff, yoff, pixel1);
+		}
+	  }
+      else
+	for (i = 0; i < ft_face->glyph->bitmap.rows;
+	     i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
+	  {
+	    xoff = x + ft_face->glyph->bitmap_left + from->xoff;
+	    for (j = 0; j < width; j++, xoff++)
+	      if (bmp[j / 8] & (1 << (7 - (j % 8))))
+		gdImageSetPixel (img, xoff, yoff, pixel);
+	  }
+    }
+}
 
 static void
 gd_close (MFrame *frame)
@@ -632,102 +765,7 @@ static MDeviceDriver gd_driver =
     gd_dump_region,
   };
 
-
-static void
-gd_render (MDrawWindow win, int x, int y,
-	   MGlyphString *gstring, MGlyph *from, MGlyph *to,
-	   int reverse, MDrawRegion region)
-{
-  gdImagePtr img = (gdImagePtr) win;
-  MFTInfo *ft_info;
-  FT_Face ft_face;
-  MRealizedFace *rface = from->rface;
-  FT_Int32 load_flags = FT_LOAD_RENDER;
-  int i, j;
-  int color, pixel;
-  int r, g, b;
-  
-  pixel = RESOLVE_COLOR (img, color);
-
-  if (from == to)
-    return;
-
-  /* It is assured that the all glyphs in the current range use the
-     same realized face.  */
-  ft_info = (MFTInfo *) rface->rfont->info;
-  ft_face = ft_info->ft_face;
-  color = ((int *) rface->info)[reverse ? COLOR_INVERSE : COLOR_NORMAL];
-  pixel = RESOLVE_COLOR (img, color);
-
-  if (gstring->anti_alias)
-    r = color >> 16, g = (color >> 8) & 0xFF, b = color & 0xFF;
-  else
-    {
-#ifdef FT_LOAD_TARGET_MONO
-      load_flags |= FT_LOAD_TARGET_MONO;
-#else
-      load_flags |= FT_LOAD_MONOCHROME;
-#endif
-    }
-
-  for (; from < to; x += from++->width)
-    {
-      unsigned char *bmp;
-      int xoff, yoff;
-      int width, pitch;
-
-      FT_Load_Glyph (ft_face, (FT_UInt) from->code, load_flags);
-      yoff = y - ft_face->glyph->bitmap_top + from->yoff;
-      bmp = ft_face->glyph->bitmap.buffer;
-      width = ft_face->glyph->bitmap.width;
-      pitch = ft_face->glyph->bitmap.pitch;
-      if (! gstring->anti_alias)
-	pitch *= 8;
-      if (width > pitch)
-	width = pitch;
-
-      if (gstring->anti_alias)
-	for (i = 0; i < ft_face->glyph->bitmap.rows;
-	     i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
-	  {
-	    xoff = x + ft_face->glyph->bitmap_left + from->xoff;
-	    for (j = 0; j < width; j++, xoff++)
-	      if (bmp[j])
-		{
-		  int f = bmp[j] >> 5;
-		  int pixel1 = pixel;
-
-		  if (f < 7)
-		    {
-		      int r1, g1, b1, color1;
-
-		      pixel1 = gdImageGetPixel (img, xoff, yoff);
-		      r1 = gdImageRed (img, pixel1);
-		      g1 = gdImageGreen (img, pixel1);
-		      b1 = gdImageBlue (img, pixel1);
-		      color1 = ((((r * f + r1 * (7 - f)) / 7) << 16)
-				| (((g * f + g1 * (7 - f)) / 7) << 8)
-				| ((b * f + b1 * (7 - f)) / 7));
-		      pixel1 = RESOLVE_COLOR (img, color1);
-		    }
-		  gdImageSetPixel (img, xoff, yoff, pixel1);
-		}
-	  }
-      else
-	for (i = 0; i < ft_face->glyph->bitmap.rows;
-	     i++, bmp += ft_face->glyph->bitmap.pitch, yoff++)
-	  {
-	    xoff = x + ft_face->glyph->bitmap_left + from->xoff;
-	    for (j = 0; j < width; j++, xoff++)
-	      if (bmp[j / 8] & (1 << (7 - (j % 8))))
-		gdImageSetPixel (img, xoff, yoff, pixel);
-	  }
-    }
-}
-
-
-static MFontDriver gd_font_driver =
-  { NULL, NULL, NULL, NULL, gd_render };
+/* Functions to be stored in MDeviceLibraryInterface by dlsym ().  */
 
 int
 device_init ()
@@ -740,9 +778,10 @@ device_init ()
   scratch_images[0] = scratch_images[1] = NULL;
 
   gd_font_driver.select = mfont__ft_driver.select;
-  gd_font_driver.open = mfont__ft_driver.open;
   gd_font_driver.find_metric = mfont__ft_driver.find_metric;
+  gd_font_driver.has_char = mfont__ft_driver.has_char;
   gd_font_driver.encode_char = mfont__ft_driver.encode_char;
+  gd_font_driver.list = mfont__ft_driver.list;
 
   return 0;
 }
@@ -766,8 +805,8 @@ device_fini ()
     }
   M17N_OBJECT_UNREF (realized_face_list);
 
-  MPLIST_DO (plist, realized_font_list)
-    mfont__free_realized ((MRealizedFont *) MPLIST_VAL (plist));
+  if (MPLIST_VAL (realized_font_list))
+    mfont__free_realized (MPLIST_VAL (realized_font_list));
   M17N_OBJECT_UNREF (realized_font_list);
 
   for (i = 0; i < 2; i++)
@@ -776,11 +815,12 @@ device_fini ()
   return 0;
 }
 
-void *
+int
 device_open (MFrame *frame, MPlist *param)
 {
   MFace *face;
 
+  frame->device = NULL;
   frame->device_type = MDEVICE_SUPPORT_OUTPUT;
   frame->driver = &gd_driver;
   frame->font_driver_list = mplist ();
@@ -791,7 +831,7 @@ device_open (MFrame *frame, MPlist *param)
   face = mface_copy (mface__default);
   mplist_push (param, Mface, face);
   M17N_OBJECT_UNREF (face);
-  return Mt;
+  return 0;
 }
 
 #endif	/* not HAVE_GD nor HAVE_FREETYPE */