Move the common code between PangoXftFontmap and PangoFT2Fontmap into a

Fri Aug 16 17:49:38 2002  Owen Taylor  <otaylor@redhat.com>

        * pango/pangofc-fontmap.cI pango/pangoxft-fontmap.c
        pango/pangoft2-fontmap.c pango/pangoxft-private.h
        pango/pangoft2-private.h pango/pangoxft-font.c
        pango/pangoft2.h: Move the common code between PangoXftFontmap
        and PangoFT2Fontmap into a new file that is included from both
        with appropriate #defines. This provides most of the
        recent Xft backend improvements for the FT2 backend
        as well.

1 files changed, 75 insertions, 981 deletions

diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 05804e9e..a49cf797 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -29,13 +29,8 @@
 /* For XExtSetCloseDisplay */
 #include <X11/Xlibint.h>
 
-/* Number of freed fonts */
-#define MAX_FREED_FONTS 128
-
-typedef struct _PangoXftFontMap      PangoXftFontMap;
 typedef struct _PangoXftFamily       PangoXftFamily;
-typedef struct _PangoXftFace         PangoXftFace;
-typedef struct _PangoXftPatternSet   PangoXftPatternSet;
+typedef struct _PangoXftFontMap      PangoXftFontMap;
 
 #define PANGO_TYPE_XFT_FONT_MAP              (pango_xft_font_map_get_type ())
 #define PANGO_XFT_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, PangoXftFontMap))
@@ -60,6 +55,7 @@ struct _PangoXftFontMap
 
   Display *display;
   int screen;
+  guint closed : 1;
   
   /* Function to call on prepared patterns to do final
    * config tweaking.
@@ -69,238 +65,34 @@ struct _PangoXftFontMap
   GDestroyNotify substitute_destroy;
 };
 
-#define PANGO_XFT_TYPE_FAMILY              (pango_xft_family_get_type ())
-#define PANGO_XFT_FAMILY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_XFT_TYPE_FAMILY, PangoXftFamily))
-#define PANGO_XFT_IS_FAMILY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_XFT_TYPE_FAMILY))
-
-struct _PangoXftFamily
-{
-  PangoFontFamily parent_instance;
-
-  PangoXftFontMap *fontmap;
-  char *family_name;
-
-  PangoXftFace **faces;
-  int n_faces;		/* -1 == uninitialized */
-};
-
-struct _PangoXftPatternSet
-{
-  int n_patterns;
-  FcPattern **patterns;
-};
-
-#define PANGO_XFT_TYPE_FACE              (pango_xft_face_get_type ())
-#define PANGO_XFT_FACE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_XFT_TYPE_FACE, PangoXftFace))
-#define PANGO_XFT_IS_FACE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_XFT_TYPE_FACE))
-
-struct _PangoXftFace
-{
-  PangoFontFace parent_instance;
-
-  PangoXftFamily *family;
-  char *style;
-};
+/************************************************************
+ *              Code shared with PangoFT2                   *
+ ************************************************************/
 
-static GType    pango_xft_font_map_get_type   (void);
-GType           pango_xft_family_get_type     (void);
-GType           pango_xft_face_get_type       (void);
+#define PangoFcFamily      PangoXftFamily
+#define _PangoFcFamily      _PangoXftFamily
+#define PangoFcFontMap     PangoXftFontMap
+#define PangoFcFont     PangoXftFont
 
-static void          pango_xft_font_map_init          (PangoXftFontMap              *fontmap);
-static void          pango_xft_font_map_class_init    (PangoFontMapClass            *class);
-static void          pango_xft_font_map_finalize      (GObject                      *object);
-static PangoFont *   pango_xft_font_map_load_font     (PangoFontMap                 *fontmap,
-						       PangoContext                 *context,
-						       const PangoFontDescription   *description);
-static PangoFontset *pango_xft_font_map_load_fontset  (PangoFontMap                 *fontmap,
-						       PangoContext                 *context,
-						       const PangoFontDescription   *desc,
-						       PangoLanguage                *language);
-static void          pango_xft_font_map_list_families (PangoFontMap                 *fontmap,
-						       PangoFontFamily            ***families,
-						       int                          *n_families);
+#define PANGO_FC_FONT_MAP PANGO_XFT_FONT_MAP
 
+#define pango_fc_font_map_get_type pango_xft_font_map_get_type
+#define _pango_fc_font_map_add _pango_xft_font_map_add
+#define _pango_fc_font_map_remove _pango_xft_font_map_remove
+#define _pango_fc_font_map_cache_add _pango_xft_font_map_cache_add
+#define _pango_fc_font_map_cache_remove _pango_xft_font_map_cache_remove
+#define _pango_fc_font_map_get_coverage _pango_xft_font_map_get_coverage
+#define _pango_fc_font_map_set_coverage _pango_xft_font_map_set_coverage
+#define _pango_fc_font_desc_from_pattern _pango_xft_font_desc_from_pattern
+#define _pango_fc_font_new               _pango_xft_font_new
 
-static void pango_xft_font_set_free         (PangoXftPatternSet *font_set);
+#define PANGO_FC_NAME "PangoXft"
 
-static void pango_xft_font_map_cache_clear  (PangoXftFontMap    *xfontmap);
-static void pango_xft_font_map_cache_remove (PangoFontMap       *fontmap,
-					     PangoXftFont       *xfont);
+#include "pangofc-fontmap.cI"
 
-static PangoFontClass *parent_class;	/* Parent class structure for PangoXftFontMap */
-
-static GType
-pango_xft_font_map_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (PangoFontMapClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) pango_xft_font_map_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (PangoXftFontMap),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) pango_xft_font_map_init,
-      };
-      
-      object_type = g_type_register_static (PANGO_TYPE_FONT_MAP,
-                                            "PangoXftFontMap",
-                                            &object_info, 0);
-    }
-  
-  return object_type;
-}
-
-static void 
-pango_xft_font_map_init (PangoXftFontMap *xfontmap)
-{
-  xfontmap->n_families = -1;
-}
-
-static void
-pango_xft_font_map_class_init (PangoFontMapClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  
-  parent_class = g_type_class_peek_parent (class);
-  
-  object_class->finalize = pango_xft_font_map_finalize;
-  class->load_font = pango_xft_font_map_load_font;
-  class->load_fontset = pango_xft_font_map_load_fontset;
-  class->list_families = pango_xft_font_map_list_families;
-}
-
-static GSList *fontmaps = NULL;
-
-guint
-pango_xft_pattern_hash (FcPattern *pattern)
-{
-#if 1
-  return FcPatternHash (pattern);
-#else
-  /* Hashing only part of the pattern can improve speed a bit.
-   */
-  char *str;
-  int i;
-  double d;
-  guint hash = 0;
-
-  FcPatternGetString (pattern, FC_FILE, 0, (FcChar8 **) &str);
-  if (str)
-    hash = g_str_hash (str);
-
-  if (FcPatternGetInteger (pattern, FC_INDEX, 0, &i) == FcResultMatch)
-    hash ^= i;
-
-  if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch)
-    hash ^= (guint) (d*1000.0);
-
-  return hash;
-#endif  
-}
-
-gboolean
-pango_xft_pattern_equal (FcPattern *pattern1,
-			 FcPattern *pattern2)
-{
-  if (pattern1 == pattern2)
-    return TRUE;
-  else
-    return FcPatternEqual (pattern1, pattern2);
-}
-
-static guint
-pango_xft_coverage_key_hash (PangoXftCoverageKey *key)
-{
-  return g_str_hash (key->filename) ^ key->id;
-}
-
-static gboolean
-pango_xft_coverage_key_equal (PangoXftCoverageKey *key1,
-			       PangoXftCoverageKey *key2)
-{
-  return key1->id == key2->id && strcmp (key1->filename, key2->filename) == 0;
-}
-
-typedef struct _FontsetHashListNode FontsetHashListNode;
-
-struct _FontsetHashListNode {
-  GHashTable    *fontset_hash;
-  PangoLanguage *language;
-};
-
-/* Get the description => fontset map for a particular
- * language tag.
- */
-static GHashTable *
-pango_xft_get_fontset_hash (PangoXftFontMap *xfontmap,
-			    PangoLanguage   *language)
-{
-  /* We treat NULL as a distinct language tag, but
-   * we should actually determine the real language
-   * tag it corresponds to to avoid duplicate entries
-   * in the list.
-   */
-  GList *tmp_list = xfontmap->fontset_hash_list;
-  while (tmp_list)
-    {
-      FontsetHashListNode *node = tmp_list->data;
-      if (node->language == language)
-	{
-	  if (tmp_list != xfontmap->fontset_hash_list)
-	    {
-	      /* Put the found node at the beginning
-	       */
-	      xfontmap->fontset_hash_list = g_list_remove_link (xfontmap->fontset_hash_list, tmp_list);
-	      xfontmap->fontset_hash_list->prev = tmp_list;
-	      tmp_list->next = xfontmap->fontset_hash_list;
-	      xfontmap->fontset_hash_list = tmp_list;
-	    }
-	  
-	  return node->fontset_hash;
-	}
-      
-      tmp_list = tmp_list->next;
-    }
-
-  {
-    FontsetHashListNode *node = g_new (FontsetHashListNode, 1);
-    xfontmap->fontset_hash_list = g_list_prepend (xfontmap->fontset_hash_list, node);
-    
-    node->fontset_hash =
-      g_hash_table_new_full ((GHashFunc)pango_font_description_hash,
-			     (GEqualFunc)pango_font_description_equal,
-			     (GDestroyNotify)pango_font_description_free,
-			     (GDestroyNotify)pango_xft_font_set_free);
-    node->language = language;
-
-    return node->fontset_hash;
-  }
-}
-
-static void
-pango_xft_clear_fontset_hash_list (PangoXftFontMap *xfontmap)
-{
-  GList *tmp_list = xfontmap->fontset_hash_list;
-  while (tmp_list)
-    {
-      FontsetHashListNode *node = tmp_list->data;
-      
-      g_hash_table_destroy (node->fontset_hash);
-      g_free (node);
-      
-      tmp_list = tmp_list->next;
-    }
-
-  g_list_free (xfontmap->fontset_hash_list);
-  xfontmap->fontset_hash_list = NULL;
-}
+/*************************************************************
+ *                      Xft specific code                    *
+ *************************************************************/
 
 static PangoFontMap *
 pango_xft_find_font_map (Display *display,
@@ -311,11 +103,11 @@ pango_xft_find_font_map (Display *display,
   tmp_list = fontmaps;
   while (tmp_list)
     {
-      PangoXftFontMap *xfontmap = tmp_list->data;
+      PangoXftFontMap *xftfontmap = tmp_list->data;
 
-      if (xfontmap->display == display &&
-	  xfontmap->screen == screen) 
-	return PANGO_FONT_MAP (xfontmap);
+      if (xftfontmap->display == display &&
+	  xftfontmap->screen == screen) 
+	return PANGO_FONT_MAP (xftfontmap);
 
       tmp_list = tmp_list->next;
     }
@@ -337,11 +129,11 @@ close_display_cb (Display   *display,
   tmp_list = fontmaps;
   while (tmp_list)
     {
-      PangoXftFontMap *xfontmap = tmp_list->data;
+      PangoXftFontMap *xftfontmap = tmp_list->data;
       tmp_list = tmp_list->next;
 
-      if (xfontmap->display == display)
-	pango_xft_shutdown_display (display, xfontmap->screen);
+      if (xftfontmap->display == display)
+	pango_xft_shutdown_display (display, xftfontmap->screen);
     }
 
   registered_displays = g_slist_remove (registered_displays, display);
@@ -384,7 +176,7 @@ pango_xft_get_font_map (Display *display,
 {
   static gboolean registered_modules = FALSE;
   PangoFontMap *fontmap;
-  PangoXftFontMap *xfontmap;
+  PangoXftFontMap *xftfontmap;
 
   g_return_val_if_fail (display != NULL, NULL);
   
@@ -405,34 +197,25 @@ pango_xft_get_font_map (Display *display,
   if (fontmap)
     return fontmap;
   
-  xfontmap = (PangoXftFontMap *)g_object_new (PANGO_TYPE_XFT_FONT_MAP, NULL);
+  xftfontmap = (PangoXftFontMap *)g_object_new (PANGO_TYPE_XFT_FONT_MAP, NULL);
   
-  xfontmap->display = display;
-  xfontmap->screen = screen;
-
-  xfontmap->fonts = g_hash_table_new ((GHashFunc)pango_xft_pattern_hash,
-				      (GEqualFunc)pango_xft_pattern_equal);
-
-  xfontmap->coverage_hash = g_hash_table_new_full ((GHashFunc)pango_xft_coverage_key_hash,
-						   (GEqualFunc)pango_xft_coverage_key_equal,
-						   (GDestroyNotify)g_free,
-						   (GDestroyNotify)pango_coverage_unref);
-  xfontmap->freed_fonts = g_queue_new ();
+  xftfontmap->display = display;
+  xftfontmap->screen = screen;
 
   register_display (display);
 
-  fontmaps = g_slist_prepend (fontmaps, xfontmap);
+  fontmaps = g_slist_prepend (fontmaps, xftfontmap);
 
-  return PANGO_FONT_MAP (xfontmap);
+  return PANGO_FONT_MAP (xftfontmap);
 }
 
 static void
 cleanup_font (gpointer         key,
 	      PangoXftFont    *xfont,
-	      PangoXftFontMap *xfontmap)
+	      PangoXftFontMap *xftfontmap)
 {
   if (xfont->xft_font)
-    XftFontClose (xfontmap->display, xfont->xft_font);
+    XftFontClose (xftfontmap->display, xfont->xft_font);
   
   xfont->fontmap = NULL;
 }
@@ -454,16 +237,17 @@ pango_xft_shutdown_display (Display *display,
   fontmap = pango_xft_find_font_map (display, screen);
   if (fontmap)
     {
-      PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
+      PangoXftFontMap *xftfontmap = PANGO_XFT_FONT_MAP (fontmap);
 	    
       fontmaps = g_slist_remove (fontmaps, fontmap);
-      pango_xft_font_map_cache_clear (xfontmap);
+      pango_fc_font_map_cache_clear (xftfontmap);
       
-      g_hash_table_foreach (xfontmap->fonts, (GHFunc)cleanup_font, fontmap);
-      g_hash_table_destroy (xfontmap->fonts);
-      xfontmap->fonts = NULL;
+      g_hash_table_foreach (xftfontmap->fonts, (GHFunc)cleanup_font, fontmap);
+      g_hash_table_destroy (xftfontmap->fonts);
+      xftfontmap->fonts = NULL;
       
-      xfontmap->display = NULL;
+      xftfontmap->display = NULL;
+      xftfontmap->closed = TRUE;
       g_object_unref (G_OBJECT (fontmap));
     }
 }  
@@ -489,16 +273,16 @@ pango_xft_set_default_substitute (Display                *display,
 				  gpointer                data,
 				  GDestroyNotify          notify)
 {
-  PangoXftFontMap *xfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
+  PangoXftFontMap *xftfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
   
-  if (xfontmap->substitute_destroy)
-    xfontmap->substitute_destroy (xfontmap->substitute_data);
+  if (xftfontmap->substitute_destroy)
+    xftfontmap->substitute_destroy (xftfontmap->substitute_data);
 
-  xfontmap->substitute_func = func;
-  xfontmap->substitute_data = data;
-  xfontmap->substitute_destroy = notify;
+  xftfontmap->substitute_func = func;
+  xftfontmap->substitute_data = data;
+  xftfontmap->substitute_destroy = notify;
   
-  pango_xft_clear_fontset_hash_list (xfontmap);
+  pango_fc_clear_fontset_hash_list (xftfontmap);
 }
 
 /**
@@ -515,9 +299,22 @@ void
 pango_xft_substitute_changed (Display *display,
 			      int      screen)
 {
-  PangoXftFontMap *xfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
+  PangoXftFontMap *xftfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen);
   
-  pango_xft_clear_fontset_hash_list (xfontmap);
+  pango_fc_clear_fontset_hash_list (xftfontmap);
+}
+
+void
+_pango_xft_font_map_get_info (PangoFontMap *fontmap,
+			      Display     **display,
+			      int          *screen)
+{
+  PangoXftFontMap *xftfontmap = PANGO_XFT_FONT_MAP (fontmap);
+
+  if (display)
+    *display = xftfontmap->display;
+  if (screen)
+    *screen = xftfontmap->screen;
 }
 
 /**
@@ -545,719 +342,16 @@ pango_xft_get_context (Display *display,
 }
 
 static void
-pango_xft_font_map_finalize (GObject *object)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (object);
-
-  fontmaps = g_slist_remove (fontmaps, object);
-
-  if (xfontmap->substitute_destroy)
-    xfontmap->substitute_destroy (xfontmap->substitute_data);
-
-  pango_xft_font_map_cache_clear (xfontmap);
-  g_queue_free (xfontmap->freed_fonts);
-  pango_xft_clear_fontset_hash_list (xfontmap);
-  g_hash_table_destroy (xfontmap->coverage_hash);
-
-  if (xfontmap->fonts)
-    g_hash_table_destroy (xfontmap->fonts);
-  
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-/* Add a mapping from xfont->font_pattern to xfont */
-void
-_pango_xft_font_map_add (PangoFontMap *fontmap,
-			 PangoXftFont *xfont)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  g_hash_table_insert (xfontmap->fonts,
-		       xfont->font_pattern,
-		       xfont);
-}
-
-/* Remove mapping from xfont->font_pattern to xfont */
-void
-_pango_xft_font_map_remove (PangoFontMap *fontmap,
-			   PangoXftFont *xfont)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  g_hash_table_remove (xfontmap->fonts,
-		       xfont->font_pattern);
-}
-
-static PangoXftFamily *
-create_family (PangoXftFontMap *xfontmap,
-	       const char      *family_name)
-{
-  PangoXftFamily *family = g_object_new (PANGO_XFT_TYPE_FAMILY, NULL);
-  family->fontmap = xfontmap;
-  family->family_name = g_strdup (family_name);
-
-  return family;
-}
-
-static gboolean
-is_alias_family (const char *family_name)
-{
-  switch (family_name[0])
-    {
-    case 'm':
-    case 'M':
-      return (g_ascii_strcasecmp (family_name, "monospace") == 0);
-    case 's':
-    case 'S':
-      return (g_ascii_strcasecmp (family_name, "sans") == 0 ||
-	      g_ascii_strcasecmp (family_name, "serif") == 0);
-    }
-
-  return FALSE;
-}
-
-static void
-pango_xft_font_map_list_families (PangoFontMap           *fontmap,
-				  PangoFontFamily      ***families,
-				  int                    *n_families)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-  FcFontSet *fontset;
-  int i;
-  int count;
-
-  if (!xfontmap->display)
-    {
-      if (families)
-	*families = NULL;
-      if (n_families)
-	n_families = 0;
-
-      return;
-    }
-
-  if (xfontmap->n_families < 0)
-    {
-      fontset = XftListFonts (xfontmap->display, xfontmap->screen,
-			      NULL,
-			      FC_FAMILY,
-			      NULL);
-
-      xfontmap->families = g_new (PangoXftFamily *, fontset->nfont + 3); /* 3 standard aliases */
-
-      count = 0;
-      for (i = 0; i < fontset->nfont; i++)
-	{
-	  char *s;
-	  FcResult res;
-	  
-	  res = FcPatternGetString (fontset->fonts[i], FC_FAMILY, 0, (FcChar8 **) &s);
-	  g_assert (res == FcResultMatch);
-	  
-	  if (!is_alias_family (s))
-	    xfontmap->families[count++] = create_family (xfontmap, s);
-	}
-
-      FcFontSetDestroy (fontset);
-
-      xfontmap->families[count++] = create_family (xfontmap, "Sans");
-      xfontmap->families[count++] = create_family (xfontmap, "Serif");
-      xfontmap->families[count++] = create_family (xfontmap, "Monospace");
-      
-      xfontmap->n_families = count;
-    }
-
-  if (n_families)
-    *n_families = xfontmap->n_families;
-  
-  if (families)
-    *families = g_memdup (xfontmap->families, xfontmap->n_families * sizeof (PangoFontFamily *));
-}
-
-static int
-pango_xft_convert_weight (PangoWeight pango_weight)
-{
-  int weight;
-  
-  if (pango_weight < (PANGO_WEIGHT_NORMAL + PANGO_WEIGHT_LIGHT) / 2)
-    weight = FC_WEIGHT_LIGHT;
-  else if (pango_weight < (PANGO_WEIGHT_NORMAL + 600) / 2)
-    weight = FC_WEIGHT_MEDIUM;
-  else if (pango_weight < (600 + PANGO_WEIGHT_BOLD) / 2)
-    weight = FC_WEIGHT_DEMIBOLD;
-  else if (pango_weight < (PANGO_WEIGHT_BOLD + PANGO_WEIGHT_ULTRABOLD) / 2)
-    weight = FC_WEIGHT_BOLD;
-  else
-    weight = FC_WEIGHT_BLACK;
-  
-  return weight;
-}
-
-static int
-pango_xft_convert_slant (PangoStyle pango_style)
-{
-  int slant;
-  
-  if (pango_style == PANGO_STYLE_ITALIC)
-    slant = FC_SLANT_ITALIC;
-  else if (pango_style == PANGO_STYLE_OBLIQUE)
-    slant = FC_SLANT_OBLIQUE;
-  else
-    slant = FC_SLANT_ROMAN;
-  
-  return slant;
-}
-
-
-static FcPattern *
-pango_xft_make_pattern (const PangoFontDescription *description)
-{
-  FcPattern *pattern;
-  PangoStyle pango_style;
-  int slant;
-  int weight;
-  char **families;
-  int i;
-
-  pango_style = pango_font_description_get_style (description);
-
-  slant = pango_xft_convert_slant (pango_style);
-  weight = pango_xft_convert_weight (pango_font_description_get_weight (description));
-  
-  pattern = FcPatternBuild (0,
-			     FC_WEIGHT, FcTypeInteger, weight,
-			     FC_SLANT,  FcTypeInteger, slant,
-			     FC_SIZE, FcTypeDouble, (double)pango_font_description_get_size (description)/PANGO_SCALE,
-			     NULL);
-
-  families = g_strsplit (pango_font_description_get_family (description), ",", -1);
-  
-  for (i = 0; families[i]; i++)
-    FcPatternAddString (pattern, FC_FAMILY, families[i]);
-
-  g_strfreev (families);
-
-  return pattern;
-}
-
-static PangoFont *
-pango_xft_font_map_new_font (PangoFontMap  *fontmap,
-			     FcPattern    *match)
-{
-  PangoXftFontMap *xfontmap = (PangoXftFontMap *)fontmap;
-  PangoXftFont *font;
-
-  /* Returning NULL here actually violates a contract
-   * that loading load_font() will never return NULL.
-   * We probably should actually create a dummy
-   * font that doesn't draw anything and has empty
-   * metrics.
-   */
-  if (!xfontmap->display)
-    return NULL;
-  
-  /* Look up cache */
-  font = g_hash_table_lookup (xfontmap->fonts, match);
-  
-  if (font)
-    {
-      g_object_ref (font);
-
-      /* Revive font from cache */
-      if (font->in_cache)
-	pango_xft_font_map_cache_remove (fontmap, font);
-
-      return (PangoFont *)font;
-    }
-
-  FcPatternReference (match);
-  return  (PangoFont *)_pango_xft_font_new (fontmap, match);
-}
-
-static PangoXftPatternSet *
-pango_xft_font_map_get_patterns (PangoFontMap               *fontmap,
-				 PangoContext               *context,
-				 const PangoFontDescription *desc,
-				 PangoLanguage              *language)
-{
-  PangoXftFontMap *xfontmap = (PangoXftFontMap *)fontmap;
-  FcPattern *pattern, *font_pattern;
-  FcResult res;
-  int f;
-  PangoXftPatternSet *patterns;
-  FcFontSet *font_patterns;
-  GHashTable *fontset_hash;
-
-  if (!language && context)
-    language = pango_context_get_language (context);
-  
-  fontset_hash = pango_xft_get_fontset_hash (xfontmap, language);
-  patterns = g_hash_table_lookup (fontset_hash, desc);
-
-  if (patterns == NULL)
-    {
-      pattern = pango_xft_make_pattern (desc);
-      if (language)
-	FcPatternAddString (pattern, FC_LANG, (FcChar8 *) pango_language_to_string (language));
-      
-      FcConfigSubstitute (NULL, pattern, FcMatchPattern);
-      if (xfontmap->substitute_func)
-	xfontmap->substitute_func (pattern, xfontmap->substitute_data);
-      XftDefaultSubstitute (xfontmap->display, xfontmap->screen, pattern);
-
-      font_patterns = FcFontSort (NULL, pattern, FcTrue, 0, &res);
-
-      if (!font_patterns)
-	return NULL;
-
-      patterns = g_new (PangoXftPatternSet, 1);
-      patterns->patterns = g_new (FcPattern *, font_patterns->nfont);
-      patterns->n_patterns = 0;
-
-      for (f = 0; f < font_patterns->nfont; f++)
-      {
-	font_pattern = FcFontRenderPrepare (NULL, pattern,
-					    font_patterns->fonts[f]);
-	
-	if (font_pattern)
-	  patterns->patterns[patterns->n_patterns++] = font_pattern;
-      }
-      
-      FcPatternDestroy (pattern);
-      
-      FcFontSetSortDestroy (font_patterns);
-
-      g_hash_table_insert (fontset_hash,
-			   pango_font_description_copy (desc),
-			   patterns);
-    }
-
-  return patterns;
-}
-
-static PangoFont *
-pango_xft_font_map_load_font (PangoFontMap               *fontmap,
-			      PangoContext               *context,
-			      const PangoFontDescription *description)
-{
-  PangoXftPatternSet *patterns = pango_xft_font_map_get_patterns (fontmap, context, description, NULL);
-  if (!patterns)
-    return NULL;
-
-  if (patterns->n_patterns > 0)
-    return pango_xft_font_map_new_font (fontmap, patterns->patterns[0]);
-  
-  return NULL;
-}
-
-static void
-pango_xft_font_set_free (PangoXftPatternSet *font_set)
-{
-  int i;
-  
-  for (i = 0; i < font_set->n_patterns; i++)
-    FcPatternDestroy (font_set->patterns[i]);
-
-  g_free (font_set);
-}
-
-
-static PangoFontset *
-pango_xft_font_map_load_fontset (PangoFontMap                 *fontmap,
-				 PangoContext                 *context,
-				 const PangoFontDescription   *desc,
-				 PangoLanguage                *language)
-{
-  PangoFontsetSimple *simple;
-  int i;
-  PangoXftPatternSet *patterns = pango_xft_font_map_get_patterns (fontmap, context, desc, language);
-  if (!patterns)
-    return NULL;
-	  
-  simple = pango_fontset_simple_new (language);
-
-  for (i = 0; i < patterns->n_patterns; i++)
-    {
-      PangoFont *font = pango_xft_font_map_new_font (fontmap, patterns->patterns[i]);
-      if (font)
-	pango_fontset_simple_append (simple, font);
-    }
-  
-  return PANGO_FONTSET (simple);
-}
-
-
-void
-_pango_xft_font_map_cache_add (PangoFontMap *fontmap,
-			       PangoXftFont *xfont)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  g_object_ref (G_OBJECT (xfont));
-  g_queue_push_head (xfontmap->freed_fonts, xfont);
-  xfont->in_cache = TRUE;
-
-  if (xfontmap->freed_fonts->length > MAX_FREED_FONTS)
-    {
-      GObject *old_font = g_queue_pop_tail (xfontmap->freed_fonts);
-      g_object_unref (old_font);
-    }
-}
-
-static void
-pango_xft_font_map_cache_remove (PangoFontMap *fontmap,
-				 PangoXftFont *xfont)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  GList *link = g_list_find (xfontmap->freed_fonts->head, xfont);
-  if (link == xfontmap->freed_fonts->tail)
-    {
-      xfontmap->freed_fonts->tail = xfontmap->freed_fonts->tail->prev;
-      if (xfontmap->freed_fonts->tail)
-	xfontmap->freed_fonts->tail->next = NULL;
-    }
-  
-  xfontmap->freed_fonts->head = g_list_delete_link (xfontmap->freed_fonts->head, link);
-  xfontmap->freed_fonts->length--;
-  xfont->in_cache = FALSE;
-
-  g_object_unref (G_OBJECT (xfont));
-}
-
-static void
-pango_xft_font_map_cache_clear (PangoXftFontMap   *xfontmap)
-{
-  g_list_foreach (xfontmap->freed_fonts->head, (GFunc)g_object_unref, NULL);
-  g_list_free (xfontmap->freed_fonts->head);
-  xfontmap->freed_fonts->head = NULL;
-  xfontmap->freed_fonts->tail = NULL;
-  xfontmap->freed_fonts->length = 0;
-}
-
-void
-_pango_xft_font_map_set_coverage (PangoFontMap              *fontmap,
-				  const PangoXftCoverageKey *key,
-				  PangoCoverage             *coverage)
-{
-  PangoXftFontMap     *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-  PangoXftCoverageKey *key_dup;
-
-  key_dup = g_malloc (sizeof (PangoXftCoverageKey) + strlen (key->filename) + 1);
-  key_dup->id = key->id;
-  key_dup->filename = (char *) (key_dup + 1);
-  strcpy (key_dup->filename, key->filename);
-  
-  g_hash_table_insert (xfontmap->coverage_hash,
-		       key_dup, pango_coverage_ref (coverage));
-}
-
-PangoCoverage *
-_pango_xft_font_map_get_coverage (PangoFontMap	      *fontmap,
-				  const PangoXftCoverageKey *key)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  return g_hash_table_lookup (xfontmap->coverage_hash, key);
-}
-
-void
-_pango_xft_font_map_get_info (PangoFontMap *fontmap,
-			      Display     **display,
-			      int          *screen)
-{
-  PangoXftFontMap *xfontmap = PANGO_XFT_FONT_MAP (fontmap);
-
-  if (display)
-    *display = xfontmap->display;
-  if (screen)
-    *screen = xfontmap->screen;
-}
-
-
-/* 
- * PangoXftFace
- */
-
-PangoFontDescription *
-_pango_xft_font_desc_from_pattern (FcPattern *pattern, gboolean include_size)
-{
-  PangoFontDescription *desc;
-  PangoStyle style;
-  PangoWeight weight;
-  double size;
-  
-  char *s;
-  int i;
-
-  desc = pango_font_description_new ();
-
-  g_assert (FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s) == FcResultMatch);
-
-  pango_font_description_set_family (desc, s);
-  
-  if (FcPatternGetInteger (pattern, FC_SLANT, 0, &i) == FcResultMatch)
-    {
-      if (i == FC_SLANT_ROMAN)
-	style = PANGO_STYLE_NORMAL;
-      else if (i == FC_SLANT_OBLIQUE)
-	style = PANGO_STYLE_OBLIQUE;
-      else
-	style = PANGO_STYLE_ITALIC;
-    }
-  else
-    style = PANGO_STYLE_NORMAL;
-
-  pango_font_description_set_style (desc, style);
-
-  if (FcPatternGetInteger (pattern, FC_WEIGHT, 0, &i) == FcResultMatch)
-    { 
-     if (i < FC_WEIGHT_LIGHT)
-	weight = PANGO_WEIGHT_ULTRALIGHT;
-      else if (i < (FC_WEIGHT_LIGHT + FC_WEIGHT_MEDIUM) / 2)
-	weight = PANGO_WEIGHT_LIGHT;
-      else if (i < (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
-	weight = PANGO_WEIGHT_NORMAL;
-      else if (i < (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2)
-	weight = 600;
-      else if (i < (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK) / 2)
-	weight = PANGO_WEIGHT_BOLD;
-      else
-	weight = PANGO_WEIGHT_ULTRABOLD;
-    }
-  else
-    weight = PANGO_WEIGHT_NORMAL;
-
-  if (include_size && FcPatternGetDouble (pattern, FC_SIZE, 0, &size) == FcResultMatch)
-      pango_font_description_set_size (desc, size * PANGO_SCALE);
-  
-  pango_font_description_set_weight (desc, weight);
-  
-  pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
-  pango_font_description_set_stretch (desc, PANGO_STRETCH_NORMAL);
-
-  return desc;
-}
-
-static PangoFontDescription *
-make_alias_description (PangoXftFamily *xfamily,
-			gboolean        bold,
-			gboolean        italic)
-{
-  PangoFontDescription *desc = pango_font_description_new ();
-
-  pango_font_description_set_family (desc, xfamily->family_name);
-  pango_font_description_set_style (desc, italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
-  pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
-  pango_font_description_set_weight (desc, bold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL);
-  pango_font_description_set_stretch (desc, PANGO_STRETCH_NORMAL);
-
-  return desc;
-}
-
-static PangoFontDescription *
-pango_xft_face_describe (PangoFontFace *face)
-{
-  PangoXftFace *xface = PANGO_XFT_FACE (face);
-  PangoXftFamily *xfamily = xface->family;
-  PangoXftFontMap *xfontmap = xfamily->fontmap;
-  PangoFontDescription *desc = NULL;
-  FcResult res;
-  FcPattern *match_pattern;
-  FcPattern *result_pattern;
-
-  if (is_alias_family (xfamily->family_name))
-    {
-      if (strcmp (xface->style, "Regular") == 0)
-	return make_alias_description (xfamily, FALSE, FALSE);
-      else if (strcmp (xface->style, "Bold") == 0)
-	return make_alias_description (xfamily, TRUE, FALSE);
-      else if (strcmp (xface->style, "Italic") == 0)
-	return make_alias_description (xfamily, FALSE, TRUE);
-      else			/* Bold Italic */
-	return make_alias_description (xfamily, TRUE, TRUE);
-    }
-  
-  match_pattern = FcPatternBuild (NULL,
-				  FC_FAMILY, FcTypeString, xfamily->family_name,
-				  FC_STYLE, FcTypeString, xface->style,
-				  NULL);
-
-  g_assert (match_pattern);
-  
-  result_pattern = XftFontMatch (xfontmap->display, xfontmap->screen, match_pattern, &res);
-  if (result_pattern)
-    {
-      desc = _pango_xft_font_desc_from_pattern (result_pattern, FALSE);
-      FcPatternDestroy (result_pattern);
-    }
-
-  FcPatternDestroy (match_pattern);
-  
-  return desc;
-}
-
-static const char *
-pango_xft_face_get_face_name (PangoFontFace *face)
-{
-  PangoXftFace *xface = PANGO_XFT_FACE (face);
-
-  return xface->style;
-}
-
-static void
-pango_xft_face_class_init (PangoFontFaceClass *class)
+pango_fc_do_finalize (PangoXftFontMap *fontmap)
 {
-  class->describe = pango_xft_face_describe;
-  class->get_face_name = pango_xft_face_get_face_name;
-}
-
-GType
-pango_xft_face_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (PangoFontFaceClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) pango_xft_face_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (PangoXftFace),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) NULL,
-      };
-      
-      object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
-                                            "PangoXftFace",
-                                            &object_info, 0);
-    }
-  
-  return object_type;
-}
-
-/*
- * PangoXFontFamily
- */
-static PangoXftFace *
-create_face (PangoXftFamily *xfamily,
-	     const char     *style)
-{
-  PangoXftFace *face = g_object_new (PANGO_XFT_TYPE_FACE, NULL);
-  face->style = g_strdup (style);
-  face->family = xfamily;
-
-  return face;
-}
-
-static void
-pango_xft_family_list_faces (PangoFontFamily  *family,
-			     PangoFontFace  ***faces,
-			     int              *n_faces)
-{
-  PangoXftFamily *xfamily = PANGO_XFT_FAMILY (family);
-  PangoXftFontMap *xfontmap = xfamily->fontmap;
-
-  if (xfamily->n_faces < 0)
-    {
-      FcFontSet *fontset;
-      int i;
-      
-      if (is_alias_family (xfamily->family_name) || !xfontmap->display)
-	{
-	  xfamily->n_faces = 4;
-	  xfamily->faces = g_new (PangoXftFace *, xfamily->n_faces);
-
-	  i = 0;
-	  xfamily->faces[i++] = create_face (xfamily, "Regular");
-	  xfamily->faces[i++] = create_face (xfamily, "Bold");
-	  xfamily->faces[i++] = create_face (xfamily, "Italic");
-	  xfamily->faces[i++] = create_face (xfamily, "Bold Italic");
-	}
-      else
-	{
-	  fontset = XftListFonts (xfontmap->display, xfontmap->screen,
-				  FC_FAMILY, FcTypeString, xfamily->family_name,
-				  NULL,
-				  FC_STYLE,
-				  NULL);
-      
-	  xfamily->n_faces = fontset->nfont;
-	  xfamily->faces = g_new (PangoXftFace *, xfamily->n_faces);
-	  
-	  for (i = 0; i < fontset->nfont; i++)
-	    {
-	      FcChar8 *s;
-	      FcResult res;
-
-	      res = FcPatternGetString (fontset->fonts[i], FC_STYLE, 0, (FcChar8 **) &s);
-	      if (res != FcResultMatch)
-		s = "Regular";
-
-	      xfamily->faces[i] = create_face (xfamily, s);
-	    }
-
-	  FcFontSetDestroy (fontset);
-	}
-    }
-  
-  if (n_faces)
-    *n_faces = xfamily->n_faces;
-  
-  if (faces)
-    *faces = g_memdup (xfamily->faces, xfamily->n_faces * sizeof (PangoFontFace *));
-}
-
-const char *
-pango_xft_family_get_name (PangoFontFamily  *family)
-{
-  PangoXftFamily *xfamily = PANGO_XFT_FAMILY (family);
-
-  return xfamily->family_name;
 }
 
 static void
-pango_xft_family_class_init (PangoFontFamilyClass *class)
+pango_fc_default_substitute (PangoXftFontMap *fontmap,
+			     FcPattern       *pattern)
 {
-  class->list_faces = pango_xft_family_list_faces;
-  class->get_name = pango_xft_family_get_name;
-}
-
-void
-pango_xft_family_init (PangoXftFamily *xfamily)
-{
-  xfamily->n_faces = -1;
-}
-
-GType
-pango_xft_family_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (PangoFontFamilyClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) pango_xft_family_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (PangoXftFamily),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) pango_xft_family_init,
-      };
-      
-      object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
-                                            "PangoXftFamily",
-                                            &object_info, 0);
-    }
-  
-  return object_type;
+  FcConfigSubstitute (NULL, pattern, FcMatchPattern);
+  if (fontmap->substitute_func)
+    fontmap->substitute_func (pattern, fontmap->substitute_data);
+  XftDefaultSubstitute (fontmap->display, fontmap->screen, pattern);
 }