Mercurial > hg > xemacs-beta
annotate src/font-mgr.h @ 5327:d1b17a33450b
Move the heavy lifting from cl-seq.el to C.
src/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
Move the heavy lifting from cl-seq.el to C, finally making those
functions first-class XEmacs citizens, with circularity checking,
built-in support for tests other than #'eql, and as much
compatibility with current Common Lisp as Paul Dietz' tests require.
* fns.c (check_eq_nokey, check_eq_key, check_eql_nokey)
(check_eql_key, check_equal_nokey, check_equal_key)
(check_equalp_nokey, check_equalp_key, check_string_match_nokey)
(check_string_match_key, check_other_nokey, check_other_key)
(check_if_nokey, check_if_key, check_match_eq_key)
(check_match_eql_key, check_match_equal_key)
(check_match_equalp_key, check_match_other_key): New. These are
basically to provide function pointers to be used by Lisp
functions that take TEST, TEST-NOT and KEY arguments.
(get_check_match_function_1, get_check_test_function)
(get_check_match_function): These functions work out which of the
previous list of functions to use, given the keywords supplied by
the user.
(count_with_tail): New. This is the bones of #'count.
(list_count_from_end, string_count_from_end): Utility functions
for #'count.
(Fcount): New, moved from cl-seq.el.
(list_position_cons_before): New. The implementation of #'member*,
and important in implementing various other functions.
(FmemberX, Fadjoin, FassocX, FrassocX, Fposition, Ffind)
(FdeleteX, FremoveX, Fdelete_duplicates, Fremove_duplicates)
(Fnsubstitute, Fsubstitute, Fsublis, Fnsublis, Fsubst, Fnsubst)
(Ftree_equal, Fmismatch, Fsearch, Fintersection, Fnintersection)
(Fsubsetp, Fset_difference, Fnset_difference, Fnunion, Funion)
(Fset_exclusive_or, Fnset_exclusive_or): New, moved here from
cl-seq.el.
(position): New. The implementation of #'find and #'position.
(list_delete_duplicates_from_end, subst, sublis, nsublis)
(tree_equal, mismatch_from_end, mismatch_list_list)
(mismatch_list_string, mismatch_list_array)
(mismatch_string_array, mismatch_string_string)
(mismatch_array_array, get_mismatch_func): Helper C functions for
the Lisp-visible functions.
(venn, nvenn): New. The implementation of the main Lisp functions that
treat lists as sets.
lisp/ChangeLog addition:
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 30 Dec 2010 01:59:52 +0000 |
parents | a9c41067dd88 |
children | 308d34e9f07d |
rev | line source |
---|---|
3354 | 1 /* Lisp font data structures for X and Xft. |
2 | |
3 Copyright (C) 2003 Eric Knauel and Matthias Neubauer | |
4 Copyright (C) 2005 Eric Knauel | |
5 Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
6 | |
7 Authors: Eric Knauel <knauel@informatik.uni-tuebingen.de> | |
8 Matthias Neubauer <neubauer@informatik.uni-freiburg.de> | |
9 Stephen J. Turnbull <stephen@xemacs.org> | |
10 Created: 27 Oct 2003 | |
11 Updated: 05 Mar 2005 by Stephen J. Turnbull | |
12 | |
13 This file is part of XEmacs. | |
14 | |
15 XEmacs is free software; you can redistribute it and/or modify it | |
16 under the terms of the GNU General Public License as published by the | |
17 Free Software Foundation; either version 2, or (at your option) any | |
18 later version. | |
19 | |
20 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
21 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
22 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
23 for more details. | |
24 | |
25 You should have received a copy of the GNU General Public License | |
26 along with XEmacs; see the file COPYING. If not, write to | |
27 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
28 Boston, MA 02111-1307, USA. */ | |
29 | |
30 /* Synched up with: Not in GNU Emacs. */ | |
31 | |
32 /* This module provides the Lisp interface to fonts in X11, including Xft, | |
33 but (at least at first) not GTK+ or Qt. | |
34 | |
35 It should be renamed to fonts-x.h. | |
36 | |
37 Sealevel code should be in ../lwlib/lwlib-fonts.h or | |
38 ../lwlib/lwlib-colors.h. | |
39 */ | |
40 | |
41 | |
42 #ifndef INCLUDED_font_mgr_h_ | |
43 #define INCLUDED_font_mgr_h_ | |
44 | |
45 #include "../lwlib/lwlib-fonts.h" | |
46 #include "../lwlib/lwlib-colors.h" | |
47 | |
48 extern Fixnum debug_xft; | |
49 | |
50 /* Standard for fontconfig. Use a macro to show we're not guessing. */ | |
3360 | 51 #define Qfc_font_name_encoding Qutf_8 |
3354 | 52 |
53 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) | |
54 | |
55 struct fc_pattern | |
56 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
57 NORMAL_LISP_OBJECT_HEADER header; |
3354 | 58 FcPattern *fcpatPtr; |
59 }; | |
60 | |
61 typedef struct fc_pattern fc_pattern; | |
62 | |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
63 DECLARE_LISP_OBJECT(fc_pattern, struct fc_pattern); |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
64 #define XFC_PATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
65 #define wrap_fc_pattern(p) wrap_record (p, fc_pattern) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
66 #define FC_PATTERNP(x) RECORDP (x, fc_pattern) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
67 #define CHECK_FC_PATTERN(x) CHECK_RECORD (x, fc_pattern) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
68 #define CONCHECK_FC_PATTERN(x) CONCHECK_RECORD (x, fc_pattern) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
69 #define XFC_PATTERN_PTR(x) (XFC_PATTERN(x)->fcpatPtr) |
3354 | 70 |
3931 | 71 #define FONTCONFIG_EXPOSE_CONFIG |
72 #ifdef FONTCONFIG_EXPOSE_CONFIG | |
73 | |
74 struct fc_config | |
75 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
76 NORMAL_LISP_OBJECT_HEADER header; |
3931 | 77 FcConfig *fccfgPtr; |
78 }; | |
79 | |
80 typedef struct fc_config fc_config; | |
81 | |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
82 DECLARE_LISP_OBJECT(fc_config, struct fc_config); |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
83 #define XFC_CONFIG(x) XRECORD (x, fc_config, struct fc_config) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
84 #define wrap_fc_config(p) wrap_record (p, fc_config) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
85 #define FC_CONFIGP(x) RECORDP (x, fc_config) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
86 #define CHECK_FC_CONFIG(x) CHECK_RECORD (x, fc_config) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
87 #define CONCHECK_FC_CONFIG(x) CONCHECK_RECORD (x, fc_config) |
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
88 #define XFC_CONFIG_PTR(x) (XFC_CONFIG(x)->fccfgPtr) |
3931 | 89 |
90 #endif /* FONTCONFIG_EXPOSE_CONFIG */ | |
91 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
92 #ifdef HAVE_XFT |
4328
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
93 |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
94 #ifndef HAVE_FCCONFIGGETRESCANINTERVAL |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
95 /* Older fontconfig versions misspell this function name. */ |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
96 #define FcConfigGetRescanInterval FcConfigGetRescanInverval |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
97 #endif /* */ |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
98 |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
99 #ifndef HAVE_FCCONFIGSETRESCANINTERVAL |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
100 /* Older fontconfig versions misspell this function name. */ |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
101 #define FcConfigSetRescanInterval FcConfigSetRescanInverval |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
102 #endif /* */ |
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
103 |
3666 | 104 /* |
105 The format of a fontname (as returned by fontconfig) is not well-documented, | |
106 But the character repertoire is represented in an ASCII-compatible way. See | |
107 fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. | |
108 | |
109 Currently we have a hack where different versions of the unparsed name are | |
110 used in different contexts fairly arbitrarily. I don't think this is close | |
111 to coherency; even without the charset and lang properties fontconfig names | |
112 are too unwieldy to use. We need to rethink the approach here. I think | |
113 probably Lisp_Font_Instance.name should contain the font name as specified | |
114 to Lisp (almost surely much shorter than shortname, even, and most likely | |
115 wildcarded), while Lisp_Font_Instance.truename should contain the longname. | |
116 For now, I'm going to #ifdef the return values defaulting to short. -- sjt | |
117 */ | |
118 | |
119 /* DEBUGGING STUFF */ | |
120 | |
121 /* print message to stderr: one internal-format string argument */ | |
122 #define DEBUG_XFT0(level,s) \ | |
123 if (debug_xft > level) stderr_out (s) | |
124 | |
125 /* print message to stderr: one formatted argument */ | |
126 #define DEBUG_XFT1(level,format,x1) \ | |
127 if (debug_xft > level) stderr_out (format, x1) | |
128 | |
129 /* print message to stderr: two formatted arguments */ | |
130 #define DEBUG_XFT2(level,format,x1,x2) \ | |
131 if (debug_xft > level) stderr_out (format, x1, x2) | |
132 | |
133 /* print message to stderr: three formatted arguments */ | |
134 #define DEBUG_XFT3(level,format,x1,x2,x3) \ | |
135 if (debug_xft > level) stderr_out (format, x1, x2, x3) | |
136 | |
137 /* print message to stderr: four formatted arguments */ | |
138 #define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ | |
139 if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) | |
140 | |
141 /* print an Xft pattern to stderr | |
142 LEVEL is the debug level (to compare to debug_xft) | |
143 FORMAT is a newline-terminated printf format with one %s for the pattern | |
144 and must be internal format (eg, pure ASCII) | |
145 PATTERN is an FcPattern *. */ | |
146 #define PRINT_XFT_PATTERN(level,format,pattern) \ | |
147 do { \ | |
148 DECLARE_EISTRING (eistrpxft_name); \ | |
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
149 Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ |
3666 | 150 \ |
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
151 eicpy_ext(eistrpxft_name, \ |
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
152 name ? name : "FONT WITH NULL NAME", \ |
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4328
diff
changeset
|
153 Qfc_font_name_encoding); \ |
3666 | 154 DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ |
155 free (name); \ | |
156 } while (0) | |
157 | |
158 /* print a progress message | |
159 LEVEL is the debug level (to compare to debug_xft) | |
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
160 FONT is the Xft font name in Mule internal encoding (from an eistring). |
3666 | 161 LANG is the language being checked for support (must be ASCII). */ |
162 #define CHECKING_LANG(level,font,lang) \ | |
163 do { \ | |
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
164 DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ |
3666 | 165 } while (0) |
166 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
167 #else /* HAVE_XFT */ |
3666 | 168 |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4758
diff
changeset
|
169 #endif /* HAVE_XFT */ |
3666 | 170 |
3354 | 171 #endif /* INCLUDED_font_mgr_h_ */ |