X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffont.h;h=d17c363e4b65975861c6163eb5823ee483b59223;hb=62f77fab4e243f557ed9f9ec9d25e6690f935951;hp=6c772283a6e1aa5606b4f3e06d3d60edf399ff07;hpb=1359a5c46aaaa266d1d6a0f30f2478a18e439b5c;p=m17n%2Fm17n-lib.git

diff --git a/src/font.h b/src/font.h
index 6c77228..d17c363 100644
--- a/src/font.h
+++ b/src/font.h
@@ -23,7 +23,7 @@
 #ifndef _M17N_FONT_H_
 #define _M17N_FONT_H_
 
-/** Type of font stored in MFont->property[MFONT_TYPE].  */
+/** Type of font.  Now obsolete.  */
 
 enum MFontType
   {
@@ -52,7 +52,6 @@ enum MFontProperty
     MFONT_REGISTRY,
     MFONT_SIZE,
     MFONT_RESY,
-    MFONT_TYPE,
     /* anchor */
     MFONT_PROPERTY_MAX
   };
@@ -145,6 +144,12 @@ struct MRealizedFont
   short ascent, descent;
 
   MFontEncoding *encoding;
+
+  /* Type of the font: Mx, Mfreetype, or Mxft.  */
+  MSymbol type;
+
+  /* Pointer to the font structure.  */
+  void *fontp;
 };
 
 /** Structure to hold a list of fonts of each registry.  */
@@ -159,22 +164,22 @@ typedef struct
 
 struct MFontDriver
 {
-  /** Return a font best matching with SPEC.  */
+  /** Return a font satisfying REQUEST and best matching with SPEC.
+      For the moment, LIMITTED_SIZE is ignored.  */
   MRealizedFont *(*select) (MFrame *frame, MFont *spec, MFont *request,
 			    int limitted_size);
 
   /** Open a font specified by RFONT.  */
   int (*open) (MRealizedFont *rfont);
 
-  /** Close a font specified by RFONT.   */
-  void (*close) (MRealizedFont *rfont);
-
-  void (*find_metric) (MRealizedFont *rfont, MGlyph *g);
+  /** Set metrics of glyphs in GSTRING from FROM to TO.  */
+  void (*find_metric) (MRealizedFont *rfont, MGlyphString *gstring,
+		       int from, int to);
 
-  /** Encode C into the glyph code the font.  CODE is a code point of
-      C in rfont->encoder->encoding_charset.  If the font has no glyph
-      for C, return MCHAR_INVALID_CODE.  */
-  unsigned (*encode_char) (MRealizedFont *rfont, int c, unsigned code);
+  /** Encode CODE into a glyph code the font.  CODE is a code point of
+      a character in rfont->encoder->encoding_charset.  If the font
+      has no glyph for CODE, return MCHAR_INVALID_CODE.  */
+  unsigned (*encode_char) (MRealizedFont *rfont, unsigned code);
 
   /** Draw glyphs from FROM to TO (exclusive) on window WIN of FRAME
       at coordinate (X, Y) relative to WIN.  */
@@ -187,9 +192,6 @@ struct MFontDriver
 
 #define MFONT_INIT(font) memset ((font), 0, sizeof (MFont))
 
-
-extern MFontDriver *mfont__driver_list[MFONT_TYPE_MAX];
-
 extern MSymbol Mlayouter;
 
 extern int mfont__flt_init ();
@@ -197,15 +199,48 @@ extern int mfont__flt_init ();
 extern void mfont__flt_fini ();
 
 #ifdef HAVE_FREETYPE
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef HAVE_OTF
+#include <otf.h>
+#endif /* HAVE_OTF */
+
+typedef struct
+{
+  M17NObject control;
+  MFont font;
+  char *filename;
+  int otf_flag;	/* This font is OTF (1), may be OTF (0), is not OTF (-1).  */
+  MPlist *charmap_list;
+  int charmap_index;
+  FT_Face ft_face;
+#ifdef HAVE_OTF
+  OTF *otf;
+#endif /* HAVE_OTF */
+  void *extra_info;		/* Xft uses this member.  */
+} MFTInfo;
+
+extern MFontDriver mfont__ft_driver;
+
 extern int mfont__ft_init ();
 
 extern void mfont__ft_fini ();
 
+extern int mfont__ft_parse_name (char *name, MFont *font);
+
+extern char *mfont__ft_unparse_name (MFont *font);
+
+#ifdef HAVE_OTF
+
 extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
 				MSymbol script, MSymbol langsys,
 				MSymbol gsub_features, MSymbol gpos_features);
+
 extern int mfont__ft_decode_otf (MGlyph *g);
 
+#endif	/* HAVE_OTF */
+
 #endif /* HAVE_FREETYPE */
 
 extern void mfont__free_realized (MRealizedFont *rfont);
@@ -221,19 +256,15 @@ extern MSymbol mfont__set_spec_from_plist (MFont *spec, MPlist *plist);
 
 extern void mfont__resize (MFont *spec, MFont *request);
 
-extern int mfont__encodable_p (MRealizedFont *rfont, MSymbol layouter_name,
-			       int c);
-
 extern unsigned mfont__encode_char (MRealizedFont *rfont, int c);
 
 extern MRealizedFont *mfont__select (MFrame *frame, MFont *spec,
-				     MFont *request, int limitted_size);
+				     MFont *request, int limitted_size,
+				     MSymbol layouter);
 
 extern int mfont__open (MRealizedFont *rfont);
 
-extern void mfont__close (MRealizedFont *rfont);
-
-extern void mfont__get_metric (MRealizedFont *rfont, MGlyph *g);
+extern void mfont__get_metric (MGlyphString *gstring, int from, int to);
 
 extern void mfont__set_property (MFont *font, enum MFontProperty key,
 				 MSymbol val);
@@ -245,9 +276,12 @@ extern void mfont__set_spec (MFont *font,
 			     MSymbol attrs[MFONT_PROPERTY_MAX],
 			     unsigned short size, unsigned short resy);
 
+extern int mfont__parse_name_into_font (char *name, MSymbol format,
+					MFont *font);
+
 extern unsigned mfont__flt_encode_char (MSymbol layouter_name, int c);
 
 extern int mfont__flt_run (MGlyphString *gstring, int from, int to,
-			   MSymbol layouter_name, MRealizedFace *ascii_rface);
+			   MRealizedFace *rface);
 
 #endif /* _M17N_FONT_H_ */