Mercurial > hg > xemacs-beta

comparison src/font-mgr.c @ 4833:4dd2389173fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sun, 10 Jan 2010 01:06:15 -0600
parents 0d3ccd5a2509
children b3ea9c582280
comparison
equal deleted inserted replaced
4832:07fa38c30fdf 4833:4dd2389173fc
258 DEFUN("fc-name-unparse", Ffc_name_unparse, 1, 1, 0, /* 258 DEFUN("fc-name-unparse", Ffc_name_unparse, 1, 1, 0, /*
259 Unparse an fc pattern object to a string. 259 Unparse an fc pattern object to a string.
260 */ 260 */
261 (pattern)) 261 (pattern))
262 { 262 {
263 FcChar8 *name;
264 Lisp_Object result;
263 CHECK_FCPATTERN(pattern); 265 CHECK_FCPATTERN(pattern);
264 return build_fcapi_string (FcNameUnparse (XFCPATTERN_PTR (pattern))); 266 name = FcNameUnparse (XFCPATTERN_PTR (pattern));
267 result = build_fcapi_string (name);
268 xfree (name, FcChar8 *);
269 return result;
265 } 270 }
266 271
267 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /* 272 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /*
268 Make a copy of the fc pattern object PATTERN and return it. 273 Make a copy of the fc pattern object PATTERN and return it.
269 */ 274 */
997 p = XFCPATTERN_PTR(pattern); 1002 p = XFCPATTERN_PTR(pattern);
998 fcc = NILP (config) ? FcConfigGetCurrent () : XFCCONFIG_PTR (config); 1003 fcc = NILP (config) ? FcConfigGetCurrent () : XFCCONFIG_PTR (config);
999 1004
1000 FcConfigSubstitute (fcc, p, FcMatchPattern); 1005 FcConfigSubstitute (fcc, p, FcMatchPattern);
1001 FcDefaultSubstitute (p); 1006 FcDefaultSubstitute (p);
1007 res = FcResultMatch;
1002 res_fcpat->fcpatPtr = FcFontMatch (fcc, p, &res); 1008 res_fcpat->fcpatPtr = FcFontMatch (fcc, p, &res);
1003 1009
1004 if (res_fcpat->fcpatPtr == NULL) 1010 if (res_fcpat->fcpatPtr == NULL)
1005 switch (res) { 1011 switch (res) {
1006 case FcResultNoMatch: 1012 case FcResultNoMatch: