From fa6c14948494c1b97a138de289e04ca87ccc0454 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 21 Jun 2006 12:42:20 +0000
Subject: [PATCH] (xfont_driver): Initialize with xfont_list_family_names.
 (xfont_list_family_names): New function. (xft_driver):
 Initialize with NULL for list_family_names member.
 (device_init): Set list_family_names member of xft_driver
 to that of mfont__ft_driver.

---
 src/m17n-X.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/m17n-X.c b/src/m17n-X.c
index 83df642..ae0d2ab 100644
--- a/src/m17n-X.c
+++ b/src/m17n-X.c
@@ -443,12 +443,13 @@ static unsigned xfont_encode_char (MFrame *, MFont *, MFont *, unsigned);
 static void xfont_render (MDrawWindow, int, int, MGlyphString *,
 			  MGlyph *, MGlyph *, int, MDrawRegion);
 static int xfont_list (MFrame *, MPlist *, MFont *, int);
+static void xfont_list_family_names (MFrame *, MPlist *);
 static int xfont_check_capability (MRealizedFont *rfont, MSymbol capability);
 
 static MFontDriver xfont_driver =
   { xfont_select, xfont_open,
     xfont_find_metric, xfont_has_char, xfont_encode_char,
-    xfont_render, xfont_list, xfont_check_capability };
+    xfont_render, xfont_list, xfont_list_family_names, xfont_check_capability };
 
 static int
 font_compare (const void *p1, const void *p2)
@@ -1004,6 +1005,48 @@ xfont_list (MFrame *frame, MPlist *plist, MFont *font, int maxnum)
   return num;
 }
 
+static void
+xfont_list_family_names (MFrame *frame, MPlist *plist)
+{
+  MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info;
+  char **font_names, **names;
+  int i, nfonts;
+  MSymbol last_family = Mnil;
+
+  font_names = XListFonts (disp_info->display,
+			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*", 0x8000, &nfonts);
+  for (i = 0; i < nfonts; i++)
+    {
+      MSymbol family;
+      char *foundry, *fam;
+      MPlist *p;
+      
+      if (sscanf (font_names[i], "-%s-%s-", &foundry, &fam) < 2)
+	continue;
+      family = msymbol (fam);
+      if (family == last_family)
+	continue;
+      last_family = family;
+
+      MPLIST_DO (p, plist)
+	{
+	  MSymbol sym = MPLIST_SYMBOL (p);
+
+	  if (sym == family)
+	    break;
+	  if (strcmp (MSYMBOL_NAME (sym), fam) > 0)
+	    {
+	      mplist_push (p, Msymbol, family);
+	      break;
+	    }
+	}
+      if (MPLIST_TAIL_P (p))
+	mplist_push (p, Msymbol, family);
+    }
+  if (font_names)
+    XFreeFontNames (font_names);
+}
+
 static int 
 xfont_check_capability (MRealizedFont *rfont, MSymbol capability)
 {
@@ -1040,7 +1083,7 @@ static int xft_check_capability (MRealizedFont *rfont, MSymbol capability);
 
 MFontDriver xft_driver =
   { NULL, xft_open,
-    xft_find_metric, xft_has_char, xft_encode_char, xft_render, NULL,
+    xft_find_metric, xft_has_char, xft_encode_char, xft_render, NULL, NULL,
     xft_check_capability
   };
 
@@ -2031,6 +2074,7 @@ device_init ()
 #ifdef HAVE_XFT2
   xft_driver.select = mfont__ft_driver.select;
   xft_driver.list = mfont__ft_driver.list;
+  xft_driver.list_family_names = mfont__ft_driver.list_family_names;
 #endif
 
   Mxim = msymbol ("xim");
-- 
1.7.10.4