Load a fontset and return the first font to take advantage of existing

2005-07-21  Owen Taylor  <otaylor@redhat.com>

        * pango/pangofc-fontmap.c (pango_fc_font_map_load_font): Load a
        fontset and return the first font to take advantage of existing
        caching.

1 files changed, 28 insertions, 7 deletions

diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index a6436f49..d614e4e7 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1141,22 +1141,43 @@ pango_fc_font_map_get_patterns (PangoFontMap               *fontmap,
   return patterns;
 }
 
+static gboolean
+get_first_font (PangoFontset  *fontset,
+		PangoFont     *font,
+		gpointer       data)
+{
+  *(PangoFont **)data = font;
+  
+  return TRUE;
+}
+
 static PangoFont *
 pango_fc_font_map_load_font (PangoFontMap               *fontmap,
 			     PangoContext               *context,
 			     const PangoFontDescription *description)
 {
-  PangoFcPatternSet *patterns = pango_fc_font_map_get_patterns (fontmap, context, description, NULL);
-  if (!patterns)
-    return NULL;
+  PangoLanguage *language;
+  PangoFontset *fontset;
+  PangoFont *font = NULL;
+
+  if (context)
+    language = pango_context_get_language (context);
+  else
+    language = NULL;
 
-  if (patterns->n_patterns > 0)
+  fontset = pango_font_map_load_fontset (fontmap, context, description, language);
+
+  if (fontset)
     {
-      return pango_fc_font_map_new_font (fontmap, context, description,
-					 patterns->patterns[0]);
+      pango_fontset_foreach (fontset, get_first_font, &font);
+
+      if (font)
+	g_object_ref (font);
+  
+      g_object_unref (fontset);
     }
   
-  return NULL;
+  return font;
 }
 
 static void