Attachment 54199 Details for Bug 128354

[patch] An optimized patch.

pango-localized-fontname-new.diff (text/plain), 3.15 KB, created by Zhe Su on 2005-10-15 05:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-10-15 05:40:27 UTC

Size: 3.15 KB

patch

obsolete

>--- pango/pangofc-fontmap.c.old	2005-10-14 15:49:27.000000000 +0800
>+++ pango/pangofc-fontmap.c	2005-10-15 13:23:25.000000000 +0800
>@@ -23,6 +23,8 @@
> #define FONTSET_CACHE_SIZE 16
> 
> #include <math.h>
>+#include <locale.h>
>+#include <glib.h>
> 
> #include "pango-context.h"
> #include "pangofc-fontmap.h"
>@@ -621,6 +623,47 @@
>   return FALSE;
> }
> 
>+#if defined (FC_FAMILYLANG) || defined (FC_STYLELANG)
>+static const char *
>+get_current_language_tag ()
>+{
>+  static char tag [6] = "en";
>+  int i;
>+
>+  char *locale = setlocale (LC_CTYPE, 0);
>+
>+  if (locale)
>+    {
>+      g_strlcpy (tag, locale, 6);
>+
>+      for (i = 0; i < 6; ++i)
>+	{
>+	  if (tag [i] == '_') tag [i] = '-';
>+	  else if (tag [i] == '.' || tag [i] == '@') { tag [i] = 0; break; }
>+	  else tag [i] = g_ascii_tolower (tag [i]);
>+	}
>+    }
>+
>+  return tag;
>+}
>+
>+static FcResult 
>+get_pattern_string_for_language (FcPattern *p, const char *language, const char *obj, const char *objlang, FcChar8 **s)
>+{
>+  int i, idx=0;
>+  FcChar8 *lang;
>+
>+  for (i = 1; FcPatternGetString (p, objlang, i, &lang) == FcResultMatch; ++i)
>+    if (strncmp ((const char*) language, (const char*) lang, strlen ((const char*)lang)) == 0)
>+      {
>+	idx = i;
>+	break;
>+      }
>+
>+  return FcPatternGetString (p, obj, idx, s);
>+}
>+#endif
>+
> static void
> pango_fc_font_map_list_families (PangoFontMap      *fontmap,
> 				 PangoFontFamily ***families,
>@@ -644,8 +687,14 @@
> 
>   if (priv->n_families < 0)
>     {
>+#ifdef FC_FAMILYLANG
>+      FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_FAMILYLANG, FC_SPACING, NULL);
>+      const char *language = get_current_language_tag ();
>+#else
>       FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_SPACING, NULL);
>+#endif
>       FcPattern *pat = FcPatternCreate ();
>+
>       /* use hash table to avoid duplicate listings if different faces in
>        * the same family have different spacing values */
>       GHashTable *temp_family_hash;
>@@ -664,8 +713,12 @@
> 	  FcChar8 *s;
> 	  FcResult res;
>           int spacing;
>-	  
>+
>+#ifdef FC_FAMILYLANG
>+	  res = get_pattern_string_for_language (fontset->fonts[i], language, FC_FAMILY, FC_FAMILYLANG, &s);
>+#else
> 	  res = FcPatternGetString (fontset->fonts[i], FC_FAMILY, 0, (FcChar8 **) &s);
>+#endif
> 	  g_assert (res == FcResultMatch);
> 
>           res = FcPatternGetInteger (fontset->fonts[i], FC_SPACING, 0, &spacing);
>@@ -1689,7 +1742,7 @@
> 				  NULL);
> 
>   g_assert (match_pattern);
>-  
>+
>   result_pattern = FcFontMatch (NULL, match_pattern, &res);
>   if (result_pattern)
>     {
>@@ -1887,7 +1940,12 @@
> 	}
>       else
> 	{
>+#ifdef FC_STYLELANG
>+	  FcObjectSet *os = FcObjectSetBuild (FC_STYLE, FC_STYLELANG, NULL);
>+	  const char *language = get_current_language_tag ();
>+#else
> 	  FcObjectSet *os = FcObjectSetBuild (FC_STYLE, NULL);
>+#endif
> 	  FcPattern *pat = FcPatternBuild (NULL, 
> 					   FC_FAMILY, FcTypeString, fcfamily->family_name,
> 					   NULL);
>@@ -1905,7 +1963,12 @@
> 	      FcChar8 *s;
> 	      FcResult res;
> 
>+#ifdef FC_STYLELANG
>+	      res = get_pattern_string_for_language (fontset->fonts[i], language, FC_STYLE, FC_STYLELANG, &s);
>+#else
> 	      res = FcPatternGetString (fontset->fonts[i], FC_STYLE, 0, &s);
>+#endif
>+
> 	      if (res != FcResultMatch)
> 		s = "Regular";
>

Actions: View | Diff

Attachments on bug 128354: 54050 | 54199 | 54200