[AC21.5] Mule-ize font truenames in Xft (fixes crash)
APPROVE COMMIT 21.5
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.909
diff -u -U0 -r1.909 ChangeLog
--- src/ChangeLog 20 Dec 2005 22:01:50 -0000 1.909
+++ src/ChangeLog 23 Dec 2005 11:58:37 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-12-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_font_instance_truename): Mule-ize handling of
+ font name (Xft names are UTF-8). Fixes crash.
+
Index: src/objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.31
diff -u -r1.31 objects-x.c
--- src/objects-x.c 20 Dec 2005 22:01:52 -0000 1.31
+++ src/objects-x.c 23 Dec 2005 11:58:44 -0000
＠＠ -807,7 +807,8 ＠＠
FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
if (res)
{
- FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
+ FONT_INSTANCE_TRUENAME (f) =
+ build_ext_string (res, Qxft_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.