xemacs-beta: src/font-mgr.c comparison

comparison src/font-mgr.c @ 5125:b5df3737028a ben-lisp-object

merge

author	Ben Wing <ben@xemacs.org>
date	Wed, 24 Feb 2010 01:58:04 -0600
parents	623d57b7fbe8 3c3c1d139863
children	a9c41067dd88

comparison

equal deleted inserted replaced

-:623d57b7fbe8
+:b5df3737028a
 #include "console-x-impl.h"
 #include "objects-x.h"
 #include "objects-x-impl.h"
 #include "hash.h"
 #include "font-mgr.h"
+#include "sysfile.h"
 /* #### TO DO ####
 . The "x-xft-*" and "x_xft_*" nomenclature is mostly redundant, especially
 if we separate X fonts from Xft fonts, and use fontconfig more generally.
 . We should support the most recent Xft first, old Xft libraries later.
 names.  I suppose that Qnative is the right encoding, the manual
 doesn't say much about this topic.  This functions assumes that STR
 is a Lisp string.
 */
 #define extract_fcapi_string(str) \
-(NEW_LISP_STRING_TO_EXTERNAL ((str), Qfc_font_name_encoding))
+(LISP_STRING_TO_EXTERNAL ((str), Qfc_font_name_encoding))
 #define build_fcapi_string(str) \
-(build_ext_string ((Extbyte *) (str), Qfc_font_name_encoding))
+(build_extstring ((Extbyte *) (str), Qfc_font_name_encoding))
 /* #### This homebrew lashup should be replaced with FcConstants.
 fontconfig assumes that objects (property names) are statically allocated,
 and you will get bizarre results if you pass Lisp string data or strings
 I suspect that using symbol names or even keywords does not provide
 assurance that the string won't move in memory.  So we hash them
 ourselves; hash.c hashtables do not interpret the value pointers.
 This array should be FcChar8**, but GCC 4.x bitches about signedness. */
-static Extbyte *fc_standard_properties[] = {
+static const Extbyte *fc_standard_properties[] = {
 /* treated specially, ordered first */
 "family", "size",
 /* remaining are alphabetized by group */
 /* standard properties in fontconfig and Xft v.2 */
 "antialias", "aspect", "autohint", "charset", "dpi", "file",
 DEFUN("fc-name-unparse", Ffc_name_unparse, 1, 1, 0, /*
 Unparse an fc pattern object to a string.
 */
 (pattern))
 {
+FcChar8 *name;
+Lisp_Object result;
 CHECK_FCPATTERN(pattern);
-return build_fcapi_string (FcNameUnparse (XFCPATTERN_PTR (pattern)));
+name = FcNameUnparse (XFCPATTERN_PTR (pattern));
+result = build_fcapi_string (name);
+xfree (name);
+return result;
 }
 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /*
 Make a copy of the fc pattern object PATTERN and return it.
 */
 Lisp_Object fontlist = Qnil;
 fc_pattern *fcpat;
 /* #### improve this error message */
 if (!fontset)
-Fsignal (Qinvalid_state,
+invalid_state ("failed to create FcFontSet", Qunbound);
-	     list1 (build_string ("failed to create FcFontSet")));
 for (idx = 0; idx < fontset->nfont; ++idx)
 {
 fcpat = XFCPATTERN (ALLOC_LISP_OBJECT (fc_pattern));
 fcpat->fcpatPtr = FcPatternDuplicate (fontset->fonts[idx]);
 fontlist = Fcons (wrap_fcpattern(fcpat), fontlist);
 {
 CHECK_FCCONFIG (config);
 CHECK_STRING (file);
 if (FcConfigAppFontAddFile
 (XFCCONFIG_PTR (config),
-/* #### FIXME! is this really Qnative? */
+/* #### FIXME! is Qfile_name right? */
-(FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL ((file), Qnative)) == FcFalse)
+(FcChar8 *) LISP_STRING_TO_EXTERNAL (file, Qfile_name)) == FcFalse)
 return Qnil;
 else
 return Qt;
 }
 {
 CHECK_FCCONFIG (config);
 CHECK_STRING (dir);
 if (FcConfigAppFontAddDir
 (XFCCONFIG_PTR (config),
-/* #### FIXME! is this really Qnative? */
+/* #### FIXME! is Qfile_name right? */
-(FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL ((dir), Qnative)) == FcFalse)
+(FcChar8 *) LISP_STRING_TO_EXTERNAL (dir, Qfile_name)) == FcFalse)
 return Qnil;
 else
 return Qt;
 }
 refers to a file in the default configuration directory; the
 built-in default directory can be overridden with the
 FC_CONFIG_DIR environment variable. */
 (name))
 {
-char *fcname = "";
+const Ascbyte *fcname = "";
 if (!NILP (name))
 {
 CHECK_STRING (name);
-/* #### FIXME! is this really Qnative? */
+/* #### FIXME! is Qfile_name right? */
-fcname = NEW_LISP_STRING_TO_EXTERNAL (name, Qnative);
+LISP_PATHNAME_CONVERT_OUT (name, fcname);
 }
 return (build_fcapi_string (FcConfigFilename ((FcChar8 *) fcname)));
 }
 DEFUN("fc-init-load-config", Ffc_init_load_config, 0, 0, 0, /*
 {
 FcMatchKind knd;
 /* There ought to be a standard idiom for this.... */
 if (NILP (kind)
-|| EQ (kind, Qfc_match_font)) {
+|| EQ (kind, Qfc_match_font))
 knd = FcMatchFont;
-}
+else if (EQ (kind, Qfc_match_pattern))
-else if (EQ (kind, Qfc_match_pattern)) {
 knd = FcMatchPattern;
-}
+else
-else {
+wtaerror ("need `fc-match-pattern' or `fc-match-font'", kind);
-Fsignal (Qwrong_type_argument,
-	     list2 (build_string ("need `fc-match-pattern' or `fc-match-font'"),
-		    kind));
-}
 /* Typecheck arguments */
 CHECK_FCPATTERN (pattern);
 if (!NILP (testpat)) CHECK_FCPATTERN (testpat);
 if (!NILP (config))  CHECK_FCCONFIG (config);
 p = XFCPATTERN_PTR(pattern);
 fcc = NILP (config) ? FcConfigGetCurrent () : XFCCONFIG_PTR (config);
 FcConfigSubstitute (fcc, p, FcMatchPattern);
 FcDefaultSubstitute (p);
+res = FcResultMatch;
 res_fcpat->fcpatPtr = FcFontMatch (fcc, p, &res);
 if (res_fcpat->fcpatPtr == NULL)
 switch (res) {
 case FcResultNoMatch:
 {
 struct gcpro gcpro1;
 unsigned i;
 Lisp_Object reg = Qnil;
 const Extbyte *re[] = 	/* #### This could just be catenated by
-				   cpp and passed to build_ext_string. */
+				   cpp and passed to build_extstring. */
 {
 /* Regular expression matching XLFDs as defined by XLFD v. 1.5.
 	 Matches must be case-insensitive.
 	 PSIZE is a pixel or point size, which may be a "matrix".  The
 	 syntax of a matrix is not checked, just some lexical properties.
 GCPRO1 (reg);
 for (i = 0; i < sizeof(re)/sizeof(Extbyte *); i++)
 {
 /* #### Currently this is Host Portable Coding, not ISO 8859-1. */
-reg = concat2(reg, build_ext_string (re[i], Qx_font_name_encoding));
+reg = concat2(reg, build_extstring (re[i], Qx_font_name_encoding));
 }
 RETURN_UNGCPRO (reg);
 }
 #undef XE_XLFD_SEPARATOR

Mercurial > hg > xemacs-beta

comparison src/font-mgr.c @ 5125:b5df3737028a ben-lisp-object