From: handa <handa>
Date: Fri, 13 Aug 2004 11:31:31 +0000 (+0000)
Subject: (xfont_open): Set type and fontp members.
X-Git-Tag: REL-1-1-0~18
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c32d4a4f6b8c5660988cbdf78ebb503d9e58d36b;p=m17n%2Fm17n-lib.git

(xfont_open): Set type and fontp members.
(xft_open): Likewise.
---

diff --git a/src/m17n-X.c b/src/m17n-X.c
index 36b317b..779ffca 100644
--- a/src/m17n-X.c
+++ b/src/m17n-X.c
@@ -607,6 +607,8 @@ xfont_open (MRealizedFont *rfont)
   rfont->status = 1;
   rfont->ascent = xfont_info->xfont->ascent;
   rfont->descent = xfont_info->xfont->descent;
+  rfont->type = Mx;
+  rfont->fontp = xfont_info->xfont;
   return 0;
 }
 
@@ -902,7 +904,11 @@ xft_open (MRealizedFont *rfont)
     {
       font_info->font_no_aa = xft_open_font (frame, ft_info, size, 0);
       if (font_info->font_no_aa)
-	return 0;
+	{
+	  rfont->type = Mxft;
+	  rfont->fontp = font_info->font_no_aa;
+	  return 0;
+	}
       XftFontClose (FRAME_DISPLAY (rfont->frame), font_info->font_aa);
     }
   free (font_info);