Mercurial > emacs
annotate src/xfaces.c @ 83247:a257c9edb57b
README updates. (Reported by Xavier Mallard)
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-287
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 04 Feb 2005 14:06:45 +0000 |
parents | a464201fbd10 |
children | 86457de2420c |
rev | line source |
---|---|
24995 | 1 /* xfaces.c -- "Face" primitives. |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004 |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
3 Free Software Foundation. |
2342 | 4 |
2336 | 5 This file is part of GNU Emacs. |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
2342 | 9 the Free Software Foundation; either version 2, or (at your option) |
2336 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14090
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14090
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
2336 | 21 |
24995 | 22 /* New face implementation by Gerd Moellmann <gerd@gnu.org>. */ |
23 | |
24 /* Faces. | |
25 | |
26 When using Emacs with X, the display style of characters can be | |
27 changed by defining `faces'. Each face can specify the following | |
28 display attributes: | |
29 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
30 1. Font family name. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
31 |
24995 | 32 2. Relative proportionate width, aka character set width or set |
33 width (swidth), e.g. `semi-compressed'. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
34 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
35 3. Font height in 1/10pt. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
36 |
24995 | 37 4. Font weight, e.g. `bold'. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
38 |
24995 | 39 5. Font slant, e.g. `italic'. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
40 |
24995 | 41 6. Foreground color. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
42 |
24995 | 43 7. Background color. |
44 | |
45 8. Whether or not characters should be underlined, and in what color. | |
46 | |
47 9. Whether or not characters should be displayed in inverse video. | |
48 | |
49 10. A background stipple, a bitmap. | |
50 | |
51 11. Whether or not characters should be overlined, and in what color. | |
52 | |
53 12. Whether or not characters should be strike-through, and in what | |
54 color. | |
55 | |
56 13. Whether or not a box should be drawn around characters, the box | |
57 type, and, for simple boxes, in what color. | |
58 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
59 14. Font or fontset pattern, or nil. This is a special attribute. |
36946 | 60 When this attribute is specified, the face uses a font opened by |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
61 that pattern as is. In addition, all the other font-related |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
62 attributes (1st thru 5th) are generated from the opened font name. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
63 On the other hand, if one of the other font-related attributes are |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
64 specified, this attribute is set to nil. In that case, the face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
65 doesn't inherit this attribute from the `default' face, and uses a |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
66 font determined by the other attributes (those may be inherited |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
67 from the `default' face). |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
68 |
31178 | 69 15. A face name or list of face names from which to inherit attributes. |
70 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
71 16. A specified average font width, which is invisible from Lisp, |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
72 and is used to ensure that a font specified on the command line, |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
73 for example, can be matched exactly. |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
74 |
24995 | 75 Faces are frame-local by nature because Emacs allows to define the |
76 same named face (face names are symbols) differently for different | |
77 frames. Each frame has an alist of face definitions for all named | |
78 faces. The value of a named face in such an alist is a Lisp vector | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
79 with the symbol `face' in slot 0, and a slot for each of the face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
80 attributes mentioned above. |
24995 | 81 |
82 There is also a global face alist `Vface_new_frame_defaults'. Face | |
83 definitions from this list are used to initialize faces of newly | |
84 created frames. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
85 |
24995 | 86 A face doesn't have to specify all attributes. Those not specified |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
87 have a value of `unspecified'. Faces specifying all attributes but |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
88 the 14th are called `fully-specified'. |
24995 | 89 |
90 | |
91 Face merging. | |
92 | |
93 The display style of a given character in the text is determined by | |
94 combining several faces. This process is called `face merging'. | |
95 Any aspect of the display style that isn't specified by overlays or | |
96 text properties is taken from the `default' face. Since it is made | |
97 sure that the default face is always fully-specified, face merging | |
98 always results in a fully-specified face. | |
99 | |
100 | |
101 Face realization. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
102 |
24995 | 103 After all face attributes for a character have been determined by |
104 merging faces of that character, that face is `realized'. The | |
105 realization process maps face attributes to what is physically | |
106 available on the system where Emacs runs. The result is a | |
107 `realized face' in form of a struct face which is stored in the | |
108 face cache of the frame on which it was realized. | |
109 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
110 Face realization is done in the context of the character to display |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
111 because different fonts may be used for different characters. In |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
112 other words, for characters that have different font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
113 specifications, different realized faces are needed to display |
24995 | 114 them. |
115 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
116 Font specification is done by fontsets. See the comment in |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
117 fontset.c for the details. In the current implementation, all ASCII |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
118 characters share the same font in a fontset. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
119 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
120 Faces are at first realized for ASCII characters, and, at that |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
121 time, assigned a specific realized fontset. Hereafter, we call |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
122 such a face as `ASCII face'. When a face for a multibyte character |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
123 is realized, it inherits (thus shares) a fontset of an ASCII face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
124 that has the same attributes other than font-related ones. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
125 |
36946 | 126 Thus, all realized face have a realized fontset. |
24995 | 127 |
128 | |
129 Unibyte text. | |
130 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
131 Unibyte text (i.e. raw 8-bit characters) is displayed with the same |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
132 font as ASCII characters. That is because it is expected that |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
133 unibyte text users specify a font that is suitable both for ASCII |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
134 and raw 8-bit characters. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
135 |
24995 | 136 |
137 Font selection. | |
138 | |
139 Font selection tries to find the best available matching font for a | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
140 given (character, face) combination. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
141 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
142 If the face specifies a fontset name, that fontset determines a |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
143 pattern for fonts of the given character. If the face specifies a |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
144 font name or the other font-related attributes, a fontset is |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
145 realized from the default fontset. In that case, that |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
146 specification determines a pattern for ASCII characters and the |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
147 default fontset determines a pattern for multibyte characters. |
24995 | 148 |
149 Available fonts on the system on which Emacs runs are then matched | |
150 against the font pattern. The result of font selection is the best | |
151 match for the given face attributes in this font list. | |
152 | |
153 Font selection can be influenced by the user. | |
154 | |
155 1. The user can specify the relative importance he gives the face | |
156 attributes width, height, weight, and slant by setting | |
157 face-font-selection-order (faces.el) to a list of face attribute | |
158 names. The default is '(:width :height :weight :slant), and means | |
159 that font selection first tries to find a good match for the font | |
160 width specified by a face, then---within fonts with that | |
161 width---tries to find a best match for the specified font height, | |
162 etc. | |
163 | |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
164 2. Setting face-font-family-alternatives allows the user to |
24995 | 165 specify alternative font families to try if a family specified by a |
166 face doesn't exist. | |
167 | |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
168 3. Setting face-font-registry-alternatives allows the user to |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
169 specify all alternative font registries to try for a face |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
170 specifying a registry. |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
171 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
172 4. Setting face-ignored-fonts allows the user to ignore specific |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
173 fonts. |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
174 |
24995 | 175 |
36946 | 176 Character composition. |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
177 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
178 Usually, the realization process is already finished when Emacs |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
179 actually reflects the desired glyph matrix on the screen. However, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
180 on displaying a composition (sequence of characters to be composed |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
181 on the screen), a suitable font for the components of the |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
182 composition is selected and realized while drawing them on the |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
183 screen, i.e. the realization process is delayed but in principle |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
184 the same. |
24995 | 185 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
186 |
24995 | 187 Initialization of basic faces. |
188 | |
189 The faces `default', `modeline' are considered `basic faces'. | |
190 When redisplay happens the first time for a newly created frame, | |
191 basic faces are realized for CHARSET_ASCII. Frame parameters are | |
192 used to fill in unspecified attributes of the default face. */ | |
193 | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25890
diff
changeset
|
194 #include <config.h> |
53901
d85f8f2e71f7
Move include stdio.h to same place as in other files.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53354
diff
changeset
|
195 #include <stdio.h> |
2336 | 196 #include <sys/types.h> |
197 #include <sys/stat.h> | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
198 #include <stdio.h> /* This needs to be before termchar.h */ |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
199 |
2336 | 200 #include "lisp.h" |
17047 | 201 #include "charset.h" |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
202 #include "keyboard.h" |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
203 #include "frame.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
204 #include "termhooks.h" |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
205 |
29897
cd1bb44e646d
Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
Dave Love <fx@gnu.org>
parents:
29768
diff
changeset
|
206 #ifdef HAVE_WINDOW_SYSTEM |
cd1bb44e646d
Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
Dave Love <fx@gnu.org>
parents:
29768
diff
changeset
|
207 #include "fontset.h" |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
208 #endif /* HAVE_WINDOW_SYSTEM */ |
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
209 |
9572 | 210 #ifdef HAVE_X_WINDOWS |
2336 | 211 #include "xterm.h" |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
212 #ifdef USE_MOTIF |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
213 #include <Xm/Xm.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
214 #include <Xm/XmStrDefs.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
215 #endif /* USE_MOTIF */ |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
216 #endif /* HAVE_X_WINDOWS */ |
24995 | 217 |
9572 | 218 #ifdef MSDOS |
219 #include "dosfns.h" | |
220 #endif | |
24995 | 221 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
222 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
223 #include "w32term.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
224 #include "fontset.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
225 /* Redefine X specifics to W32 equivalents to avoid cluttering the |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
226 code with #ifdef blocks. */ |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
227 #undef FRAME_X_DISPLAY_INFO |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
228 #define FRAME_X_DISPLAY_INFO FRAME_W32_DISPLAY_INFO |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
229 #define x_display_info w32_display_info |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
230 #define FRAME_X_FONT_TABLE FRAME_W32_FONT_TABLE |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
231 #define check_x check_w32 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
232 #define x_list_fonts w32_list_fonts |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
233 #define GCGraphicsExposures 0 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
234 #endif /* WINDOWSNT */ |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
235 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
236 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
237 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
238 #define x_display_info mac_display_info |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
239 #define check_x check_mac |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
240 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
241 |
2336 | 242 #include "buffer.h" |
2391 | 243 #include "dispextern.h" |
2438 | 244 #include "blockinput.h" |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
245 #include "window.h" |
8848 | 246 #include "intervals.h" |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
247 #include "termchar.h" |
2336 | 248 |
9572 | 249 #ifdef HAVE_X_WINDOWS |
24995 | 250 |
251 /* Compensate for a bug in Xos.h on some systems, on which it requires | |
3997
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
252 time.h. On some such systems, Xos.h tries to redefine struct |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
253 timeval and struct timezone if USG is #defined while it is |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
254 #included. */ |
24995 | 255 |
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
256 #ifdef XOS_NEEDS_TIME_H |
3997
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
257 #include <time.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
258 #undef USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
259 #include <X11/Xos.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
260 #define USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
261 #define __TIMEVAL__ |
24995 | 262 #else /* not XOS_NEEDS_TIME_H */ |
2336 | 263 #include <X11/Xos.h> |
24995 | 264 #endif /* not XOS_NEEDS_TIME_H */ |
265 | |
9572 | 266 #endif /* HAVE_X_WINDOWS */ |
24995 | 267 |
268 #include <ctype.h> | |
269 | |
270 #define abs(X) ((X) < 0 ? -(X) : (X)) | |
271 | |
34882 | 272 /* Number of pt per inch (from the TeXbook). */ |
273 | |
274 #define PT_PER_INCH 72.27 | |
275 | |
24995 | 276 /* Non-zero if face attribute ATTR is unspecified. */ |
277 | |
278 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
279 | |
280 /* Value is the number of elements of VECTOR. */ | |
281 | |
282 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
283 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
284 /* Make a copy of string S on the stack using alloca. Value is a pointer |
24995 | 285 to the copy. */ |
286 | |
287 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
288 | |
289 /* Make a copy of the contents of Lisp string S on the stack using | |
290 alloca. Value is a pointer to the copy. */ | |
291 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
292 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
24995 | 293 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
294 /* Size of hash table of realized faces in face caches (should be a |
24995 | 295 prime number). */ |
296 | |
297 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
298 | |
299 /* Keyword symbols used for face attribute names. */ | |
300 | |
301 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
302 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
303 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
304 Lisp_Object QCreverse_video; | |
31178 | 305 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
24995 | 306 |
307 /* Symbols used for attribute values. */ | |
308 | |
309 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
310 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
311 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
312 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
313 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
314 Lisp_Object Qultra_expanded; | |
315 Lisp_Object Qreleased_button, Qpressed_button; | |
316 Lisp_Object QCstyle, QCcolor, QCline_width; | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
317 Lisp_Object Qunspecified; |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
318 |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
319 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
24995 | 320 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
321 /* The name of the function to call when the background of the frame |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
322 has changed, frame_update_face_colors. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
323 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
324 Lisp_Object Qframe_update_face_colors; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
325 |
24995 | 326 /* Names of basic faces. */ |
327 | |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
328 Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
329 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; |
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
330 Lisp_Object Qmode_line_inactive; |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
331 extern Lisp_Object Qmode_line; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
332 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
333 /* The symbol `face-alias'. A symbols having that property is an |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
334 alias for another face. Value of the property is the name of |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
335 the aliased face. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
336 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
337 Lisp_Object Qface_alias; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
338 |
24995 | 339 /* Default stipple pattern used on monochrome displays. This stipple |
340 pattern is used on monochrome displays instead of shades of gray | |
341 for a face background color. See `set-face-stipple' for possible | |
342 values for this variable. */ | |
343 | |
344 Lisp_Object Vface_default_stipple; | |
345 | |
346 /* Alist of alternative font families. Each element is of the form | |
347 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
348 try FAMILY1, then FAMILY2, ... */ | |
349 | |
350 Lisp_Object Vface_alternative_font_family_alist; | |
351 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
352 /* Alist of alternative font registries. Each element is of the form |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
353 (REGISTRY REGISTRY1 REGISTRY2...). If fonts of REGISTRY can't be |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
354 loaded, try REGISTRY1, then REGISTRY2, ... */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
355 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
356 Lisp_Object Vface_alternative_font_registry_alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
357 |
24995 | 358 /* Allowed scalable fonts. A value of nil means don't allow any |
359 scalable fonts. A value of t means allow the use of any scalable | |
360 font. Otherwise, value must be a list of regular expressions. A | |
361 font may be scaled if its name matches a regular expression in the | |
362 list. */ | |
363 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
364 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
24995 | 365 |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
366 /* List of regular expressions that matches names of fonts to ignore. */ |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
367 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
368 Lisp_Object Vface_ignored_fonts; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
369 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
370 /* Alist of font name patterns vs the rescaling factor. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
371 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
372 Lisp_Object Vface_font_rescale_alist; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
373 |
25270 | 374 /* Maximum number of fonts to consider in font_list. If not an |
375 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
376 | |
377 Lisp_Object Vfont_list_limit; | |
378 #define DEFAULT_FONT_LIST_LIMIT 100 | |
379 | |
24995 | 380 /* The symbols `foreground-color' and `background-color' which can be |
381 used as part of a `face' property. This is for compatibility with | |
382 Emacs 20.2. */ | |
383 | |
384 Lisp_Object Qforeground_color, Qbackground_color; | |
385 | |
386 /* The symbols `face' and `mouse-face' used as text properties. */ | |
2342 | 387 |
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
388 Lisp_Object Qface; |
24995 | 389 extern Lisp_Object Qmouse_face; |
390 | |
57107 | 391 /* Property for basic faces which other faces cannot inherit. */ |
392 | |
393 Lisp_Object Qface_no_inherit; | |
394 | |
24995 | 395 /* Error symbol for wrong_type_argument in load_pixmap. */ |
396 | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
397 Lisp_Object Qbitmap_spec_p; |
2391 | 398 |
24995 | 399 /* Alist of global face definitions. Each element is of the form |
400 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
401 is a Lisp vector of face attributes. These faces are used | |
402 to initialize faces for new frames. */ | |
403 | |
404 Lisp_Object Vface_new_frame_defaults; | |
405 | |
406 /* The next ID to assign to Lisp faces. */ | |
407 | |
408 static int next_lface_id; | |
409 | |
410 /* A vector mapping Lisp face Id's to face names. */ | |
411 | |
412 static Lisp_Object *lface_id_to_name; | |
413 static int lface_id_to_name_size; | |
414 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
415 /* TTY color-related functions (defined in tty-colors.el). */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
416 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
417 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
24995 | 418 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
419 /* The name of the function used to compute colors on TTYs. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
420 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
421 Lisp_Object Qtty_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
422 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
423 /* An alist of defined terminal colors and their RGB values. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
424 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
425 Lisp_Object Vtty_defined_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
426 |
24995 | 427 /* Counter for calls to clear_face_cache. If this counter reaches |
428 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
429 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
430 | |
431 static int clear_font_table_count; | |
432 #define CLEAR_FONT_TABLE_COUNT 100 | |
433 #define CLEAR_FONT_TABLE_NFONTS 10 | |
434 | |
435 /* Non-zero means face attributes have been changed since the last | |
436 redisplay. Used in redisplay_internal. */ | |
437 | |
438 int face_change_count; | |
439 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
440 /* Non-zero means don't display bold text if a face's foreground |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
441 and background colors are the inverse of the default colors of the |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
442 display. This is a kluge to suppress `bold black' foreground text |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
443 which is hard to read on an LCD monitor. */ |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
444 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
445 int tty_suppress_bold_inverse_default_colors_p; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
446 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
447 /* A list of the form `((x . y))' used to avoid consing in |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
448 Finternal_set_lisp_face_attribute. */ |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
449 |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
450 static Lisp_Object Vparam_value_alist; |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
451 |
24995 | 452 /* The total number of colors currently allocated. */ |
453 | |
454 #if GLYPH_DEBUG | |
455 static int ncolors_allocated; | |
456 static int npixmaps_allocated; | |
457 static int ngcs; | |
458 #endif | |
459 | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
460 /* Non-zero means the definition of the `menu' face for new frames has |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
461 been changed. */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
462 |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
463 int menu_face_changed_default; |
24995 | 464 |
2336 | 465 |
24995 | 466 /* Function prototypes. */ |
467 | |
468 struct font_name; | |
469 struct table_entry; | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
470 struct named_merge_point; |
24995 | 471 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
472 static void map_tty_color P_ ((struct frame *, struct face *, |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
473 enum lface_attribute_index, int *)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
474 static Lisp_Object resolve_face_name P_ ((Lisp_Object)); |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
475 static int may_use_scalable_font_p P_ ((const char *)); |
24995 | 476 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
477 static int better_font_p P_ ((int *, struct font_name *, struct font_name *, | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
478 int, int)); |
24995 | 479 static int x_face_list_fonts P_ ((struct frame *, char *, |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
480 struct font_name **, int, int)); |
24995 | 481 static int font_scalable_p P_ ((struct font_name *)); |
482 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int)); | |
483 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); | |
484 static unsigned char *xstrlwr P_ ((unsigned char *)); | |
485 static void signal_error P_ ((char *, Lisp_Object)); | |
486 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
487 static void load_face_font P_ ((struct frame *, struct face *, int)); |
24995 | 488 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); |
489 static void free_face_colors P_ ((struct frame *, struct face *)); | |
490 static int face_color_gray_p P_ ((struct frame *, char *)); | |
491 static char *build_font_name P_ ((struct font_name *)); | |
492 static void free_font_names P_ ((struct font_name *, int)); | |
493 static int sorted_font_list P_ ((struct frame *, char *, | |
494 int (*cmpfn) P_ ((const void *, const void *)), | |
495 struct font_name **)); | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
496 static int font_list_1 P_ ((struct frame *, Lisp_Object, Lisp_Object, |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
497 Lisp_Object, struct font_name **)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
498 static int font_list P_ ((struct frame *, Lisp_Object, Lisp_Object, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
499 Lisp_Object, struct font_name **)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
500 static int try_font_list P_ ((struct frame *, Lisp_Object *, |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
501 Lisp_Object, Lisp_Object, struct font_name **, |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
502 int)); |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
503 static int try_alternative_families P_ ((struct frame *f, Lisp_Object, |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
504 Lisp_Object, struct font_name **)); |
24995 | 505 static int cmp_font_names P_ ((const void *, const void *)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
506 static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, int, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
507 struct face *, int)); |
24995 | 508 static struct face *realize_x_face P_ ((struct face_cache *, |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
509 Lisp_Object *, int, struct face *)); |
24995 | 510 static struct face *realize_tty_face P_ ((struct face_cache *, |
511 Lisp_Object *, int)); | |
512 static int realize_basic_faces P_ ((struct frame *)); | |
513 static int realize_default_face P_ ((struct frame *)); | |
514 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
515 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
516 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
517 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
518 static unsigned lface_hash P_ ((Lisp_Object *)); | |
519 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
520 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
521 static void free_realized_face P_ ((struct frame *, struct face *)); | |
522 static void clear_face_gcs P_ ((struct face_cache *)); | |
523 static void free_face_cache P_ ((struct face_cache *)); | |
524 static int face_numeric_weight P_ ((Lisp_Object)); | |
525 static int face_numeric_slant P_ ((Lisp_Object)); | |
526 static int face_numeric_swidth P_ ((Lisp_Object)); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
527 static int face_fontset P_ ((Lisp_Object *)); |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
528 static char *choose_face_font P_ ((struct frame *, Lisp_Object *, int, int, int*)); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
529 static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
530 struct named_merge_point *)); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
531 static int merge_face_ref P_ ((struct frame *, Lisp_Object, Lisp_Object *, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
532 int, struct named_merge_point *)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
533 static int set_lface_from_font_name P_ ((struct frame *, Lisp_Object, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
534 Lisp_Object, int, int)); |
24995 | 535 static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
536 static struct face *make_realized_face P_ ((Lisp_Object *)); |
24995 | 537 static void free_realized_faces P_ ((struct face_cache *)); |
538 static char *best_matching_font P_ ((struct frame *, Lisp_Object *, | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
539 struct font_name *, int, int, int *)); |
24995 | 540 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
541 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
542 static int xlfd_numeric_slant P_ ((struct font_name *)); | |
543 static int xlfd_numeric_weight P_ ((struct font_name *)); | |
544 static int xlfd_numeric_swidth P_ ((struct font_name *)); | |
545 static Lisp_Object xlfd_symbolic_slant P_ ((struct font_name *)); | |
546 static Lisp_Object xlfd_symbolic_weight P_ ((struct font_name *)); | |
547 static Lisp_Object xlfd_symbolic_swidth P_ ((struct font_name *)); | |
548 static int xlfd_fixed_p P_ ((struct font_name *)); | |
549 static int xlfd_numeric_value P_ ((struct table_entry *, int, struct font_name *, | |
550 int, int)); | |
551 static Lisp_Object xlfd_symbolic_value P_ ((struct table_entry *, int, | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
552 struct font_name *, int, |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
553 Lisp_Object)); |
24995 | 554 static struct table_entry *xlfd_lookup_field_contents P_ ((struct table_entry *, int, |
555 struct font_name *, int)); | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
556 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
557 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 558 |
559 static int split_font_name P_ ((struct frame *, struct font_name *, int)); | |
560 static int xlfd_point_size P_ ((struct frame *, struct font_name *)); | |
561 static void sort_fonts P_ ((struct frame *, struct font_name *, int, | |
562 int (*cmpfn) P_ ((const void *, const void *)))); | |
563 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
564 static void x_free_gc P_ ((struct frame *, GC)); | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
565 static void clear_font_table P_ ((struct x_display_info *)); |
24995 | 566 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
567 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
568 extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int)); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
569 #endif /* WINDOWSNT */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
570 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
571 #ifdef USE_X_TOOLKIT |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
572 static void x_update_menu_appearance P_ ((struct frame *)); |
39675 | 573 |
574 extern void free_frame_menubar P_ ((struct frame *)); | |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
575 #endif /* USE_X_TOOLKIT */ |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
576 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
577 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 578 |
579 | |
580 /*********************************************************************** | |
581 Utilities | |
582 ***********************************************************************/ | |
583 | |
584 #ifdef HAVE_X_WINDOWS | |
585 | |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
586 #ifdef DEBUG_X_COLORS |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
587 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
588 /* The following is a poor mans infrastructure for debugging X color |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
589 allocation problems on displays with PseudoColor-8. Some X servers |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
590 like 3.3.5 XF86_SVGA with Matrox cards apparently don't implement |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
591 color reference counts completely so that they don't signal an |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
592 error when a color is freed whose reference count is already 0. |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 Other X servers do. To help me debug this, the following code |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 implements a simple reference counting schema of its own, for a |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 single display/screen. --gerd. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 /* Reference counts for pixel colors. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 int color_count[256]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 /* Register color PIXEL as allocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 register_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 ++color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 /* Register color PIXEL as deallocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
614 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
615 unregister_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 if (color_count[pixel] > 0) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 --color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 else |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 abort (); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
624 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
625 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
626 /* Register N colors from PIXELS as deallocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
627 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
628 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
629 unregister_colors (pixels, n) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
630 unsigned long *pixels; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
631 int n; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
632 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
633 int i; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
634 for (i = 0; i < n; ++i) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
635 unregister_color (pixels[i]); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
636 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
637 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
638 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
640 doc: /* Dump currently allocated colors to stderr. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
641 () |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
643 int i, n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
645 fputc ('\n', stderr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
646 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 for (i = n = 0; i < sizeof color_count / sizeof color_count[0]; ++i) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
648 if (color_count[i]) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
650 fprintf (stderr, "%3d: %5d", i, color_count[i]); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
651 ++n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
652 if (n % 5 == 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
653 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
654 else |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
655 fputc ('\t', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
656 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
657 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
658 if (n % 5 != 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
659 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
660 return Qnil; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
661 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
662 |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
663 #endif /* DEBUG_X_COLORS */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
664 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
665 |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
666 /* Free colors used on frame F. PIXELS is an array of NPIXELS pixel |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
667 color values. Interrupt input must be blocked when this function |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
668 is called. */ |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
669 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
670 void |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
671 x_free_colors (f, pixels, npixels) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
672 struct frame *f; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
673 unsigned long *pixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
674 int npixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
675 { |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
676 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
677 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
678 /* If display has an immutable color map, freeing colors is not |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
679 necessary and some servers don't allow it. So don't do it. */ |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
680 if (class != StaticColor && class != StaticGray && class != TrueColor) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
681 { |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
682 #ifdef DEBUG_X_COLORS |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
683 unregister_colors (pixels, npixels); |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
684 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
685 XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), |
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
686 pixels, npixels, 0); |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
687 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
688 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
689 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
690 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 /* Free colors used on frame F. PIXELS is an array of NPIXELS pixel |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 color values. Interrupt input must be blocked when this function |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 is called. */ |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
694 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
695 void |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
696 x_free_dpy_colors (dpy, screen, cmap, pixels, npixels) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 Display *dpy; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 Screen *screen; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 Colormap cmap; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 unsigned long *pixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
701 int npixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
702 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
703 struct x_display_info *dpyinfo = x_display_info_for_display (dpy); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
704 int class = dpyinfo->visual->class; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
705 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
706 /* If display has an immutable color map, freeing colors is not |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
707 necessary and some servers don't allow it. So don't do it. */ |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
708 if (class != StaticColor && class != StaticGray && class != TrueColor) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
709 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
710 #ifdef DEBUG_X_COLORS |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
711 unregister_colors (pixels, npixels); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
712 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
713 XFreeColors (dpy, cmap, pixels, npixels, 0); |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
714 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
715 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
716 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
717 |
24995 | 718 /* Create and return a GC for use on frame F. GC values and mask |
719 are given by XGCV and MASK. */ | |
720 | |
721 static INLINE GC | |
722 x_create_gc (f, mask, xgcv) | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
723 struct frame *f; |
24995 | 724 unsigned long mask; |
725 XGCValues *xgcv; | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
726 { |
2336 | 727 GC gc; |
24995 | 728 BLOCK_INPUT; |
729 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
730 UNBLOCK_INPUT; | |
731 IF_DEBUG (++ngcs); | |
732 return gc; | |
733 } | |
734 | |
735 | |
736 /* Free GC which was used on frame F. */ | |
737 | |
738 static INLINE void | |
739 x_free_gc (f, gc) | |
740 struct frame *f; | |
741 GC gc; | |
742 { | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
743 BLOCK_INPUT; |
83243
a464201fbd10
Fix xassert-related bootstrap errors.
Karoly Lorentey <lorentey@elte.hu>
parents:
83241
diff
changeset
|
744 #if GLYPH_DEBUG |
24995 | 745 xassert (--ngcs >= 0); |
83243
a464201fbd10
Fix xassert-related bootstrap errors.
Karoly Lorentey <lorentey@elte.hu>
parents:
83241
diff
changeset
|
746 #endif |
24995 | 747 XFreeGC (FRAME_X_DISPLAY (f), gc); |
748 UNBLOCK_INPUT; | |
749 } | |
750 | |
751 #endif /* HAVE_X_WINDOWS */ | |
752 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
753 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 /* W32 emulation of GCs */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
756 static INLINE GC |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
757 x_create_gc (f, mask, xgcv) |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
758 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 unsigned long mask; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
760 XGCValues *xgcv; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
763 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
764 gc = XCreateGC (NULL, FRAME_W32_WINDOW (f), mask, xgcv); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
765 UNBLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
766 IF_DEBUG (++ngcs); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
767 return gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
768 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
769 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
770 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
771 /* Free GC which was used on frame F. */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
772 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
773 static INLINE void |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
774 x_free_gc (f, gc) |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
775 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
776 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
777 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
778 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
779 xassert (--ngcs >= 0); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
780 xfree (gc); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
781 UNBLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
782 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
783 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
784 #endif /* WINDOWSNT */ |
24995 | 785 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
786 #ifdef MAC_OS |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
787 /* Mac OS emulation of GCs */ |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
788 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
789 extern XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *); |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
790 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
791 static INLINE GC |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
792 x_create_gc (f, mask, xgcv) |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
793 struct frame *f; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
794 unsigned long mask; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
795 XGCValues *xgcv; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
796 { |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
797 GC gc; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
798 gc = XCreateGC (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), mask, xgcv); |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
799 return gc; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
800 } |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
801 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
802 static INLINE void |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
803 x_free_gc (f, gc) |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
804 struct frame *f; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
805 GC gc; |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
806 { |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
807 XFreeGC (FRAME_MAC_DISPLAY (f), gc); |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
808 } |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
809 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
810 #endif /* MAC_OS */ |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
811 |
24995 | 812 /* Like stricmp. Used to compare parts of font names which are in |
813 ISO8859-1. */ | |
814 | |
815 int | |
816 xstricmp (s1, s2) | |
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
817 const unsigned char *s1, *s2; |
24995 | 818 { |
819 while (*s1 && *s2) | |
820 { | |
821 unsigned char c1 = tolower (*s1); | |
822 unsigned char c2 = tolower (*s2); | |
823 if (c1 != c2) | |
824 return c1 < c2 ? -1 : 1; | |
825 ++s1, ++s2; | |
826 } | |
827 | |
828 if (*s1 == 0) | |
829 return *s2 == 0 ? 0 : -1; | |
830 return 1; | |
831 } | |
832 | |
833 | |
834 /* Like strlwr, which might not always be available. */ | |
835 | |
836 static unsigned char * | |
837 xstrlwr (s) | |
838 unsigned char *s; | |
839 { | |
840 unsigned char *p = s; | |
841 | |
842 for (p = s; *p; ++p) | |
843 *p = tolower (*p); | |
844 | |
845 return s; | |
846 } | |
847 | |
848 | |
849 /* Signal `error' with message S, and additional argument ARG. */ | |
850 | |
851 static void | |
852 signal_error (s, arg) | |
853 char *s; | |
854 Lisp_Object arg; | |
855 { | |
856 Fsignal (Qerror, Fcons (build_string (s), Fcons (arg, Qnil))); | |
857 } | |
858 | |
859 | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
860 /* If FRAME is nil, return a pointer to the selected frame. |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
861 Otherwise, check that FRAME is a live frame, and return a pointer |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
862 to it. NPARAM is the parameter number of FRAME, for |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
863 CHECK_LIVE_FRAME. This is here because it's a frequent pattern in |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
864 Lisp function definitions. */ |
24995 | 865 |
866 static INLINE struct frame * | |
867 frame_or_selected_frame (frame, nparam) | |
868 Lisp_Object frame; | |
869 int nparam; | |
870 { | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
871 if (NILP (frame)) |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
872 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
873 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
874 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
875 return XFRAME (frame); |
24995 | 876 } |
877 | |
878 | |
879 /*********************************************************************** | |
880 Frames and faces | |
881 ***********************************************************************/ | |
882 | |
883 /* Initialize face cache and basic faces for frame F. */ | |
9529
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
884 |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
885 void |
24995 | 886 init_frame_faces (f) |
887 struct frame *f; | |
9529
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
888 { |
24995 | 889 /* Make a face cache, if F doesn't have one. */ |
890 if (FRAME_FACE_CACHE (f) == NULL) | |
891 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
892 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
893 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 894 /* Make the image cache. */ |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
895 if (FRAME_WINDOW_P (f)) |
9529
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
896 { |
24995 | 897 if (FRAME_X_IMAGE_CACHE (f) == NULL) |
898 FRAME_X_IMAGE_CACHE (f) = make_image_cache (); | |
899 ++FRAME_X_IMAGE_CACHE (f)->refcount; | |
900 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
901 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 902 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
903 /* Realize basic faces. Must have enough information in frame |
24995 | 904 parameters to realize basic faces at this point. */ |
905 #ifdef HAVE_X_WINDOWS | |
906 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
907 #endif | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
908 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
909 if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
910 #endif |
45848 | 911 #ifdef MAC_OS |
912 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
913 #endif | |
24995 | 914 if (!realize_basic_faces (f)) |
915 abort (); | |
916 } | |
917 | |
918 | |
919 /* Free face cache of frame F. Called from Fdelete_frame. */ | |
920 | |
921 void | |
922 free_frame_faces (f) | |
923 struct frame *f; | |
924 { | |
925 struct face_cache *face_cache = FRAME_FACE_CACHE (f); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
926 |
24995 | 927 if (face_cache) |
928 { | |
929 free_face_cache (face_cache); | |
930 FRAME_FACE_CACHE (f) = NULL; | |
931 } | |
932 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
933 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
934 if (FRAME_WINDOW_P (f)) |
24995 | 935 { |
936 struct image_cache *image_cache = FRAME_X_IMAGE_CACHE (f); | |
937 if (image_cache) | |
9529
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
938 { |
24995 | 939 --image_cache->refcount; |
940 if (image_cache->refcount == 0) | |
941 free_image_cache (f); | |
942 } | |
943 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
944 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 945 } |
946 | |
947 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
948 /* Clear face caches, and recompute basic faces for frame F. Call |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
949 this after changing frame parameters on which those faces depend, |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
950 or when realized faces have been freed due to changing attributes |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
951 of named faces. */ |
24995 | 952 |
953 void | |
954 recompute_basic_faces (f) | |
955 struct frame *f; | |
956 { | |
957 if (FRAME_FACE_CACHE (f)) | |
958 { | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
959 clear_face_cache (0); |
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
960 if (!realize_basic_faces (f)) |
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
961 abort (); |
24995 | 962 } |
963 } | |
964 | |
965 | |
966 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
967 try to free unused fonts, too. */ | |
968 | |
969 void | |
970 clear_face_cache (clear_fonts_p) | |
971 int clear_fonts_p; | |
972 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
973 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 974 Lisp_Object tail, frame; |
975 struct frame *f; | |
976 | |
977 if (clear_fonts_p | |
978 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
979 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
980 struct x_display_info *dpyinfo; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
981 |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
982 /* Fonts are common for frames on one display, i.e. on |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
983 one X screen. */ |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
984 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
985 if (dpyinfo->n_fonts > CLEAR_FONT_TABLE_NFONTS) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
986 clear_font_table (dpyinfo); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
987 |
24995 | 988 /* From time to time see if we can unload some fonts. This also |
989 frees all realized faces on all frames. Fonts needed by | |
990 faces will be loaded again when faces are realized again. */ | |
991 clear_font_table_count = 0; | |
992 | |
993 FOR_EACH_FRAME (tail, frame) | |
994 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
995 struct frame *f = XFRAME (frame); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
996 if (FRAME_WINDOW_P (f) |
24995 | 997 && FRAME_X_DISPLAY_INFO (f)->n_fonts > CLEAR_FONT_TABLE_NFONTS) |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
998 free_all_realized_faces (frame); |
9529
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
999 } |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
1000 } |
24995 | 1001 else |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1002 { |
24995 | 1003 /* Clear GCs of realized faces. */ |
1004 FOR_EACH_FRAME (tail, frame) | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1005 { |
24995 | 1006 f = XFRAME (frame); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1007 if (FRAME_WINDOW_P (f)) |
24995 | 1008 { |
1009 clear_face_gcs (FRAME_FACE_CACHE (f)); | |
1010 clear_image_cache (f, 0); | |
1011 } | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1012 } |
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1013 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1014 #endif /* HAVE_WINDOW_SYSTEM */ |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1015 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1016 |
24995 | 1017 |
1018 DEFUN ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1019 doc: /* Clear face caches on all frames. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1020 Optional THOROUGHLY non-nil means try to free unused fonts, too. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1021 (thoroughly) |
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1022 Lisp_Object thoroughly; |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1023 { |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1024 clear_face_cache (!NILP (thoroughly)); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1025 ++face_change_count; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1026 ++windows_or_buffers_changed; |
24995 | 1027 return Qnil; |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1028 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1029 |
24995 | 1030 |
1031 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1032 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1033 |
1034 | |
38435 | 1035 /* Remove fonts from the font table of DPYINFO except for the default |
1036 ASCII fonts of frames on that display. Called from clear_face_cache | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1037 from time to time. */ |
24995 | 1038 |
1039 static void | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1040 clear_font_table (dpyinfo) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1041 struct x_display_info *dpyinfo; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1042 { |
24995 | 1043 int i; |
1044 | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1045 /* Free those fonts that are not used by frames on DPYINFO. */ |
24995 | 1046 for (i = 0; i < dpyinfo->n_fonts; ++i) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1047 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1048 struct font_info *font_info = dpyinfo->font_table + i; |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1049 Lisp_Object tail, frame; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1050 |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1051 /* Check if slot is already free. */ |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1052 if (font_info->name == NULL) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1053 continue; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1054 |
44705
413dd322c77d
(clear_font_table): Don't free the default font of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43270
diff
changeset
|
1055 /* Don't free a default font of some frame. */ |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1056 FOR_EACH_FRAME (tail, frame) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1057 { |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1058 struct frame *f = XFRAME (frame); |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1059 if (FRAME_WINDOW_P (f) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1060 && font_info->font == FRAME_FONT (f)) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1061 break; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1062 } |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1063 |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1064 if (!NILP (tail)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1065 continue; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1066 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1067 /* Free names. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1068 if (font_info->full_name != font_info->name) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1069 xfree (font_info->full_name); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1070 xfree (font_info->name); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1071 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1072 /* Free the font. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1073 BLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1074 #ifdef HAVE_X_WINDOWS |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1075 XFreeFont (dpyinfo->display, font_info->font); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1076 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1077 #ifdef WINDOWSNT |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1078 w32_unload_font (dpyinfo, font_info->font); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1079 #endif |
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58439
diff
changeset
|
1080 #ifdef MAC_OS |
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58439
diff
changeset
|
1081 mac_unload_font (dpyinfo, font_info->font); |
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58439
diff
changeset
|
1082 #endif |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1083 UNBLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1084 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1085 /* Mark font table slot free. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1086 font_info->font = NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1087 font_info->name = font_info->full_name = NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1088 } |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1089 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1090 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1091 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1092 |
1093 | |
1094 | |
1095 /*********************************************************************** | |
1096 X Pixmaps | |
1097 ***********************************************************************/ | |
1098 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1099 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1100 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1101 DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1102 doc: /* Value is non-nil if OBJECT is a valid bitmap specification. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1103 A bitmap specification is either a string, a file name, or a list |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1104 \(WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap, |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1105 HEIGHT is its height, and DATA is a string containing the bits of |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1106 the pixmap. Bits are stored row by row, each row occupies |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1107 \(WIDTH + 7)/8 bytes. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1108 (object) |
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1109 Lisp_Object object; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1110 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1111 int pixmap_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1112 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1113 if (STRINGP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1114 /* If OBJECT is a string, it's a file name. */ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1115 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1116 else if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1117 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1118 /* Otherwise OBJECT must be (WIDTH HEIGHT DATA), WIDTH and |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1119 HEIGHT must be integers > 0, and DATA must be string large |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1120 enough to hold a bitmap of the specified size. */ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1121 Lisp_Object width, height, data; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1122 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1123 height = width = data = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1124 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1125 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1126 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1127 width = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1128 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1129 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1130 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1131 height = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1132 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1133 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1134 data = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1135 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1136 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1137 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1138 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1139 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1140 int bytes_per_row = ((XFASTINT (width) + BITS_PER_CHAR - 1) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1141 / BITS_PER_CHAR); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1142 if (SBYTES (data) >= bytes_per_row * XINT (height)) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1143 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1144 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1145 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1146 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1147 return pixmap_p ? Qt : Qnil; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1148 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1149 |
24995 | 1150 |
1151 /* Load a bitmap according to NAME (which is either a file name or a | |
1152 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
1153 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
1154 bitmap cannot be loaded, display a message saying so, and return | |
1155 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
1156 if these pointers are not null. */ | |
1157 | |
1158 static int | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1159 load_pixmap (f, name, w_ptr, h_ptr) |
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1160 FRAME_PTR f; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1161 Lisp_Object name; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1162 unsigned int *w_ptr, *h_ptr; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1163 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1164 int bitmap_id; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1165 Lisp_Object tem; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1166 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1167 if (NILP (name)) |
24995 | 1168 return 0; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1169 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1170 tem = Fbitmap_spec_p (name); |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1171 if (NILP (tem)) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1172 wrong_type_argument (Qbitmap_spec_p, name); |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1173 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1174 BLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1175 if (CONSP (name)) |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1176 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1177 /* Decode a bitmap spec into a bitmap. */ |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1178 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1179 int h, w; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1180 Lisp_Object bits; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1181 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1182 w = XINT (Fcar (name)); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1183 h = XINT (Fcar (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1184 bits = Fcar (Fcdr (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1185 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1186 bitmap_id = x_create_bitmap_from_data (f, SDATA (bits), |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1187 w, h); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1188 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1189 else |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1190 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1191 /* It must be a string -- a file name. */ |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1192 bitmap_id = x_create_bitmap_from_file (f, name); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1193 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1194 UNBLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1195 |
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1196 if (bitmap_id < 0) |
24995 | 1197 { |
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1198 add_to_log ("Invalid or undefined bitmap %s", name, Qnil); |
24995 | 1199 bitmap_id = 0; |
1200 | |
1201 if (w_ptr) | |
1202 *w_ptr = 0; | |
1203 if (h_ptr) | |
1204 *h_ptr = 0; | |
1205 } | |
1206 else | |
1207 { | |
1208 #if GLYPH_DEBUG | |
1209 ++npixmaps_allocated; | |
1210 #endif | |
1211 if (w_ptr) | |
1212 *w_ptr = x_bitmap_width (f, bitmap_id); | |
1213 | |
1214 if (h_ptr) | |
1215 *h_ptr = x_bitmap_height (f, bitmap_id); | |
1216 } | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1217 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1218 return bitmap_id; |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1219 } |
9572 | 1220 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1221 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1222 |
9572 | 1223 |
2336 | 1224 |
24995 | 1225 /*********************************************************************** |
1226 Fonts | |
1227 ***********************************************************************/ | |
1228 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1229 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1230 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1231 /* Load font of face FACE which is used on frame F to display |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1232 character C. The name of the font to load is determined by lface |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1233 and fontset of FACE. */ |
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
1234 |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1235 static void |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1236 load_face_font (f, face, c) |
24995 | 1237 struct frame *f; |
1238 struct face *face; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1239 int c; |
24995 | 1240 { |
1241 struct font_info *font_info = NULL; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1242 char *font_name; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1243 int needs_overstrike; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1244 |
24995 | 1245 face->font_info_id = -1; |
1246 face->font = NULL; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1247 |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1248 font_name = choose_face_font (f, face->lface, face->fontset, c, |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1249 &needs_overstrike); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1250 if (!font_name) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1251 return; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1252 |
24995 | 1253 BLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1254 font_info = FS_LOAD_FACE_FONT (f, c, font_name, face); |
24995 | 1255 UNBLOCK_INPUT; |
1256 | |
1257 if (font_info) | |
1258 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1259 face->font_info_id = font_info->font_idx; |
24995 | 1260 face->font = font_info->font; |
1261 face->font_name = font_info->full_name; | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1262 face->overstrike = needs_overstrike; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1263 if (face->gc) |
24995 | 1264 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1265 x_free_gc (f, face->gc); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1266 face->gc = 0; |
24995 | 1267 } |
1268 } | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1269 else |
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1270 add_to_log ("Unable to load font %s", |
25301
2042c4a224ad
(add_to_log): Renamed from display_message.
Gerd Moellmann <gerd@gnu.org>
parents:
25270
diff
changeset
|
1271 build_string (font_name), Qnil); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1272 xfree (font_name); |
24995 | 1273 } |
1274 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1275 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1276 |
1277 | |
1278 | |
1279 /*********************************************************************** | |
1280 X Colors | |
1281 ***********************************************************************/ | |
1282 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1283 /* Parse RGB_LIST, and fill in the RGB fields of COLOR. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1284 RGB_LIST should contain (at least) 3 lisp integers. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1285 Return 0 if there's a problem with RGB_LIST, otherwise return 1. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1286 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1287 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1288 parse_rgb_list (rgb_list, color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1289 Lisp_Object rgb_list; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1290 XColor *color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1291 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1292 #define PARSE_RGB_LIST_FIELD(field) \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1293 if (CONSP (rgb_list) && INTEGERP (XCAR (rgb_list))) \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1294 { \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1295 color->field = XINT (XCAR (rgb_list)); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1296 rgb_list = XCDR (rgb_list); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1297 } \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1298 else \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1299 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1300 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1301 PARSE_RGB_LIST_FIELD (red); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1302 PARSE_RGB_LIST_FIELD (green); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1303 PARSE_RGB_LIST_FIELD (blue); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1304 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1305 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1306 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1307 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1308 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1309 /* Lookup on frame F the color described by the lisp string COLOR. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1310 The resulting tty color is returned in TTY_COLOR; if STD_COLOR is |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1311 non-zero, then the `standard' definition of the same color is |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1312 returned in it. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1313 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1314 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1315 tty_lookup_color (f, color, tty_color, std_color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1316 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1317 Lisp_Object color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1318 XColor *tty_color, *std_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1319 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1320 Lisp_Object frame, color_desc; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1321 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1322 if (!STRINGP (color) || NILP (Ffboundp (Qtty_color_desc))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1323 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1324 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1325 XSETFRAME (frame, f); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1326 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1327 color_desc = call2 (Qtty_color_desc, color, frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1328 if (CONSP (color_desc) && CONSP (XCDR (color_desc))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1329 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1330 Lisp_Object rgb; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1331 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1332 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1333 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1334 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1335 tty_color->pixel = XINT (XCAR (XCDR (color_desc))); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1336 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1337 rgb = XCDR (XCDR (color_desc)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1338 if (! parse_rgb_list (rgb, tty_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1339 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1340 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1341 /* Should we fill in STD_COLOR too? */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1342 if (std_color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1343 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1344 /* Default STD_COLOR to the same as TTY_COLOR. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1345 *std_color = *tty_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1346 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1347 /* Do a quick check to see if the returned descriptor is |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1348 actually _exactly_ equal to COLOR, otherwise we have to |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1349 lookup STD_COLOR separately. If it's impossible to lookup |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1350 a standard color, we just give up and use TTY_COLOR. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1351 if ((!STRINGP (XCAR (color_desc)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1352 || NILP (Fstring_equal (color, XCAR (color_desc)))) |
45746
8f026a28517c
(tty_lookup_color): Type bool/Lisp_Object mismatch fixed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45718
diff
changeset
|
1353 && !NILP (Ffboundp (Qtty_color_standard_values))) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1354 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1355 /* Look up STD_COLOR separately. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1356 rgb = call1 (Qtty_color_standard_values, color); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1357 if (! parse_rgb_list (rgb, std_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1358 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1359 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1360 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1361 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1362 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1363 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1364 else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1365 /* We were called early during startup, and the colors are not |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1366 yet set up in tty-defined-color-alist. Don't return a failure |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1367 indication, since this produces the annoying "Unable to |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1368 load color" messages in the *Messages* buffer. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1369 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1370 else |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1371 /* tty-color-desc seems to have returned a bad value. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1372 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1373 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1374 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1375 /* A version of defined_color for non-X frames. */ |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1376 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1377 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1378 tty_defined_color (f, color_name, color_def, alloc) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1379 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1380 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1381 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1382 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1383 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1384 int status = 1; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1385 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1386 /* Defaults. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1387 color_def->pixel = FACE_TTY_DEFAULT_COLOR; |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1388 color_def->red = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1389 color_def->blue = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1390 color_def->green = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1391 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1392 if (*color_name) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1393 status = tty_lookup_color (f, build_string (color_name), color_def, 0); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1394 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1395 if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name) |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1396 { |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1397 if (strcmp (color_name, "unspecified-fg") == 0) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1398 color_def->pixel = FACE_TTY_DEFAULT_FG_COLOR; |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1399 else if (strcmp (color_name, "unspecified-bg") == 0) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1400 color_def->pixel = FACE_TTY_DEFAULT_BG_COLOR; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1401 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1402 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1403 if (color_def->pixel != FACE_TTY_DEFAULT_COLOR) |
27743
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1404 status = 1; |
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1405 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1406 return status; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1407 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1408 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1409 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1410 /* Decide if color named COLOR_NAME is valid for the display |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1411 associated with the frame F; if so, return the rgb values in |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1412 COLOR_DEF. If ALLOC is nonzero, allocate a new colormap cell. |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1413 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1414 This does the right thing for any type of frame. */ |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1415 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1416 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1417 defined_color (f, color_name, color_def, alloc) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1418 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1419 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1420 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1421 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1422 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1423 if (!FRAME_WINDOW_P (f)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1424 return tty_defined_color (f, color_name, color_def, alloc); |
24995 | 1425 #ifdef HAVE_X_WINDOWS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1426 else if (FRAME_X_P (f)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1427 return x_defined_color (f, color_name, color_def, alloc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1428 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1429 #ifdef WINDOWSNT |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1430 else if (FRAME_W32_P (f)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1431 return w32_defined_color (f, color_name, color_def, alloc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1432 #endif |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1433 #ifdef MAC_OS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1434 else if (FRAME_MAC_P (f)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1435 return mac_defined_color (f, color_name, color_def, alloc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1436 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1437 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1438 abort (); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1439 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1440 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1441 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1442 /* Given the index IDX of a tty color on frame F, return its name, a |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1443 Lisp string. */ |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1444 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1445 Lisp_Object |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1446 tty_color_name (f, idx) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1447 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1448 int idx; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1449 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1450 if (idx >= 0 && !NILP (Ffboundp (Qtty_color_by_index))) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1451 { |
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1452 Lisp_Object frame; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1453 Lisp_Object coldesc; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1454 |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1455 XSETFRAME (frame, f); |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1456 coldesc = call2 (Qtty_color_by_index, make_number (idx), frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1457 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1458 if (!NILP (coldesc)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1459 return XCAR (coldesc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1460 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1461 #ifdef MSDOS |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1462 /* We can have an MSDOG frame under -nw for a short window of |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1463 opportunity before internal_terminal_init is called. DTRT. */ |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1464 if (FRAME_MSDOS_P (f) && !inhibit_window_system) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1465 return msdos_stdcolor_name (idx); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1466 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1467 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1468 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1469 return build_string (unspecified_fg); |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1470 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1471 return build_string (unspecified_bg); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1472 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1473 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1474 return vga_stdcolor_name (idx); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1475 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1476 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1477 return Qunspecified; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1478 } |
24995 | 1479 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1480 |
24995 | 1481 /* Return non-zero if COLOR_NAME is a shade of gray (or white or |
1482 black) on frame F. The algorithm is taken from 20.2 faces.el. */ | |
1483 | |
1484 static int | |
1485 face_color_gray_p (f, color_name) | |
1486 struct frame *f; | |
1487 char *color_name; | |
1488 { | |
1489 XColor color; | |
1490 int gray_p; | |
1491 | |
1492 if (defined_color (f, color_name, &color, 0)) | |
1493 gray_p = ((abs (color.red - color.green) | |
1494 < max (color.red, color.green) / 20) | |
1495 && (abs (color.green - color.blue) | |
1496 < max (color.green, color.blue) / 20) | |
1497 && (abs (color.blue - color.red) | |
1498 < max (color.blue, color.red) / 20)); | |
1499 else | |
1500 gray_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1501 |
24995 | 1502 return gray_p; |
1503 } | |
1504 | |
1505 | |
1506 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
1507 BACKGROUND_P non-zero means the color will be used as background | |
1508 color. */ | |
1509 | |
1510 static int | |
1511 face_color_supported_p (f, color_name, background_p) | |
1512 struct frame *f; | |
1513 char *color_name; | |
1514 int background_p; | |
1515 { | |
1516 Lisp_Object frame; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1517 XColor not_used; |
24995 | 1518 |
1519 XSETFRAME (frame, f); | |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1520 return |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1521 #ifdef HAVE_X_WINDOWS |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1522 FRAME_WINDOW_P (f) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1523 ? (!NILP (Fxw_display_color_p (frame)) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1524 || xstricmp (color_name, "black") == 0 |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1525 || xstricmp (color_name, "white") == 0 |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1526 || (background_p |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1527 && face_color_gray_p (f, color_name)) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1528 || (!NILP (Fx_display_grayscale_p (frame)) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1529 && face_color_gray_p (f, color_name))) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1530 : |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1531 #endif |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1532 tty_defined_color (f, color_name, ¬_used, 0); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1533 } |
24995 | 1534 |
1535 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1536 DEFUN ("color-gray-p", Fcolor_gray_p, Scolor_gray_p, 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1537 doc: /* Return non-nil if COLOR is a shade of gray (or white or black). |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1538 FRAME specifies the frame and thus the display for interpreting COLOR. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1539 If FRAME is nil or omitted, use the selected frame. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1540 (color, frame) |
24995 | 1541 Lisp_Object color, frame; |
1542 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1543 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1544 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1545 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1546 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1547 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1548 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1549 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1550 f = XFRAME (frame); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1551 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
24995 | 1552 } |
1553 | |
1554 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1555 DEFUN ("color-supported-p", Fcolor_supported_p, |
47471
8ed65bf4ee3d
(Fcolor_supported_p): Just one arg is required.
Richard M. Stallman <rms@gnu.org>
parents:
46556
diff
changeset
|
1556 Scolor_supported_p, 1, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1557 doc: /* Return non-nil if COLOR can be displayed on FRAME. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1558 BACKGROUND-P non-nil means COLOR is used as a background. |
56518
b058a7674dcd
(Fcolor_supported_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56296
diff
changeset
|
1559 Otherwise, this function tells whether it can be used as a foreground. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1560 If FRAME is nil or omitted, use the selected frame. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1561 COLOR must be a valid color name. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1562 (color, frame, background_p) |
24995 | 1563 Lisp_Object frame, color, background_p; |
1564 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1565 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1566 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1567 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1568 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1569 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1570 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1571 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1572 f = XFRAME (frame); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1573 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
24995 | 1574 return Qt; |
1575 return Qnil; | |
1576 } | |
1577 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1578 |
24995 | 1579 /* Load color with name NAME for use by face FACE on frame F. |
1580 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
1581 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
1582 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
1583 pixel color. If color cannot be loaded, display a message, and | |
1584 return the foreground, background or underline color of F, but | |
1585 record that fact in flags of the face so that we don't try to free | |
1586 these colors. */ | |
1587 | |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1588 unsigned long |
24995 | 1589 load_color (f, face, name, target_index) |
1590 struct frame *f; | |
1591 struct face *face; | |
1592 Lisp_Object name; | |
1593 enum lface_attribute_index target_index; | |
1594 { | |
1595 XColor color; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1596 |
24995 | 1597 xassert (STRINGP (name)); |
1598 xassert (target_index == LFACE_FOREGROUND_INDEX | |
1599 || target_index == LFACE_BACKGROUND_INDEX | |
1600 || target_index == LFACE_UNDERLINE_INDEX | |
1601 || target_index == LFACE_OVERLINE_INDEX | |
1602 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
1603 || target_index == LFACE_BOX_INDEX); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1604 |
24995 | 1605 /* if the color map is full, defined_color will return a best match |
1606 to the values in an existing cell. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1607 if (!defined_color (f, SDATA (name), &color, 1)) |
24995 | 1608 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1609 add_to_log ("Unable to load color \"%s\"", name, Qnil); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1610 |
24995 | 1611 switch (target_index) |
1612 { | |
1613 case LFACE_FOREGROUND_INDEX: | |
1614 face->foreground_defaulted_p = 1; | |
1615 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1616 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1617 |
24995 | 1618 case LFACE_BACKGROUND_INDEX: |
1619 face->background_defaulted_p = 1; | |
1620 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
1621 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1622 |
24995 | 1623 case LFACE_UNDERLINE_INDEX: |
1624 face->underline_defaulted_p = 1; | |
1625 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1626 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1627 |
24995 | 1628 case LFACE_OVERLINE_INDEX: |
1629 face->overline_color_defaulted_p = 1; | |
1630 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1631 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1632 |
24995 | 1633 case LFACE_STRIKE_THROUGH_INDEX: |
1634 face->strike_through_color_defaulted_p = 1; | |
1635 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1636 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1637 |
24995 | 1638 case LFACE_BOX_INDEX: |
1639 face->box_color_defaulted_p = 1; | |
1640 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1641 break; | |
1642 | |
1643 default: | |
1644 abort (); | |
1645 } | |
1646 } | |
1647 #if GLYPH_DEBUG | |
1648 else | |
1649 ++ncolors_allocated; | |
1650 #endif | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1651 |
24995 | 1652 return color.pixel; |
1653 } | |
1654 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1655 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1656 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1657 |
1658 /* Load colors for face FACE which is used on frame F. Colors are | |
1659 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
1660 of ATTRS. If the background color specified is not supported on F, | |
1661 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
1662 | |
1663 static void | |
1664 load_face_colors (f, face, attrs) | |
1665 struct frame *f; | |
1666 struct face *face; | |
1667 Lisp_Object *attrs; | |
1668 { | |
1669 Lisp_Object fg, bg; | |
1670 | |
1671 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
1672 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
1673 | |
1674 /* Swap colors if face is inverse-video. */ | |
1675 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
1676 { | |
1677 Lisp_Object tmp; | |
1678 tmp = fg; | |
1679 fg = bg; | |
1680 bg = tmp; | |
1681 } | |
1682 | |
1683 /* Check for support for foreground, not for background because | |
1684 face_color_supported_p is smart enough to know that grays are | |
1685 "supported" as background because we are supposed to use stipple | |
1686 for them. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1687 if (!face_color_supported_p (f, SDATA (bg), 0) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1688 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
24995 | 1689 { |
1690 x_destroy_bitmap (f, face->stipple); | |
1691 face->stipple = load_pixmap (f, Vface_default_stipple, | |
1692 &face->pixmap_w, &face->pixmap_h); | |
1693 } | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1694 |
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1695 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
24995 | 1696 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
1697 } | |
1698 | |
1699 | |
1700 /* Free color PIXEL on frame F. */ | |
1701 | |
1702 void | |
1703 unload_color (f, pixel) | |
1704 struct frame *f; | |
1705 unsigned long pixel; | |
1706 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1707 #ifdef HAVE_X_WINDOWS |
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1708 if (pixel != -1) |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1709 { |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1710 BLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1711 x_free_colors (f, &pixel, 1); |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1712 UNBLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1713 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1714 #endif |
24995 | 1715 } |
1716 | |
1717 | |
1718 /* Free colors allocated for FACE. */ | |
1719 | |
1720 static void | |
1721 free_face_colors (f, face) | |
1722 struct frame *f; | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1723 struct face *face; |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1724 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1725 #ifdef HAVE_X_WINDOWS |
40555
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1726 if (face->colors_copied_bitwise_p) |
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1727 return; |
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1728 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1729 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1730 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1731 if (!face->foreground_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1732 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1733 x_free_colors (f, &face->foreground, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1734 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1735 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1736 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1737 if (!face->background_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1738 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1739 x_free_colors (f, &face->background, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1740 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1741 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1742 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1743 if (face->underline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1744 && !face->underline_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1745 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1746 x_free_colors (f, &face->underline_color, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1747 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1748 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1749 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1750 if (face->overline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1751 && !face->overline_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1752 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1753 x_free_colors (f, &face->overline_color, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1754 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1755 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1756 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1757 if (face->strike_through_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1758 && !face->strike_through_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1759 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1760 x_free_colors (f, &face->strike_through_color, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1761 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1762 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1763 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1764 if (face->box != FACE_NO_BOX |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1765 && !face->box_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1766 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1767 x_free_colors (f, &face->box_color, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1768 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1769 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1770 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1771 UNBLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1772 #endif /* HAVE_X_WINDOWS */ |
24995 | 1773 } |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1774 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1775 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1776 |
1777 | |
1778 | |
1779 /*********************************************************************** | |
1780 XLFD Font Names | |
1781 ***********************************************************************/ | |
1782 | |
1783 /* An enumerator for each field of an XLFD font name. */ | |
1784 | |
1785 enum xlfd_field | |
1786 { | |
1787 XLFD_FOUNDRY, | |
1788 XLFD_FAMILY, | |
1789 XLFD_WEIGHT, | |
1790 XLFD_SLANT, | |
1791 XLFD_SWIDTH, | |
1792 XLFD_ADSTYLE, | |
1793 XLFD_PIXEL_SIZE, | |
1794 XLFD_POINT_SIZE, | |
1795 XLFD_RESX, | |
1796 XLFD_RESY, | |
1797 XLFD_SPACING, | |
1798 XLFD_AVGWIDTH, | |
1799 XLFD_REGISTRY, | |
1800 XLFD_ENCODING, | |
1801 XLFD_LAST | |
1802 }; | |
1803 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1804 /* An enumerator for each possible slant value of a font. Taken from |
24995 | 1805 the XLFD specification. */ |
1806 | |
1807 enum xlfd_slant | |
1808 { | |
1809 XLFD_SLANT_UNKNOWN, | |
1810 XLFD_SLANT_ROMAN, | |
1811 XLFD_SLANT_ITALIC, | |
1812 XLFD_SLANT_OBLIQUE, | |
1813 XLFD_SLANT_REVERSE_ITALIC, | |
1814 XLFD_SLANT_REVERSE_OBLIQUE, | |
1815 XLFD_SLANT_OTHER | |
1816 }; | |
1817 | |
1818 /* Relative font weight according to XLFD documentation. */ | |
1819 | |
1820 enum xlfd_weight | |
1821 { | |
1822 XLFD_WEIGHT_UNKNOWN, | |
1823 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
1824 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
1825 XLFD_WEIGHT_LIGHT, /* 30 */ | |
1826 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
1827 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1828 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
1829 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
1830 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
1831 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
1832 }; | |
1833 | |
1834 /* Relative proportionate width. */ | |
1835 | |
1836 enum xlfd_swidth | |
1837 { | |
1838 XLFD_SWIDTH_UNKNOWN, | |
1839 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
1840 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
1841 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
1842 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
1843 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1844 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
1845 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
1846 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
1847 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
1848 }; | |
1849 | |
1850 /* Structure used for tables mapping XLFD weight, slant, and width | |
1851 names to numeric and symbolic values. */ | |
1852 | |
1853 struct table_entry | |
1854 { | |
1855 char *name; | |
1856 int numeric; | |
1857 Lisp_Object *symbol; | |
1858 }; | |
1859 | |
1860 /* Table of XLFD slant names and their numeric and symbolic | |
1861 representations. This table must be sorted by slant names in | |
1862 ascending order. */ | |
1863 | |
1864 static struct table_entry slant_table[] = | |
1865 { | |
1866 {"i", XLFD_SLANT_ITALIC, &Qitalic}, | |
1867 {"o", XLFD_SLANT_OBLIQUE, &Qoblique}, | |
1868 {"ot", XLFD_SLANT_OTHER, &Qitalic}, | |
1869 {"r", XLFD_SLANT_ROMAN, &Qnormal}, | |
1870 {"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic}, | |
1871 {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique} | |
1872 }; | |
1873 | |
1874 /* Table of XLFD weight names. This table must be sorted by weight | |
1875 names in ascending order. */ | |
1876 | |
1877 static struct table_entry weight_table[] = | |
1878 { | |
1879 {"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold}, | |
1880 {"bold", XLFD_WEIGHT_BOLD, &Qbold}, | |
1881 {"book", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
33529
2e6d343c238d
(weight_table): Add `demi' with the same meaning as
Gerd Moellmann <gerd@gnu.org>
parents:
33372
diff
changeset
|
1882 {"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
24995 | 1883 {"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
1884 {"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light}, | |
1885 {"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
1886 {"heavy", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
1887 {"light", XLFD_WEIGHT_LIGHT, &Qlight}, | |
1888 {"medium", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1889 {"normal", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1890 {"regular", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1891 {"semibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, | |
1892 {"semilight", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
1893 {"ultralight", XLFD_WEIGHT_ULTRA_LIGHT, &Qultra_light}, | |
1894 {"ultrabold", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold} | |
1895 }; | |
1896 | |
1897 /* Table of XLFD width names. This table must be sorted by width | |
1898 names in ascending order. */ | |
1899 | |
1900 static struct table_entry swidth_table[] = | |
1901 { | |
1902 {"compressed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1903 {"condensed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1904 {"demiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
1905 {"expanded", XLFD_SWIDTH_EXPANDED, &Qexpanded}, | |
1906 {"extracondensed", XLFD_SWIDTH_EXTRA_CONDENSED, &Qextra_condensed}, | |
1907 {"extraexpanded", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded}, | |
1908 {"medium", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1909 {"narrow", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1910 {"normal", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1911 {"regular", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1912 {"semicondensed", XLFD_SWIDTH_SEMI_CONDENSED, &Qsemi_condensed}, | |
1913 {"semiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
1914 {"ultracondensed", XLFD_SWIDTH_ULTRA_CONDENSED, &Qultra_condensed}, | |
1915 {"ultraexpanded", XLFD_SWIDTH_ULTRA_EXPANDED, &Qultra_expanded}, | |
1916 {"wide", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded} | |
1917 }; | |
1918 | |
1919 /* Structure used to hold the result of splitting font names in XLFD | |
1920 format into their fields. */ | |
1921 | |
1922 struct font_name | |
1923 { | |
1924 /* The original name which is modified destructively by | |
1925 split_font_name. The pointer is kept here to be able to free it | |
1926 if it was allocated from the heap. */ | |
1927 char *name; | |
1928 | |
1929 /* Font name fields. Each vector element points into `name' above. | |
1930 Fields are NUL-terminated. */ | |
1931 char *fields[XLFD_LAST]; | |
1932 | |
1933 /* Numeric values for those fields that interest us. See | |
1934 split_font_name for which these are. */ | |
1935 int numeric[XLFD_LAST]; | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1936 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1937 /* If the original name matches one of Vface_font_rescale_alist, |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1938 the value is the corresponding rescale ratio. Otherwise, the |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1939 value is 1.0. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1940 double rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1941 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1942 /* Lower value mean higher priority. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1943 int registry_priority; |
24995 | 1944 }; |
1945 | |
1946 /* The frame in effect when sorting font names. Set temporarily in | |
1947 sort_fonts so that it is available in font comparison functions. */ | |
1948 | |
1949 static struct frame *font_frame; | |
1950 | |
1951 /* Order by which font selection chooses fonts. The default values | |
1952 mean `first, find a best match for the font width, then for the | |
1953 font height, then for weight, then for slant.' This variable can be | |
1954 set via set-face-font-sort-order. */ | |
1955 | |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1956 #ifdef MAC_OS |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1957 static int font_sort_order[4] = { |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1958 XLFD_SWIDTH, XLFD_POINT_SIZE, XLFD_WEIGHT, XLFD_SLANT |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1959 }; |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1960 #else |
24995 | 1961 static int font_sort_order[4]; |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1962 #endif |
24995 | 1963 |
1964 /* Look up FONT.fields[FIELD_INDEX] in TABLE which has DIM entries. | |
1965 TABLE must be sorted by TABLE[i]->name in ascending order. Value | |
1966 is a pointer to the matching table entry or null if no table entry | |
1967 matches. */ | |
1968 | |
1969 static struct table_entry * | |
1970 xlfd_lookup_field_contents (table, dim, font, field_index) | |
1971 struct table_entry *table; | |
1972 int dim; | |
1973 struct font_name *font; | |
1974 int field_index; | |
1975 { | |
1976 /* Function split_font_name converts fields to lower-case, so there | |
1977 is no need to use xstrlwr or xstricmp here. */ | |
1978 char *s = font->fields[field_index]; | |
1979 int low, mid, high, cmp; | |
1980 | |
1981 low = 0; | |
1982 high = dim - 1; | |
1983 | |
1984 while (low <= high) | |
1985 { | |
1986 mid = (low + high) / 2; | |
1987 cmp = strcmp (table[mid].name, s); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1988 |
24995 | 1989 if (cmp < 0) |
1990 low = mid + 1; | |
1991 else if (cmp > 0) | |
1992 high = mid - 1; | |
1993 else | |
1994 return table + mid; | |
1995 } | |
1996 | |
1997 return NULL; | |
1998 } | |
1999 | |
2000 | |
2001 /* Return a numeric representation for font name field | |
2002 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
2003 has DIM entries. Value is the numeric value found or DFLT if no | |
2004 table entry matches. This function is used to translate weight, | |
2005 slant, and swidth names of XLFD font names to numeric values. */ | |
2006 | |
2007 static INLINE int | |
2008 xlfd_numeric_value (table, dim, font, field_index, dflt) | |
2009 struct table_entry *table; | |
2010 int dim; | |
2011 struct font_name *font; | |
2012 int field_index; | |
2013 int dflt; | |
2014 { | |
2015 struct table_entry *p; | |
2016 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
2017 return p ? p->numeric : dflt; | |
2018 } | |
2019 | |
2020 | |
2021 /* Return a symbolic representation for font name field | |
2022 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
2023 has DIM entries. Value is the symbolic value found or DFLT if no | |
2024 table entry matches. This function is used to translate weight, | |
2025 slant, and swidth names of XLFD font names to symbols. */ | |
2026 | |
2027 static INLINE Lisp_Object | |
2028 xlfd_symbolic_value (table, dim, font, field_index, dflt) | |
2029 struct table_entry *table; | |
2030 int dim; | |
2031 struct font_name *font; | |
2032 int field_index; | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
2033 Lisp_Object dflt; |
24995 | 2034 { |
2035 struct table_entry *p; | |
2036 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
2037 return p ? *p->symbol : dflt; | |
2038 } | |
2039 | |
2040 | |
2041 /* Return a numeric value for the slant of the font given by FONT. */ | |
2042 | |
2043 static INLINE int | |
2044 xlfd_numeric_slant (font) | |
2045 struct font_name *font; | |
2046 { | |
2047 return xlfd_numeric_value (slant_table, DIM (slant_table), | |
2048 font, XLFD_SLANT, XLFD_SLANT_ROMAN); | |
2049 } | |
2050 | |
2051 | |
2052 /* Return a symbol representing the weight of the font given by FONT. */ | |
2053 | |
2054 static INLINE Lisp_Object | |
2055 xlfd_symbolic_slant (font) | |
2056 struct font_name *font; | |
2057 { | |
2058 return xlfd_symbolic_value (slant_table, DIM (slant_table), | |
2059 font, XLFD_SLANT, Qnormal); | |
2060 } | |
2061 | |
2062 | |
2063 /* Return a numeric value for the weight of the font given by FONT. */ | |
2064 | |
2065 static INLINE int | |
2066 xlfd_numeric_weight (font) | |
2067 struct font_name *font; | |
2068 { | |
2069 return xlfd_numeric_value (weight_table, DIM (weight_table), | |
2070 font, XLFD_WEIGHT, XLFD_WEIGHT_MEDIUM); | |
2071 } | |
2072 | |
2073 | |
2074 /* Return a symbol representing the slant of the font given by FONT. */ | |
2075 | |
2076 static INLINE Lisp_Object | |
2077 xlfd_symbolic_weight (font) | |
2078 struct font_name *font; | |
2079 { | |
2080 return xlfd_symbolic_value (weight_table, DIM (weight_table), | |
2081 font, XLFD_WEIGHT, Qnormal); | |
2082 } | |
2083 | |
2084 | |
2085 /* Return a numeric value for the swidth of the font whose XLFD font | |
2086 name fields are found in FONT. */ | |
2087 | |
2088 static INLINE int | |
2089 xlfd_numeric_swidth (font) | |
2090 struct font_name *font; | |
2091 { | |
2092 return xlfd_numeric_value (swidth_table, DIM (swidth_table), | |
2093 font, XLFD_SWIDTH, XLFD_SWIDTH_MEDIUM); | |
2094 } | |
2095 | |
2096 | |
2097 /* Return a symbolic value for the swidth of FONT. */ | |
2098 | |
2099 static INLINE Lisp_Object | |
2100 xlfd_symbolic_swidth (font) | |
2101 struct font_name *font; | |
2102 { | |
2103 return xlfd_symbolic_value (swidth_table, DIM (swidth_table), | |
2104 font, XLFD_SWIDTH, Qnormal); | |
2105 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2106 |
24995 | 2107 |
2108 /* Look up the entry of SYMBOL in the vector TABLE which has DIM | |
2109 entries. Value is a pointer to the matching table entry or null if | |
2110 no element of TABLE contains SYMBOL. */ | |
2111 | |
2112 static struct table_entry * | |
2113 face_value (table, dim, symbol) | |
2114 struct table_entry *table; | |
2115 int dim; | |
2116 Lisp_Object symbol; | |
2117 { | |
2118 int i; | |
2119 | |
2120 xassert (SYMBOLP (symbol)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2121 |
24995 | 2122 for (i = 0; i < dim; ++i) |
2123 if (EQ (*table[i].symbol, symbol)) | |
2124 break; | |
2125 | |
2126 return i < dim ? table + i : NULL; | |
2127 } | |
2128 | |
2129 | |
2130 /* Return a numeric value for SYMBOL in the vector TABLE which has DIM | |
2131 entries. Value is -1 if SYMBOL is not found in TABLE. */ | |
2132 | |
2133 static INLINE int | |
2134 face_numeric_value (table, dim, symbol) | |
2135 struct table_entry *table; | |
2136 int dim; | |
2137 Lisp_Object symbol; | |
2138 { | |
2139 struct table_entry *p = face_value (table, dim, symbol); | |
2140 return p ? p->numeric : -1; | |
2141 } | |
2142 | |
2143 | |
2144 /* Return a numeric value representing the weight specified by Lisp | |
2145 symbol WEIGHT. Value is one of the enumerators of enum | |
2146 xlfd_weight. */ | |
2147 | |
2148 static INLINE int | |
2149 face_numeric_weight (weight) | |
2150 Lisp_Object weight; | |
2151 { | |
2152 return face_numeric_value (weight_table, DIM (weight_table), weight); | |
2153 } | |
2154 | |
2155 | |
2156 /* Return a numeric value representing the slant specified by Lisp | |
2157 symbol SLANT. Value is one of the enumerators of enum xlfd_slant. */ | |
2158 | |
2159 static INLINE int | |
2160 face_numeric_slant (slant) | |
2161 Lisp_Object slant; | |
2162 { | |
2163 return face_numeric_value (slant_table, DIM (slant_table), slant); | |
2164 } | |
2165 | |
2166 | |
2167 /* Return a numeric value representing the swidth specified by Lisp | |
2168 symbol WIDTH. Value is one of the enumerators of enum xlfd_swidth. */ | |
2169 | |
2170 static int | |
2171 face_numeric_swidth (width) | |
2172 Lisp_Object width; | |
2173 { | |
2174 return face_numeric_value (swidth_table, DIM (swidth_table), width); | |
2175 } | |
2176 | |
2177 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2178 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 2179 |
2180 /* Return non-zero if FONT is the name of a fixed-pitch font. */ | |
2181 | |
2182 static INLINE int | |
2183 xlfd_fixed_p (font) | |
2184 struct font_name *font; | |
2185 { | |
2186 /* Function split_font_name converts fields to lower-case, so there | |
2187 is no need to use tolower here. */ | |
2188 return *font->fields[XLFD_SPACING] != 'p'; | |
2189 } | |
2190 | |
2191 | |
2192 /* Return the point size of FONT on frame F, measured in 1/10 pt. | |
2193 | |
2194 The actual height of the font when displayed on F depends on the | |
2195 resolution of both the font and frame. For example, a 10pt font | |
2196 designed for a 100dpi display will display larger than 10pt on a | |
2197 75dpi display. (It's not unusual to use fonts not designed for the | |
2198 display one is using. For example, some intlfonts are available in | |
2199 72dpi versions, only.) | |
2200 | |
2201 Value is the real point size of FONT on frame F, or 0 if it cannot | |
2202 be determined. */ | |
2203 | |
2204 static INLINE int | |
2205 xlfd_point_size (f, font) | |
2206 struct frame *f; | |
2207 struct font_name *font; | |
2208 { | |
2209 double resy = FRAME_X_DISPLAY_INFO (f)->resy; | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2210 char *pixel_field = font->fields[XLFD_PIXEL_SIZE]; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2211 double pixel; |
24995 | 2212 int real_pt; |
2213 | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2214 if (*pixel_field == '[') |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2215 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2216 /* The pixel size field is `[A B C D]' which specifies |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2217 a transformation matrix. |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2218 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2219 A B 0 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2220 C D 0 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2221 0 0 1 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2222 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2223 by which all glyphs of the font are transformed. The spec |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2224 says that s scalar value N for the pixel size is equivalent |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2225 to A = N * resx/resy, B = C = 0, D = N. */ |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2226 char *start = pixel_field + 1, *end; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2227 double matrix[4]; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2228 int i; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2229 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2230 for (i = 0; i < 4; ++i) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2231 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2232 matrix[i] = strtod (start, &end); |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2233 start = end; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2234 } |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2235 |
37798
d4b4c850abc0
(xlfd_point_size): Don't divide pixel size from
Gerd Moellmann <gerd@gnu.org>
parents:
37756
diff
changeset
|
2236 pixel = matrix[3]; |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2237 } |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2238 else |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2239 pixel = atoi (pixel_field); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2240 |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2241 if (pixel == 0) |
24995 | 2242 real_pt = 0; |
2243 else | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2244 real_pt = PT_PER_INCH * 10.0 * pixel / resy + 0.5; |
24995 | 2245 |
2246 return real_pt; | |
2247 } | |
2248 | |
2249 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2250 /* Return point size of PIXEL dots while considering Y-resultion (DPI) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2251 of frame F. This function is used to guess a point size of font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2252 when only the pixel height of the font is available. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2253 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2254 static INLINE int |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2255 pixel_point_size (f, pixel) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2256 struct frame *f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2257 int pixel; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2258 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2259 double resy = FRAME_X_DISPLAY_INFO (f)->resy; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2260 double real_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2261 int int_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2262 |
34882 | 2263 /* As one inch is PT_PER_INCH points, PT_PER_INCH/RESY gives the |
2264 point size of one dot. */ | |
2265 real_pt = pixel * PT_PER_INCH / resy; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2266 int_pt = real_pt + 0.5; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2267 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2268 return int_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2269 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2270 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2271 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2272 /* Return a rescaling ratio of a font of NAME. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2273 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2274 static double |
51401
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2275 font_rescale_ratio (name) |
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2276 char *name; |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2277 { |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2278 Lisp_Object tail, elt; |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2279 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2280 for (tail = Vface_font_rescale_alist; CONSP (tail); tail = XCDR (tail)) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2281 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2282 elt = XCAR (tail); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2283 if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt)) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2284 && fast_c_string_match_ignore_case (XCAR (elt), name) >= 0) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2285 return XFLOAT_DATA (XCDR (elt)); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2286 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2287 return 1.0; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2288 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2289 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2290 |
24995 | 2291 /* Split XLFD font name FONT->name destructively into NUL-terminated, |
2292 lower-case fields in FONT->fields. NUMERIC_P non-zero means | |
2293 compute numeric values for fields XLFD_POINT_SIZE, XLFD_SWIDTH, | |
2294 XLFD_RESY, XLFD_SLANT, and XLFD_WEIGHT in FONT->numeric. Value is | |
2295 zero if the font name doesn't have the format we expect. The | |
2296 expected format is a font name that starts with a `-' and has | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2297 XLFD_LAST fields separated by `-'. */ |
24995 | 2298 |
2299 static int | |
2300 split_font_name (f, font, numeric_p) | |
2301 struct frame *f; | |
2302 struct font_name *font; | |
2303 int numeric_p; | |
2304 { | |
2305 int i = 0; | |
2306 int success_p; | |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2307 double rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2308 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2309 if (numeric_p) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2310 /* This must be done before splitting the font name. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2311 rescale_ratio = font_rescale_ratio (font->name); |
24995 | 2312 |
2313 if (*font->name == '-') | |
2314 { | |
2315 char *p = xstrlwr (font->name) + 1; | |
2316 | |
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2317 while (i < XLFD_LAST) |
24995 | 2318 { |
2319 font->fields[i] = p; | |
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2320 ++i; |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2321 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2322 /* Pixel and point size may be of the form `[....]'. For |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2323 BNF, see XLFD spec, chapter 4. Negative values are |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2324 indicated by tilde characters which we replace with |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2325 `-' characters, here. */ |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2326 if (*p == '[' |
37736
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2327 && (i - 1 == XLFD_PIXEL_SIZE |
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2328 || i - 1 == XLFD_POINT_SIZE)) |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2329 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2330 char *start, *end; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2331 int j; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2332 |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2333 for (++p; *p && *p != ']'; ++p) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2334 if (*p == '~') |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2335 *p = '-'; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2336 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2337 /* Check that the matrix contains 4 floating point |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2338 numbers. */ |
37756
2cea00ea4d76
(split_font_name): Use the right field when
Gerd Moellmann <gerd@gnu.org>
parents:
37736
diff
changeset
|
2339 for (j = 0, start = font->fields[i - 1] + 1; |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2340 j < 4; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2341 ++j, start = end) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2342 if (strtod (start, &end) == 0 && start == end) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2343 break; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2344 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2345 if (j < 4) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2346 break; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2347 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2348 |
24995 | 2349 while (*p && *p != '-') |
2350 ++p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2351 |
24995 | 2352 if (*p != '-') |
2353 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2354 |
24995 | 2355 *p++ = 0; |
2356 } | |
2357 } | |
2358 | |
2359 success_p = i == XLFD_LAST; | |
2360 | |
2361 /* If requested, and font name was in the expected format, | |
2362 compute numeric values for some fields. */ | |
2363 if (numeric_p && success_p) | |
2364 { | |
2365 font->numeric[XLFD_POINT_SIZE] = xlfd_point_size (f, font); | |
2366 font->numeric[XLFD_RESY] = atoi (font->fields[XLFD_RESY]); | |
2367 font->numeric[XLFD_SLANT] = xlfd_numeric_slant (font); | |
2368 font->numeric[XLFD_WEIGHT] = xlfd_numeric_weight (font); | |
2369 font->numeric[XLFD_SWIDTH] = xlfd_numeric_swidth (font); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
2370 font->numeric[XLFD_AVGWIDTH] = atoi (font->fields[XLFD_AVGWIDTH]); |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2371 font->rescale_ratio = rescale_ratio; |
24995 | 2372 } |
2373 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2374 /* Initialize it to zero. It will be overridden by font_list while |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2375 trying alternate registries. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2376 font->registry_priority = 0; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2377 |
24995 | 2378 return success_p; |
2379 } | |
2380 | |
2381 | |
2382 /* Build an XLFD font name from font name fields in FONT. Value is a | |
2383 pointer to the font name, which is allocated via xmalloc. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2384 |
24995 | 2385 static char * |
2386 build_font_name (font) | |
2387 struct font_name *font; | |
2388 { | |
2389 int i; | |
2390 int size = 100; | |
2391 char *font_name = (char *) xmalloc (size); | |
2392 int total_length = 0; | |
2393 | |
2394 for (i = 0; i < XLFD_LAST; ++i) | |
2395 { | |
2396 /* Add 1 because of the leading `-'. */ | |
2397 int len = strlen (font->fields[i]) + 1; | |
2398 | |
2399 /* Reallocate font_name if necessary. Add 1 for the final | |
2400 NUL-byte. */ | |
2401 if (total_length + len + 1 >= size) | |
2402 { | |
2403 int new_size = max (2 * size, size + len + 1); | |
2404 int sz = new_size * sizeof *font_name; | |
2405 font_name = (char *) xrealloc (font_name, sz); | |
2406 size = new_size; | |
2407 } | |
2408 | |
2409 font_name[total_length] = '-'; | |
2410 bcopy (font->fields[i], font_name + total_length + 1, len - 1); | |
2411 total_length += len; | |
2412 } | |
2413 | |
2414 font_name[total_length] = 0; | |
2415 return font_name; | |
2416 } | |
2417 | |
2418 | |
2419 /* Free an array FONTS of N font_name structures. This frees FONTS | |
2420 itself and all `name' fields in its elements. */ | |
2421 | |
2422 static INLINE void | |
2423 free_font_names (fonts, n) | |
2424 struct font_name *fonts; | |
2425 int n; | |
2426 { | |
2427 while (n) | |
2428 xfree (fonts[--n].name); | |
2429 xfree (fonts); | |
2430 } | |
2431 | |
2432 | |
2433 /* Sort vector FONTS of font_name structures which contains NFONTS | |
2434 elements using qsort and comparison function CMPFN. F is the frame | |
2435 on which the fonts will be used. The global variable font_frame | |
2436 is temporarily set to F to make it available in CMPFN. */ | |
2437 | |
2438 static INLINE void | |
2439 sort_fonts (f, fonts, nfonts, cmpfn) | |
2440 struct frame *f; | |
2441 struct font_name *fonts; | |
2442 int nfonts; | |
2443 int (*cmpfn) P_ ((const void *, const void *)); | |
2444 { | |
2445 font_frame = f; | |
2446 qsort (fonts, nfonts, sizeof *fonts, cmpfn); | |
2447 font_frame = NULL; | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2448 } |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2449 |
24995 | 2450 |
2451 /* Get fonts matching PATTERN on frame F. If F is null, use the first | |
2452 display in x_display_list. FONTS is a pointer to a vector of | |
2453 NFONTS font_name structures. TRY_ALTERNATIVES_P non-zero means try | |
2454 alternative patterns from Valternate_fontname_alist if no fonts are | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2455 found matching PATTERN. |
24995 | 2456 |
2457 For all fonts found, set FONTS[i].name to the name of the font, | |
2458 allocated via xmalloc, and split font names into fields. Ignore | |
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2459 fonts that we can't parse. Value is the number of fonts found. */ |
24995 | 2460 |
2461 static int | |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2462 x_face_list_fonts (f, pattern, pfonts, nfonts, try_alternatives_p) |
24995 | 2463 struct frame *f; |
2464 char *pattern; | |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2465 struct font_name **pfonts; |
24995 | 2466 int nfonts, try_alternatives_p; |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2467 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2468 int n, nignored; |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2469 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2470 /* NTEMACS_TODO : currently this uses w32_list_fonts, but it may be |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2471 better to do it the other way around. */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2472 Lisp_Object lfonts; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2473 Lisp_Object lpattern, tem; |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2474 struct font_name *fonts = 0; |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2475 int num_fonts = nfonts; |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2476 |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2477 *pfonts = 0; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2478 lpattern = build_string (pattern); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2479 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2480 /* Get the list of fonts matching PATTERN. */ |
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2481 #ifdef WINDOWSNT |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2482 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2483 lfonts = w32_list_fonts (f, lpattern, 0, nfonts); |
35371
dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
Gerd Moellmann <gerd@gnu.org>
parents:
35369
diff
changeset
|
2484 UNBLOCK_INPUT; |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2485 #else |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2486 lfonts = x_list_fonts (f, lpattern, -1, nfonts); |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
2487 #endif |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2488 |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2489 if (nfonts < 0 && CONSP (lfonts)) |
49914
b4b6ede28a6f
(x_face_list_fonts): Fix int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49864
diff
changeset
|
2490 num_fonts = XFASTINT (Flength (lfonts)); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2491 |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2492 /* Make a copy of the font names we got from X, and |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2493 split them into fields. */ |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2494 n = nignored = 0; |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2495 for (tem = lfonts; CONSP (tem) && n < num_fonts; tem = XCDR (tem)) |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2496 { |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2497 Lisp_Object elt, tail; |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
2498 const char *name = SDATA (XCAR (tem)); |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2499 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2500 /* Ignore fonts matching a pattern from face-ignored-fonts. */ |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2501 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail)) |
24995 | 2502 { |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2503 elt = XCAR (tail); |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2504 if (STRINGP (elt) |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2505 && fast_c_string_match_ignore_case (elt, name) >= 0) |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2506 break; |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2507 } |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2508 if (!NILP (tail)) |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2509 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2510 ++nignored; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2511 continue; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2512 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2513 |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2514 if (! fonts) |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2515 { |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2516 *pfonts = (struct font_name *) xmalloc (num_fonts * sizeof **pfonts); |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2517 fonts = *pfonts; |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2518 } |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2519 |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2520 /* Make a copy of the font name. */ |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2521 fonts[n].name = xstrdup (name); |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2522 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2523 if (split_font_name (f, fonts + n, 1)) |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2524 { |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2525 if (font_scalable_p (fonts + n) |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2526 && !may_use_scalable_font_p (name)) |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2527 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2528 ++nignored; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2529 xfree (fonts[n].name); |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2530 } |
24995 | 2531 else |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2532 ++n; |
24995 | 2533 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2534 else |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2535 xfree (fonts[n].name); |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2536 } |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2537 |
24995 | 2538 /* If no fonts found, try patterns from Valternate_fontname_alist. */ |
2539 if (n == 0 && try_alternatives_p) | |
2540 { | |
2541 Lisp_Object list = Valternate_fontname_alist; | |
2542 | |
49863
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2543 if (*pfonts) |
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2544 { |
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2545 xfree (*pfonts); |
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2546 *pfonts = 0; |
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2547 } |
6d5c33f4dd05
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
2548 |
24995 | 2549 while (CONSP (list)) |
2550 { | |
2551 Lisp_Object entry = XCAR (list); | |
2552 if (CONSP (entry) | |
2553 && STRINGP (XCAR (entry)) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2554 && strcmp (SDATA (XCAR (entry)), pattern) == 0) |
24995 | 2555 break; |
2556 list = XCDR (list); | |
2557 } | |
2558 | |
2559 if (CONSP (list)) | |
2560 { | |
2561 Lisp_Object patterns = XCAR (list); | |
2562 Lisp_Object name; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2563 |
24995 | 2564 while (CONSP (patterns) |
2565 /* If list is screwed up, give up. */ | |
2566 && (name = XCAR (patterns), | |
2567 STRINGP (name)) | |
2568 /* Ignore patterns equal to PATTERN because we tried that | |
2569 already with no success. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2570 && (strcmp (SDATA (name), pattern) == 0 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2571 || (n = x_face_list_fonts (f, SDATA (name), |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2572 pfonts, nfonts, 0), |
24995 | 2573 n == 0))) |
2574 patterns = XCDR (patterns); | |
2575 } | |
2576 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2577 |
24995 | 2578 return n; |
2579 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2580 |
24995 | 2581 |
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2582 /* Check if a font matching pattern_offset_t on frame F is available |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2583 or not. PATTERN may be a cons (FAMILY . REGISTRY), in which case, |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2584 a font name pattern is generated from FAMILY and REGISTRY. */ |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2585 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2586 int |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2587 face_font_available_p (f, pattern) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2588 struct frame *f; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2589 Lisp_Object pattern; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2590 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2591 Lisp_Object fonts; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2592 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2593 if (! STRINGP (pattern)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2594 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2595 Lisp_Object family, registry; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2596 char *family_str, *registry_str, *pattern_str; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2597 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2598 CHECK_CONS (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2599 family = XCAR (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2600 if (NILP (family)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2601 family_str = "*"; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2602 else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2603 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2604 CHECK_STRING (family); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2605 family_str = (char *) SDATA (family); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2606 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2607 registry = XCDR (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2608 if (NILP (registry)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2609 registry_str = "*"; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2610 else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2611 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2612 CHECK_STRING (registry); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2613 registry_str = (char *) SDATA (registry); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2614 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2615 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2616 pattern_str = (char *) alloca (strlen (family_str) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2617 + strlen (registry_str) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2618 + 10); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2619 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2620 strcat (pattern_str, family_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2621 strcat (pattern_str, "-*-"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2622 strcat (pattern_str, registry_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2623 if (!index (registry_str, '-')) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2624 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2625 if (registry_str[strlen (registry_str) - 1] == '*') |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2626 strcat (pattern_str, "-*"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2627 else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2628 strcat (pattern_str, "*-*"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2629 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2630 pattern = build_string (pattern_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2631 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2632 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2633 /* Get the list of fonts matching PATTERN. */ |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2634 #ifdef WINDOWSNT |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2635 BLOCK_INPUT; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2636 fonts = w32_list_fonts (f, pattern, 0, 1); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2637 UNBLOCK_INPUT; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2638 #else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2639 fonts = x_list_fonts (f, pattern, -1, 1); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2640 #endif |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2641 return XINT (Flength (fonts)); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2642 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2643 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2644 |
24995 | 2645 /* Determine fonts matching PATTERN on frame F. Sort resulting fonts |
2646 using comparison function CMPFN. Value is the number of fonts | |
2647 found. If value is non-zero, *FONTS is set to a vector of | |
2648 font_name structures allocated from the heap containing matching | |
2649 fonts. Each element of *FONTS contains a name member that is also | |
2650 allocated from the heap. Font names in these structures are split | |
2651 into fields. Use free_font_names to free such an array. */ | |
2652 | |
2653 static int | |
2654 sorted_font_list (f, pattern, cmpfn, fonts) | |
2655 struct frame *f; | |
2656 char *pattern; | |
2657 int (*cmpfn) P_ ((const void *, const void *)); | |
2658 struct font_name **fonts; | |
2659 { | |
2660 int nfonts; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2661 |
24995 | 2662 /* Get the list of fonts matching pattern. 100 should suffice. */ |
25270 | 2663 nfonts = DEFAULT_FONT_LIST_LIMIT; |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2664 if (INTEGERP (Vfont_list_limit)) |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2665 nfonts = XINT (Vfont_list_limit); |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2666 |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2667 *fonts = NULL; |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2668 nfonts = x_face_list_fonts (f, pattern, fonts, nfonts, 1); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2669 |
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2670 /* Sort the resulting array and return it in *FONTS. If no |
24995 | 2671 fonts were found, make sure to set *FONTS to null. */ |
2672 if (nfonts) | |
2673 sort_fonts (f, *fonts, nfonts, cmpfn); | |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2674 else if (*fonts) |
24995 | 2675 { |
2676 xfree (*fonts); | |
2677 *fonts = NULL; | |
2678 } | |
2679 | |
2680 return nfonts; | |
2681 } | |
2682 | |
2683 | |
2684 /* Compare two font_name structures *A and *B. Value is analogous to | |
2685 strcmp. Sort order is given by the global variable | |
2686 font_sort_order. Font names are sorted so that, everything else | |
2687 being equal, fonts with a resolution closer to that of the frame on | |
2688 which they are used are listed first. The global variable | |
2689 font_frame is the frame on which we operate. */ | |
2690 | |
2691 static int | |
2692 cmp_font_names (a, b) | |
2693 const void *a, *b; | |
2694 { | |
2695 struct font_name *x = (struct font_name *) a; | |
2696 struct font_name *y = (struct font_name *) b; | |
2697 int cmp; | |
2698 | |
2699 /* All strings have been converted to lower-case by split_font_name, | |
2700 so we can use strcmp here. */ | |
2701 cmp = strcmp (x->fields[XLFD_FAMILY], y->fields[XLFD_FAMILY]); | |
2702 if (cmp == 0) | |
2703 { | |
2704 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2705 |
24995 | 2706 for (i = 0; i < DIM (font_sort_order) && cmp == 0; ++i) |
2707 { | |
2708 int j = font_sort_order[i]; | |
2709 cmp = x->numeric[j] - y->numeric[j]; | |
2710 } | |
2711 | |
2712 if (cmp == 0) | |
2713 { | |
2714 /* Everything else being equal, we prefer fonts with an | |
2715 y-resolution closer to that of the frame. */ | |
2716 int resy = FRAME_X_DISPLAY_INFO (font_frame)->resy; | |
2717 int x_resy = x->numeric[XLFD_RESY]; | |
2718 int y_resy = y->numeric[XLFD_RESY]; | |
2719 cmp = abs (resy - x_resy) - abs (resy - y_resy); | |
2720 } | |
2721 } | |
2722 | |
2723 return cmp; | |
2724 } | |
2725 | |
2726 | |
2727 /* Get a sorted list of fonts of family FAMILY on frame F. If PATTERN | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2728 is non-nil list fonts matching that pattern. Otherwise, if |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2729 REGISTRY is non-nil return only fonts with that registry, otherwise |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2730 return fonts of any registry. Set *FONTS to a vector of font_name |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2731 structures allocated from the heap containing the fonts found. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2732 Value is the number of fonts found. */ |
24995 | 2733 |
2734 static int | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2735 font_list_1 (f, pattern, family, registry, fonts) |
24995 | 2736 struct frame *f; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2737 Lisp_Object pattern, family, registry; |
24995 | 2738 struct font_name **fonts; |
2739 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2740 char *pattern_str, *family_str, *registry_str; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2741 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2742 if (NILP (pattern)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2743 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2744 family_str = (NILP (family) ? "*" : (char *) SDATA (family)); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2745 registry_str = (NILP (registry) ? "*" : (char *) SDATA (registry)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2746 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2747 pattern_str = (char *) alloca (strlen (family_str) |
29768
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2748 + strlen (registry_str) |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2749 + 10); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2750 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2751 strcat (pattern_str, family_str); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2752 strcat (pattern_str, "-*-"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2753 strcat (pattern_str, registry_str); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2754 if (!index (registry_str, '-')) |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2755 { |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2756 if (registry_str[strlen (registry_str) - 1] == '*') |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2757 strcat (pattern_str, "-*"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2758 else |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2759 strcat (pattern_str, "*-*"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2760 } |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2761 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2762 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2763 pattern_str = (char *) SDATA (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2764 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2765 return sorted_font_list (f, pattern_str, cmp_font_names, fonts); |
24995 | 2766 } |
2767 | |
2768 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2769 /* Concatenate font list FONTS1 and FONTS2. FONTS1 and FONTS2 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2770 contains NFONTS1 fonts and NFONTS2 fonts respectively. Return a |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2771 pointer to a newly allocated font list. FONTS1 and FONTS2 are |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2772 freed. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2773 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2774 static struct font_name * |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2775 concat_font_list (fonts1, nfonts1, fonts2, nfonts2) |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2776 struct font_name *fonts1, *fonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2777 int nfonts1, nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2778 { |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2779 int new_nfonts = nfonts1 + nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2780 struct font_name *new_fonts; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2781 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2782 new_fonts = (struct font_name *) xmalloc (sizeof *new_fonts * new_nfonts); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2783 bcopy (fonts1, new_fonts, sizeof *new_fonts * nfonts1); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2784 bcopy (fonts2, new_fonts + nfonts1, sizeof *new_fonts * nfonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2785 xfree (fonts1); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2786 xfree (fonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2787 return new_fonts; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2788 } |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2789 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2790 |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2791 /* Get a sorted list of fonts of family FAMILY on frame F. |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2792 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2793 If PATTERN is non-nil list fonts matching that pattern. |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2794 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2795 If REGISTRY is non-nil, return fonts with that registry and the |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2796 alternative registries from Vface_alternative_font_registry_alist. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2797 |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2798 If REGISTRY is nil return fonts of any registry. |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2799 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2800 Set *FONTS to a vector of font_name structures allocated from the |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2801 heap containing the fonts found. Value is the number of fonts |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2802 found. */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2803 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2804 static int |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2805 font_list (f, pattern, family, registry, fonts) |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2806 struct frame *f; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2807 Lisp_Object pattern, family, registry; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2808 struct font_name **fonts; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2809 { |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2810 int nfonts = font_list_1 (f, pattern, family, registry, fonts); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2811 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2812 if (!NILP (registry) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2813 && CONSP (Vface_alternative_font_registry_alist)) |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2814 { |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2815 Lisp_Object alter; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2816 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2817 alter = Fassoc (registry, Vface_alternative_font_registry_alist); |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2818 if (CONSP (alter)) |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2819 { |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2820 int reg_prio, i; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2821 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2822 for (alter = XCDR (alter), reg_prio = 1; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2823 CONSP (alter); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2824 alter = XCDR (alter), reg_prio++) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2825 if (STRINGP (XCAR (alter))) |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2826 { |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2827 int nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2828 struct font_name *fonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2829 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2830 nfonts2 = font_list_1 (f, pattern, family, XCAR (alter), |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2831 &fonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2832 for (i = 0; i < nfonts2; i++) |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2833 fonts2[i].registry_priority = reg_prio; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2834 *fonts = (nfonts > 0 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2835 ? concat_font_list (*fonts, nfonts, fonts2, nfonts2) |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2836 : fonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2837 nfonts += nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2838 } |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2839 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2840 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2841 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2842 return nfonts; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2843 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2844 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2845 |
24995 | 2846 /* Remove elements from LIST whose cars are `equal'. Called from |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2847 x-family-fonts and x-font-family-list to remove duplicate font |
24995 | 2848 entries. */ |
2849 | |
2850 static void | |
2851 remove_duplicates (list) | |
2852 Lisp_Object list; | |
2853 { | |
2854 Lisp_Object tail = list; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2855 |
24995 | 2856 while (!NILP (tail) && !NILP (XCDR (tail))) |
2857 { | |
2858 Lisp_Object next = XCDR (tail); | |
2859 if (!NILP (Fequal (XCAR (next), XCAR (tail)))) | |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39914
diff
changeset
|
2860 XSETCDR (tail, XCDR (next)); |
24995 | 2861 else |
2862 tail = XCDR (tail); | |
2863 } | |
2864 } | |
2865 | |
2866 | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2867 DEFUN ("x-family-fonts", Fx_family_fonts, Sx_family_fonts, 0, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2868 doc: /* Return a list of available fonts of family FAMILY on FRAME. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2869 If FAMILY is omitted or nil, list all families. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2870 Otherwise, FAMILY must be a string, possibly containing wildcards |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2871 `?' and `*'. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2872 If FRAME is omitted or nil, use the selected frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2873 Each element of the result is a vector [FAMILY WIDTH POINT-SIZE WEIGHT |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2874 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2875 FAMILY is the font family name. POINT-SIZE is the size of the |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2876 font in 1/10 pt. WIDTH, WEIGHT, and SLANT are symbols describing the |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2877 width, weight and slant of the font. These symbols are the same as for |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2878 face attributes. FIXED-P is non-nil if the font is fixed-pitch. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2879 FULL is the full name of the font, and REGISTRY-AND-ENCODING is a string |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2880 giving the registry and encoding of the font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2881 The result list is sorted according to the current setting of |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2882 the face font sort order. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2883 (family, frame) |
24995 | 2884 Lisp_Object family, frame; |
2885 { | |
2886 struct frame *f = check_x_frame (frame); | |
2887 struct font_name *fonts; | |
2888 int i, nfonts; | |
2889 Lisp_Object result; | |
2890 struct gcpro gcpro1; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2891 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2892 if (!NILP (family)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2893 CHECK_STRING (family); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2894 |
24995 | 2895 result = Qnil; |
2896 GCPRO1 (result); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2897 nfonts = font_list (f, Qnil, family, Qnil, &fonts); |
24995 | 2898 for (i = nfonts - 1; i >= 0; --i) |
2899 { | |
25270 | 2900 Lisp_Object v = Fmake_vector (make_number (8), Qnil); |
2901 char *tem; | |
24995 | 2902 |
2903 ASET (v, 0, build_string (fonts[i].fields[XLFD_FAMILY])); | |
2904 ASET (v, 1, xlfd_symbolic_swidth (fonts + i)); | |
2905 ASET (v, 2, make_number (xlfd_point_size (f, fonts + i))); | |
2906 ASET (v, 3, xlfd_symbolic_weight (fonts + i)); | |
2907 ASET (v, 4, xlfd_symbolic_slant (fonts + i)); | |
2908 ASET (v, 5, xlfd_fixed_p (fonts + i) ? Qt : Qnil); | |
25270 | 2909 tem = build_font_name (fonts + i); |
2910 ASET (v, 6, build_string (tem)); | |
2911 sprintf (tem, "%s-%s", fonts[i].fields[XLFD_REGISTRY], | |
2912 fonts[i].fields[XLFD_ENCODING]); | |
2913 ASET (v, 7, build_string (tem)); | |
2914 xfree (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2915 |
24995 | 2916 result = Fcons (v, result); |
2917 } | |
2918 | |
2919 remove_duplicates (result); | |
2920 free_font_names (fonts, nfonts); | |
2921 UNGCPRO; | |
2922 return result; | |
2923 } | |
2924 | |
2925 | |
2926 DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, | |
2927 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2928 doc: /* Return a list of available font families on FRAME. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2929 If FRAME is omitted or nil, use the selected frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2930 Value is a list of conses (FAMILY . FIXED-P) where FAMILY |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2931 is a font family, and FIXED-P is non-nil if fonts of that family |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2932 are fixed-pitch. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2933 (frame) |
24995 | 2934 Lisp_Object frame; |
2935 { | |
2936 struct frame *f = check_x_frame (frame); | |
2937 int nfonts, i; | |
2938 struct font_name *fonts; | |
2939 Lisp_Object result; | |
2940 struct gcpro gcpro1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
2941 int count = SPECPDL_INDEX (); |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2942 |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2943 /* Let's consider all fonts. */ |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2944 specbind (intern ("font-list-limit"), make_number (-1)); |
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2945 nfonts = font_list (f, Qnil, Qnil, Qnil, &fonts); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2946 |
24995 | 2947 result = Qnil; |
2948 GCPRO1 (result); | |
2949 for (i = nfonts - 1; i >= 0; --i) | |
2950 result = Fcons (Fcons (build_string (fonts[i].fields[XLFD_FAMILY]), | |
2951 xlfd_fixed_p (fonts + i) ? Qt : Qnil), | |
2952 result); | |
2953 | |
2954 remove_duplicates (result); | |
2955 free_font_names (fonts, nfonts); | |
2956 UNGCPRO; | |
25270 | 2957 return unbind_to (count, result); |
24995 | 2958 } |
2959 | |
2960 | |
2961 DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 5, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2962 doc: /* Return a list of the names of available fonts matching PATTERN. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2963 If optional arguments FACE and FRAME are specified, return only fonts |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2964 the same size as FACE on FRAME. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2965 PATTERN is a string, perhaps with wildcard characters; |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2966 the * character matches any substring, and |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2967 the ? character matches any single character. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2968 PATTERN is case-insensitive. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2969 FACE is a face name--a symbol. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2970 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2971 The return value is a list of strings, suitable as arguments to |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2972 set-face-font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2973 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2974 Fonts Emacs can't use may or may not be excluded |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2975 even if they match PATTERN and FACE. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2976 The optional fourth argument MAXIMUM sets a limit on how many |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2977 fonts to match. The first MAXIMUM fonts are reported. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2978 The optional fifth argument WIDTH, if specified, is a number of columns |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2979 occupied by a character of a font. In that case, return only fonts |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2980 the WIDTH times as wide as FACE on FRAME. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2981 (pattern, face, frame, maximum, width) |
24995 | 2982 Lisp_Object pattern, face, frame, maximum, width; |
2983 { | |
2984 struct frame *f; | |
2985 int size; | |
2986 int maxnames; | |
2987 | |
2988 check_x (); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2989 CHECK_STRING (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2990 |
24995 | 2991 if (NILP (maximum)) |
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
2992 maxnames = -1; |
24995 | 2993 else |
2994 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2995 CHECK_NATNUM (maximum); |
24995 | 2996 maxnames = XINT (maximum); |
2997 } | |
2998 | |
2999 if (!NILP (width)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3000 CHECK_NUMBER (width); |
24995 | 3001 |
3002 /* We can't simply call check_x_frame because this function may be | |
3003 called before any frame is created. */ | |
3004 f = frame_or_selected_frame (frame, 2); | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3005 if (!FRAME_WINDOW_P (f)) |
24995 | 3006 { |
3007 /* Perhaps we have not yet created any frame. */ | |
3008 f = NULL; | |
3009 face = Qnil; | |
3010 } | |
3011 | |
3012 /* Determine the width standard for comparison with the fonts we find. */ | |
3013 | |
3014 if (NILP (face)) | |
3015 size = 0; | |
3016 else | |
3017 { | |
3018 /* This is of limited utility since it works with character | |
3019 widths. Keep it for compatibility. --gerd. */ | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
3020 int face_id = lookup_named_face (f, face, 0, 0); |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3021 struct face *face = (face_id < 0 |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3022 ? NULL |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3023 : FACE_FROM_ID (f, face_id)); |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3024 |
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3025 #ifdef WINDOWSNT |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3026 /* For historic reasons, FONT_WIDTH refers to average width on W32, |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3027 not maximum as on X. Redefine here. */ |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3028 #undef FONT_WIDTH |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3029 #define FONT_WIDTH FONT_MAX_WIDTH |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3030 #endif |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3031 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3032 if (face && face->font) |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3033 size = FONT_WIDTH (face->font); |
24995 | 3034 else |
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3035 size = FONT_WIDTH (FRAME_FONT (f)); /* FRAME_COLUMN_WIDTH (f) */ |
24995 | 3036 |
3037 if (!NILP (width)) | |
3038 size *= XINT (width); | |
3039 } | |
3040 | |
3041 { | |
3042 Lisp_Object args[2]; | |
3043 | |
3044 args[0] = x_list_fonts (f, pattern, size, maxnames); | |
3045 if (f == NULL) | |
3046 /* We don't have to check fontsets. */ | |
3047 return args[0]; | |
3048 args[1] = list_fontsets (f, pattern, size); | |
3049 return Fnconc (2, args); | |
3050 } | |
3051 } | |
3052 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3053 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3054 |
3055 | |
3056 | |
3057 /*********************************************************************** | |
3058 Lisp Faces | |
3059 ***********************************************************************/ | |
3060 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3061 /* Access face attributes of face LFACE, a Lisp vector. */ |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3062 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3063 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3064 #define LFACE_HEIGHT(LFACE) AREF ((LFACE), LFACE_HEIGHT_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3065 #define LFACE_WEIGHT(LFACE) AREF ((LFACE), LFACE_WEIGHT_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3066 #define LFACE_SLANT(LFACE) AREF ((LFACE), LFACE_SLANT_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3067 #define LFACE_UNDERLINE(LFACE) AREF ((LFACE), LFACE_UNDERLINE_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3068 #define LFACE_INVERSE(LFACE) AREF ((LFACE), LFACE_INVERSE_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3069 #define LFACE_FOREGROUND(LFACE) AREF ((LFACE), LFACE_FOREGROUND_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3070 #define LFACE_BACKGROUND(LFACE) AREF ((LFACE), LFACE_BACKGROUND_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3071 #define LFACE_STIPPLE(LFACE) AREF ((LFACE), LFACE_STIPPLE_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3072 #define LFACE_SWIDTH(LFACE) AREF ((LFACE), LFACE_SWIDTH_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3073 #define LFACE_OVERLINE(LFACE) AREF ((LFACE), LFACE_OVERLINE_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3074 #define LFACE_STRIKE_THROUGH(LFACE) AREF ((LFACE), LFACE_STRIKE_THROUGH_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3075 #define LFACE_BOX(LFACE) AREF ((LFACE), LFACE_BOX_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3076 #define LFACE_FONT(LFACE) AREF ((LFACE), LFACE_FONT_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3077 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3078 #define LFACE_AVGWIDTH(LFACE) AREF ((LFACE), LFACE_AVGWIDTH_INDEX) |
24995 | 3079 |
3080 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
3081 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
3082 | |
3083 #define LFACEP(LFACE) \ | |
3084 (VECTORP (LFACE) \ | |
3085 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3086 && EQ (AREF (LFACE, 0), Qface)) |
24995 | 3087 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3088 |
24995 | 3089 #if GLYPH_DEBUG |
3090 | |
3091 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
3092 | |
3093 static void | |
3094 check_lface_attrs (attrs) | |
3095 Lisp_Object *attrs; | |
3096 { | |
3097 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
3098 || STRINGP (attrs[LFACE_FAMILY_INDEX])); | |
3099 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) | |
3100 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3101 xassert (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3102 || INTEGERP (attrs[LFACE_AVGWIDTH_INDEX])); |
24995 | 3103 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) |
31178 | 3104 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
3105 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
3106 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
24995 | 3107 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
3108 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); | |
3109 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
3110 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); | |
3111 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
3112 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) | |
3113 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
3114 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
3115 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) | |
3116 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
3117 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
3118 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
3119 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
3120 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
3121 || SYMBOLP (attrs[LFACE_BOX_INDEX]) | |
3122 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
3123 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
3124 || CONSP (attrs[LFACE_BOX_INDEX])); | |
3125 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
3126 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); | |
3127 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
3128 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); | |
3129 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
3130 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); | |
31178 | 3131 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
3132 || NILP (attrs[LFACE_INHERIT_INDEX]) | |
3133 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
3134 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
24995 | 3135 #ifdef HAVE_WINDOW_SYSTEM |
3136 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
3137 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3138 || !NILP (Fbitmap_spec_p (attrs[LFACE_STIPPLE_INDEX]))); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3139 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
28237
2f636fd2f714
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error.
Gerd Moellmann <gerd@gnu.org>
parents:
28230
diff
changeset
|
3140 || NILP (attrs[LFACE_FONT_INDEX]) |
2f636fd2f714
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error.
Gerd Moellmann <gerd@gnu.org>
parents:
28230
diff
changeset
|
3141 || STRINGP (attrs[LFACE_FONT_INDEX])); |
24995 | 3142 #endif |
3143 } | |
3144 | |
3145 | |
3146 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
3147 | |
3148 static void | |
3149 check_lface (lface) | |
3150 Lisp_Object lface; | |
3151 { | |
3152 if (!NILP (lface)) | |
3153 { | |
3154 xassert (LFACEP (lface)); | |
3155 check_lface_attrs (XVECTOR (lface)->contents); | |
3156 } | |
3157 } | |
3158 | |
3159 #else /* GLYPH_DEBUG == 0 */ | |
3160 | |
3161 #define check_lface_attrs(attrs) (void) 0 | |
3162 #define check_lface(lface) (void) 0 | |
3163 | |
3164 #endif /* GLYPH_DEBUG == 0 */ | |
3165 | |
3166 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3167 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3168 /* Face-merge cycle checking. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3169 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3170 /* A `named merge point' is simply a point during face-merging where we |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3171 look up a face by name. We keep a stack of which named lookups we're |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3172 currently processing so that we can easily detect cycles, using a |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3173 linked- list of struct named_merge_point structures, typically |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3174 allocated on the stack frame of the named lookup functions which are |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3175 active (so no consing is required). */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3176 struct named_merge_point |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3177 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3178 Lisp_Object face_name; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3179 struct named_merge_point *prev; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3180 }; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3181 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3182 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3183 /* If a face merging cycle is detected for FACE_NAME, return 0, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3184 otherwise add NEW_NAMED_MERGE_POINT, which is initialized using |
55982
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
3185 FACE_NAME, as the head of the linked list pointed to by |
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
3186 NAMED_MERGE_POINTS, and return 1. */ |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3187 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3188 static INLINE int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3189 push_named_merge_point (struct named_merge_point *new_named_merge_point, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3190 Lisp_Object face_name, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3191 struct named_merge_point **named_merge_points) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3192 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3193 struct named_merge_point *prev; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3194 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3195 for (prev = *named_merge_points; prev; prev = prev->prev) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3196 if (EQ (face_name, prev->face_name)) |
55982
de4c259f651b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
55966
diff
changeset
|
3197 return 0; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3198 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3199 new_named_merge_point->face_name = face_name; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3200 new_named_merge_point->prev = *named_merge_points; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3201 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3202 *named_merge_points = new_named_merge_point; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3203 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3204 return 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3205 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3206 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3207 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3208 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3209 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3210 /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3211 to make it a symvol. If FACE_NAME is an alias for another face, |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3212 return that face's name. */ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3213 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3214 static Lisp_Object |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3215 resolve_face_name (face_name) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3216 Lisp_Object face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3217 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3218 Lisp_Object aliased; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3219 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3220 if (STRINGP (face_name)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3221 face_name = intern (SDATA (face_name)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3222 |
33070
ca31e3965686
(resolve_face_name): Handle case that FACE_NAME
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
3223 while (SYMBOLP (face_name)) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3224 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3225 aliased = Fget (face_name, Qface_alias); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3226 if (NILP (aliased)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3227 break; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3228 else |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3229 face_name = aliased; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3230 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3231 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3232 return face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3233 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3234 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3235 |
24995 | 3236 /* Return the face definition of FACE_NAME on frame F. F null means |
33853
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
3237 return the definition for new frames. FACE_NAME may be a string or |
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
3238 a symbol (apparently Emacs 20.2 allowed strings as face names in |
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
3239 face text properties; Ediff uses that). If FACE_NAME is an alias |
eb4affa4abc6
(lface_from_face_name): Function comment fix.
Gerd Moellmann <gerd@gnu.org>
parents:
33529
diff
changeset
|
3240 for another face, return that face's definition. If SIGNAL_P is |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3241 non-zero, signal an error if FACE_NAME is not a valid face name. |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3242 If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3243 name. */ |
24995 | 3244 |
3245 static INLINE Lisp_Object | |
3246 lface_from_face_name (f, face_name, signal_p) | |
3247 struct frame *f; | |
3248 Lisp_Object face_name; | |
3249 int signal_p; | |
3250 { | |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3251 Lisp_Object lface; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3252 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3253 face_name = resolve_face_name (face_name); |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3254 |
24995 | 3255 if (f) |
3256 lface = assq_no_quit (face_name, f->face_alist); | |
3257 else | |
3258 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
3259 | |
3260 if (CONSP (lface)) | |
3261 lface = XCDR (lface); | |
3262 else if (signal_p) | |
3263 signal_error ("Invalid face", face_name); | |
3264 | |
3265 check_lface (lface); | |
3266 return lface; | |
3267 } | |
3268 | |
3269 | |
3270 /* Get face attributes of face FACE_NAME from frame-local faces on | |
3271 frame F. Store the resulting attributes in ATTRS which must point | |
3272 to a vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If SIGNAL_P | |
3273 is non-zero, signal an error if FACE_NAME does not name a face. | |
3274 Otherwise, value is zero if FACE_NAME is not a face. */ | |
3275 | |
3276 static INLINE int | |
3277 get_lface_attributes (f, face_name, attrs, signal_p) | |
3278 struct frame *f; | |
3279 Lisp_Object face_name; | |
3280 Lisp_Object *attrs; | |
3281 int signal_p; | |
3282 { | |
3283 Lisp_Object lface; | |
3284 int success_p; | |
3285 | |
3286 lface = lface_from_face_name (f, face_name, signal_p); | |
3287 if (!NILP (lface)) | |
3288 { | |
3289 bcopy (XVECTOR (lface)->contents, attrs, | |
3290 LFACE_VECTOR_SIZE * sizeof *attrs); | |
3291 success_p = 1; | |
3292 } | |
3293 else | |
3294 success_p = 0; | |
3295 | |
3296 return success_p; | |
3297 } | |
3298 | |
3299 | |
3300 /* Non-zero if all attributes in face attribute vector ATTRS are | |
3301 specified, i.e. are non-nil. */ | |
3302 | |
3303 static int | |
3304 lface_fully_specified_p (attrs) | |
3305 Lisp_Object *attrs; | |
3306 { | |
3307 int i; | |
3308 | |
3309 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3310 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3311 && i != LFACE_AVGWIDTH_INDEX) |
53274
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3312 if (UNSPECIFIEDP (attrs[i]) |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3313 #ifdef MAC_OS |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3314 /* MAC_TODO: No stipple support on Mac OS yet, this index is |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3315 always unspecified. */ |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3316 && i != LFACE_STIPPLE_INDEX |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3317 #endif |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3318 ) |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3319 break; |
24995 | 3320 |
3321 return i == LFACE_VECTOR_SIZE; | |
3322 } | |
3323 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3324 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 3325 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3326 /* Set font-related attributes of Lisp face LFACE from the fullname of |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3327 the font opened by FONTNAME. If FORCE_P is zero, set only |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3328 unspecified attributes of LFACE. The exception is `font' |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3329 attribute. It is set to FONTNAME as is regardless of FORCE_P. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3330 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3331 If FONTNAME is not available on frame F, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3332 return 0 if MAY_FAIL_P is non-zero, otherwise abort. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3333 If the fullname is not in a valid XLFD format, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3334 return 0 if MAY_FAIL_P is non-zero, otherwise set normal values |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3335 in LFACE and return 1. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3336 Otherwise, return 1. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3337 |
24995 | 3338 static int |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3339 set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p) |
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
3340 struct frame *f; |
24995 | 3341 Lisp_Object lface; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3342 Lisp_Object fontname; |
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3343 int force_p, may_fail_p; |
24995 | 3344 { |
3345 struct font_name font; | |
3346 char *buffer; | |
3347 int pt; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3348 int have_xlfd_p; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3349 int fontset; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3350 char *font_name = SDATA (fontname); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3351 struct font_info *font_info; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3352 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3353 /* If FONTNAME is actually a fontset name, get ASCII font name of it. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3354 fontset = fs_query_fontset (fontname, 0); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3355 if (fontset >= 0) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3356 font_name = SDATA (fontset_ascii (fontset)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3357 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3358 /* Check if FONT_NAME is surely available on the system. Usually |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3359 FONT_NAME is already cached for the frame F and FS_LOAD_FONT |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3360 returns quickly. But, even if FONT_NAME is not yet cached, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3361 caching it now is not futail because we anyway load the font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3362 later. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3363 BLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3364 font_info = FS_LOAD_FONT (f, 0, font_name, -1); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3365 UNBLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3366 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3367 if (!font_info) |
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3368 { |
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3369 if (may_fail_p) |
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3370 return 0; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3371 abort (); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3372 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3373 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3374 font.name = STRDUPA (font_info->full_name); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3375 have_xlfd_p = split_font_name (f, &font, 1); |
24995 | 3376 |
3377 /* Set attributes only if unspecified, otherwise face defaults for | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3378 new frames would never take effect. If we couldn't get a font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3379 name conforming to XLFD, set normal values. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3380 |
24995 | 3381 if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface))) |
3382 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3383 Lisp_Object val; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3384 if (have_xlfd_p) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3385 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3386 buffer = (char *) alloca (strlen (font.fields[XLFD_FAMILY]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3387 + strlen (font.fields[XLFD_FOUNDRY]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3388 + 2); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3389 sprintf (buffer, "%s-%s", font.fields[XLFD_FOUNDRY], |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3390 font.fields[XLFD_FAMILY]); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3391 val = build_string (buffer); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3392 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3393 else |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3394 val = build_string ("*"); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3395 LFACE_FAMILY (lface) = val; |
24995 | 3396 } |
3397 | |
3398 if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface))) | |
3399 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3400 if (have_xlfd_p) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3401 pt = xlfd_point_size (f, &font); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3402 else |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3403 pt = pixel_point_size (f, font_info->height * 10); |
24995 | 3404 xassert (pt > 0); |
3405 LFACE_HEIGHT (lface) = make_number (pt); | |
3406 } | |
3407 | |
3408 if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface))) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3409 LFACE_SWIDTH (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3410 = have_xlfd_p ? xlfd_symbolic_swidth (&font) : Qnormal; |
24995 | 3411 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3412 if (force_p || UNSPECIFIEDP (LFACE_AVGWIDTH (lface))) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3413 LFACE_AVGWIDTH (lface) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3414 = (have_xlfd_p |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3415 ? make_number (font.numeric[XLFD_AVGWIDTH]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3416 : Qunspecified); |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3417 |
24995 | 3418 if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface))) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3419 LFACE_WEIGHT (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3420 = have_xlfd_p ? xlfd_symbolic_weight (&font) : Qnormal; |
24995 | 3421 |
3422 if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface))) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3423 LFACE_SLANT (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3424 = have_xlfd_p ? xlfd_symbolic_slant (&font) : Qnormal; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3425 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3426 LFACE_FONT (lface) = fontname; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3427 |
24995 | 3428 return 1; |
3429 } | |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3430 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3431 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3432 |
3433 | |
31178 | 3434 /* Merges the face height FROM with the face height TO, and returns the |
3435 merged height. If FROM is an invalid height, then INVALID is | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3436 returned instead. FROM and TO may be either absolute face heights or |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3437 `relative' heights; the returned value is always an absolute height |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3438 unless both FROM and TO are relative. GCPRO is a lisp value that |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3439 will be protected from garbage-collection if this function makes a |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3440 call into lisp. */ |
31178 | 3441 |
3442 Lisp_Object | |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3443 merge_face_heights (from, to, invalid) |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3444 Lisp_Object from, to, invalid; |
31178 | 3445 { |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3446 Lisp_Object result = invalid; |
31178 | 3447 |
3448 if (INTEGERP (from)) | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3449 /* FROM is absolute, just use it as is. */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3450 result = from; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3451 else if (FLOATP (from)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3452 /* FROM is a scale, use it to adjust TO. */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3453 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3454 if (INTEGERP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3455 /* relative X absolute => absolute */ |
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
3456 result = make_number ((EMACS_INT)(XFLOAT_DATA (from) * XINT (to))); |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3457 else if (FLOATP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3458 /* relative X relative => relative */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3459 result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to)); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3460 else if (UNSPECIFIEDP (to)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3461 result = from; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3462 } |
31178 | 3463 else if (FUNCTIONP (from)) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3464 /* FROM is a function, which use to adjust TO. */ |
31178 | 3465 { |
3466 /* Call function with current height as argument. | |
3467 From is the new height. */ | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3468 Lisp_Object args[2]; |
31178 | 3469 |
3470 args[0] = from; | |
3471 args[1] = to; | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3472 result = safe_call (2, args); |
31178 | 3473 |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3474 /* Ensure that if TO was absolute, so is the result. */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3475 if (INTEGERP (to) && !INTEGERP (result)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3476 result = invalid; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3477 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3478 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3479 return result; |
31178 | 3480 } |
3481 | |
3482 | |
3483 /* Merge two Lisp face attribute vectors on frame F, FROM and TO, and | |
31259
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3484 store the resulting attributes in TO, which must be already be |
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3485 completely specified and contain only absolute attributes. Every |
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3486 specified attribute of FROM overrides the corresponding attribute of |
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3487 TO; relative attributes in FROM are merged with the absolute value in |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3488 TO and replace it. NAMED_MERGE_POINTS is used internally to detect |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3489 loops in face inheritance; it should be 0 when called from other |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3490 places. */ |
24995 | 3491 |
3492 static INLINE void | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3493 merge_face_vectors (f, from, to, named_merge_points) |
31178 | 3494 struct frame *f; |
24995 | 3495 Lisp_Object *from, *to; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3496 struct named_merge_point *named_merge_points; |
24995 | 3497 { |
3498 int i; | |
31178 | 3499 |
3500 /* If FROM inherits from some other faces, merge their attributes into | |
3501 TO before merging FROM's direct attributes. Note that an :inherit | |
3502 attribute of `unspecified' is the same as one of nil; we never | |
3503 merge :inherit attributes, so nil is more correct, but lots of | |
3504 other code uses `unspecified' as a generic value for face attributes. */ | |
3505 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
3506 && !NILP (from[LFACE_INHERIT_INDEX])) | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3507 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
31178 | 3508 |
31221 | 3509 /* If TO specifies a :font attribute, and FROM specifies some |
3510 font-related attribute, we need to clear TO's :font attribute | |
3511 (because it will be inconsistent with whatever FROM specifies, and | |
3512 FROM takes precedence). */ | |
3513 if (!NILP (to[LFACE_FONT_INDEX]) | |
3514 && (!UNSPECIFIEDP (from[LFACE_FAMILY_INDEX]) | |
3515 || !UNSPECIFIEDP (from[LFACE_HEIGHT_INDEX]) | |
3516 || !UNSPECIFIEDP (from[LFACE_WEIGHT_INDEX]) | |
3517 || !UNSPECIFIEDP (from[LFACE_SLANT_INDEX]) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3518 || !UNSPECIFIEDP (from[LFACE_SWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3519 || !UNSPECIFIEDP (from[LFACE_AVGWIDTH_INDEX]))) |
31221 | 3520 to[LFACE_FONT_INDEX] = Qnil; |
3521 | |
24995 | 3522 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
3523 if (!UNSPECIFIEDP (from[i])) | |
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3524 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3525 if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i])) |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3526 to[i] = merge_face_heights (from[i], to[i], to[i]); |
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3527 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3528 to[i] = from[i]; |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3529 } |
31178 | 3530 |
3531 /* TO is always an absolute face, which should inherit from nothing. | |
3532 We blindly copy the :inherit attribute above and fix it up here. */ | |
3533 to[LFACE_INHERIT_INDEX] = Qnil; | |
3534 } | |
3535 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3536 /* Merge the named face FACE_NAME on frame F, into the vector of face |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3537 attributes TO. NAMED_MERGE_POINTS is used to detect loops in face |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3538 inheritance. Returns true if FACE_NAME is a valid face name and |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3539 merging succeeded. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3540 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3541 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3542 merge_named_face (f, face_name, to, named_merge_points) |
31178 | 3543 struct frame *f; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3544 Lisp_Object face_name; |
31178 | 3545 Lisp_Object *to; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3546 struct named_merge_point *named_merge_points; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3547 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3548 struct named_merge_point named_merge_point; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3549 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3550 if (push_named_merge_point (&named_merge_point, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3551 face_name, &named_merge_points)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3552 { |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3553 struct gcpro gcpro1; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3554 Lisp_Object from[LFACE_VECTOR_SIZE]; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3555 int ok = get_lface_attributes (f, face_name, from, 0); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3556 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3557 if (ok) |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3558 { |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3559 GCPRO1 (named_merge_point.face_name); |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3560 merge_face_vectors (f, from, to, named_merge_points); |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3561 UNGCPRO; |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3562 } |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3563 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3564 return ok; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3565 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3566 else |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3567 return 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3568 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3569 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3570 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3571 /* Merge face attributes from the lisp `face reference' FACE_REF on |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3572 frame F into the face attribute vector TO. If ERR_MSGS is non-zero, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3573 problems with FACE_REF cause an error message to be shown. Return |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3574 non-zero if no errors occurred (regardless of the value of ERR_MSGS). |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3575 NAMED_MERGE_POINTS is used to detect loops in face inheritance or |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3576 list structure; it may be 0 for most callers. |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3577 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3578 FACE_REF may be a single face specification or a list of such |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3579 specifications. Each face specification can be: |
24995 | 3580 |
3581 1. A symbol or string naming a Lisp face. | |
3582 | |
3583 2. A property list of the form (KEYWORD VALUE ...) where each | |
3584 KEYWORD is a face attribute name, and value is an appropriate value | |
3585 for that attribute. | |
3586 | |
3587 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
3588 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
3589 for compatibility with 20.2. | |
3590 | |
3591 Face specifications earlier in lists take precedence over later | |
3592 specifications. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3593 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3594 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3595 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
24995 | 3596 struct frame *f; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3597 Lisp_Object face_ref; |
24995 | 3598 Lisp_Object *to; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3599 int err_msgs; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3600 struct named_merge_point *named_merge_points; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3601 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3602 int ok = 1; /* Succeed without an error? */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3603 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3604 if (CONSP (face_ref)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3605 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3606 Lisp_Object first = XCAR (face_ref); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3607 |
24995 | 3608 if (EQ (first, Qforeground_color) |
3609 || EQ (first, Qbackground_color)) | |
3610 { | |
3611 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
3612 . COLOR). COLOR must be a string. */ | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3613 Lisp_Object color_name = XCDR (face_ref); |
24995 | 3614 Lisp_Object color = first; |
3615 | |
3616 if (STRINGP (color_name)) | |
3617 { | |
3618 if (EQ (color, Qforeground_color)) | |
3619 to[LFACE_FOREGROUND_INDEX] = color_name; | |
3620 else | |
3621 to[LFACE_BACKGROUND_INDEX] = color_name; | |
3622 } | |
3623 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3624 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3625 if (err_msgs) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3626 add_to_log ("Invalid face color", color_name, Qnil); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3627 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3628 } |
24995 | 3629 } |
3630 else if (SYMBOLP (first) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3631 && *SDATA (SYMBOL_NAME (first)) == ':') |
24995 | 3632 { |
3633 /* Assume this is the property list form. */ | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3634 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
24995 | 3635 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3636 Lisp_Object keyword = XCAR (face_ref); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3637 Lisp_Object value = XCAR (XCDR (face_ref)); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3638 int err = 0; |
24995 | 3639 |
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3640 /* Specifying `unspecified' is a no-op. */ |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3641 if (EQ (value, Qunspecified)) |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3642 ; |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3643 else if (EQ (keyword, QCfamily)) |
24995 | 3644 { |
3645 if (STRINGP (value)) | |
3646 to[LFACE_FAMILY_INDEX] = value; | |
3647 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3648 err = 1; |
24995 | 3649 } |
3650 else if (EQ (keyword, QCheight)) | |
3651 { | |
31178 | 3652 Lisp_Object new_height = |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3653 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
31178 | 3654 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3655 if (! NILP (new_height)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3656 to[LFACE_HEIGHT_INDEX] = new_height; |
24995 | 3657 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3658 err = 1; |
24995 | 3659 } |
3660 else if (EQ (keyword, QCweight)) | |
3661 { | |
3662 if (SYMBOLP (value) | |
3663 && face_numeric_weight (value) >= 0) | |
3664 to[LFACE_WEIGHT_INDEX] = value; | |
3665 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3666 err = 1; |
24995 | 3667 } |
3668 else if (EQ (keyword, QCslant)) | |
3669 { | |
3670 if (SYMBOLP (value) | |
3671 && face_numeric_slant (value) >= 0) | |
3672 to[LFACE_SLANT_INDEX] = value; | |
3673 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3674 err = 1; |
24995 | 3675 } |
3676 else if (EQ (keyword, QCunderline)) | |
3677 { | |
3678 if (EQ (value, Qt) | |
3679 || NILP (value) | |
3680 || STRINGP (value)) | |
3681 to[LFACE_UNDERLINE_INDEX] = value; | |
3682 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3683 err = 1; |
24995 | 3684 } |
3685 else if (EQ (keyword, QCoverline)) | |
3686 { | |
3687 if (EQ (value, Qt) | |
3688 || NILP (value) | |
3689 || STRINGP (value)) | |
3690 to[LFACE_OVERLINE_INDEX] = value; | |
3691 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3692 err = 1; |
24995 | 3693 } |
3694 else if (EQ (keyword, QCstrike_through)) | |
3695 { | |
3696 if (EQ (value, Qt) | |
3697 || NILP (value) | |
3698 || STRINGP (value)) | |
3699 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
3700 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3701 err = 1; |
24995 | 3702 } |
3703 else if (EQ (keyword, QCbox)) | |
3704 { | |
3705 if (EQ (value, Qt)) | |
3706 value = make_number (1); | |
3707 if (INTEGERP (value) | |
3708 || STRINGP (value) | |
3709 || CONSP (value) | |
3710 || NILP (value)) | |
3711 to[LFACE_BOX_INDEX] = value; | |
3712 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3713 err = 1; |
24995 | 3714 } |
3715 else if (EQ (keyword, QCinverse_video) | |
3716 || EQ (keyword, QCreverse_video)) | |
3717 { | |
3718 if (EQ (value, Qt) || NILP (value)) | |
3719 to[LFACE_INVERSE_INDEX] = value; | |
3720 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3721 err = 1; |
24995 | 3722 } |
3723 else if (EQ (keyword, QCforeground)) | |
3724 { | |
3725 if (STRINGP (value)) | |
3726 to[LFACE_FOREGROUND_INDEX] = value; | |
3727 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3728 err = 1; |
24995 | 3729 } |
3730 else if (EQ (keyword, QCbackground)) | |
3731 { | |
3732 if (STRINGP (value)) | |
3733 to[LFACE_BACKGROUND_INDEX] = value; | |
3734 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3735 err = 1; |
24995 | 3736 } |
3737 else if (EQ (keyword, QCstipple)) | |
3738 { | |
3739 #ifdef HAVE_X_WINDOWS | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3740 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
24995 | 3741 if (!NILP (pixmap_p)) |
3742 to[LFACE_STIPPLE_INDEX] = value; | |
3743 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3744 err = 1; |
24995 | 3745 #endif |
3746 } | |
3747 else if (EQ (keyword, QCwidth)) | |
3748 { | |
3749 if (SYMBOLP (value) | |
3750 && face_numeric_swidth (value) >= 0) | |
3751 to[LFACE_SWIDTH_INDEX] = value; | |
3752 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3753 err = 1; |
24995 | 3754 } |
31178 | 3755 else if (EQ (keyword, QCinherit)) |
3756 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3757 /* This is not really very useful; it's just like a |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3758 normal face reference. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3759 if (! merge_face_ref (f, value, to, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3760 err_msgs, named_merge_points)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3761 err = 1; |
31178 | 3762 } |
24995 | 3763 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3764 err = 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3765 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3766 if (err) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3767 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3768 add_to_log ("Invalid face attribute %S %S", keyword, value); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3769 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3770 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3771 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3772 face_ref = XCDR (XCDR (face_ref)); |
24995 | 3773 } |
3774 } | |
3775 else | |
3776 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3777 /* This is a list of face refs. Those at the beginning of the |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3778 list take precedence over what follows, so we have to merge |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3779 from the end backwards. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3780 Lisp_Object next = XCDR (face_ref); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3781 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3782 if (! NILP (next)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3783 ok = merge_face_ref (f, next, to, err_msgs, named_merge_points); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3784 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3785 if (! merge_face_ref (f, first, to, err_msgs, named_merge_points)) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3786 ok = 0; |
24995 | 3787 } |
3788 } | |
3789 else | |
3790 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3791 /* FACE_REF ought to be a face name. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3792 ok = merge_named_face (f, face_ref, to, named_merge_points); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3793 if (!ok && err_msgs) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3794 add_to_log ("Invalid face reference: %s", face_ref, Qnil); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3795 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3796 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3797 return ok; |
24995 | 3798 } |
3799 | |
3800 | |
3801 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
3802 Sinternal_make_lisp_face, 1, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3803 doc: /* Make FACE, a symbol, a Lisp face with all attributes nil. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3804 If FACE was not known as a face before, create a new one. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3805 If optional argument FRAME is specified, make a frame-local face |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3806 for that frame. Otherwise operate on the global face definition. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3807 Value is a vector of face attributes. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3808 (face, frame) |
24995 | 3809 Lisp_Object face, frame; |
3810 { | |
3811 Lisp_Object global_lface, lface; | |
3812 struct frame *f; | |
3813 int i; | |
3814 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3815 CHECK_SYMBOL (face); |
24995 | 3816 global_lface = lface_from_face_name (NULL, face, 0); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3817 |
24995 | 3818 if (!NILP (frame)) |
3819 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3820 CHECK_LIVE_FRAME (frame); |
24995 | 3821 f = XFRAME (frame); |
3822 lface = lface_from_face_name (f, face, 0); | |
3823 } | |
3824 else | |
3825 f = NULL, lface = Qnil; | |
3826 | |
3827 /* Add a global definition if there is none. */ | |
3828 if (NILP (global_lface)) | |
3829 { | |
3830 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
3831 Qunspecified); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3832 AREF (global_lface, 0) = Qface; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3833 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
24995 | 3834 Vface_new_frame_defaults); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3835 |
24995 | 3836 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
3837 face id to Lisp face is given by the vector lface_id_to_name. | |
3838 The mapping from Lisp face to Lisp face id is given by the | |
3839 property `face' of the Lisp face name. */ | |
3840 if (next_lface_id == lface_id_to_name_size) | |
3841 { | |
3842 int new_size = max (50, 2 * lface_id_to_name_size); | |
3843 int sz = new_size * sizeof *lface_id_to_name; | |
3844 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
3845 lface_id_to_name_size = new_size; | |
3846 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3847 |
24995 | 3848 lface_id_to_name[next_lface_id] = face; |
3849 Fput (face, Qface, make_number (next_lface_id)); | |
3850 ++next_lface_id; | |
3851 } | |
3852 else if (f == NULL) | |
3853 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3854 AREF (global_lface, i) = Qunspecified; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3855 |
24995 | 3856 /* Add a frame-local definition. */ |
3857 if (f) | |
3858 { | |
3859 if (NILP (lface)) | |
3860 { | |
3861 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
3862 Qunspecified); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3863 AREF (lface, 0) = Qface; |
24995 | 3864 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
3865 } | |
3866 else | |
3867 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3868 AREF (lface, i) = Qunspecified; |
24995 | 3869 } |
3870 else | |
3871 lface = global_lface; | |
3872 | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3873 /* Changing a named face means that all realized faces depending on |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3874 that face are invalid. Since we cannot tell which realized faces |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3875 depend on the face, make sure they are all removed. This is done |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3876 by incrementing face_change_count. The next call to |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3877 init_iterator will then free realized faces. */ |
57107 | 3878 if (NILP (Fget (face, Qface_no_inherit))) |
3879 { | |
3880 ++face_change_count; | |
3881 ++windows_or_buffers_changed; | |
3882 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3883 |
24995 | 3884 xassert (LFACEP (lface)); |
3885 check_lface (lface); | |
3886 return lface; | |
3887 } | |
3888 | |
3889 | |
3890 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
3891 Sinternal_lisp_face_p, 1, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3892 doc: /* Return non-nil if FACE names a face. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3893 If optional second parameter FRAME is non-nil, check for the |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3894 existence of a frame-local face with name FACE on that frame. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3895 Otherwise check for the existence of a global face. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3896 (face, frame) |
24995 | 3897 Lisp_Object face, frame; |
3898 { | |
3899 Lisp_Object lface; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3900 |
24995 | 3901 if (!NILP (frame)) |
3902 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3903 CHECK_LIVE_FRAME (frame); |
24995 | 3904 lface = lface_from_face_name (XFRAME (frame), face, 0); |
3905 } | |
3906 else | |
3907 lface = lface_from_face_name (NULL, face, 0); | |
3908 | |
3909 return lface; | |
3910 } | |
3911 | |
3912 | |
3913 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
3914 Sinternal_copy_lisp_face, 4, 4, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3915 doc: /* Copy face FROM to TO. |
56176
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3916 If FRAME is t, copy the global face definition of FROM. |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3917 Otherwise, copy the frame-local definition of FROM on FRAME. |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3918 If NEW-FRAME is a frame, copy that data into the frame-local |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3919 definition of TO on NEW-FRAME. If NEW-FRAME is nil. |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3920 FRAME controls where the data is copied to. |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3921 |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3922 The value is TO. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3923 (from, to, frame, new_frame) |
24995 | 3924 Lisp_Object from, to, frame, new_frame; |
3925 { | |
3926 Lisp_Object lface, copy; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3927 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3928 CHECK_SYMBOL (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3929 CHECK_SYMBOL (to); |
24995 | 3930 |
3931 if (EQ (frame, Qt)) | |
3932 { | |
3933 /* Copy global definition of FROM. We don't make copies of | |
3934 strings etc. because 20.2 didn't do it either. */ | |
3935 lface = lface_from_face_name (NULL, from, 1); | |
3936 copy = Finternal_make_lisp_face (to, Qnil); | |
3937 } | |
3938 else | |
3939 { | |
3940 /* Copy frame-local definition of FROM. */ | |
56176
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3941 if (NILP (new_frame)) |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3942 new_frame = frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3943 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3944 CHECK_LIVE_FRAME (new_frame); |
24995 | 3945 lface = lface_from_face_name (XFRAME (frame), from, 1); |
3946 copy = Finternal_make_lisp_face (to, new_frame); | |
3947 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3948 |
24995 | 3949 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
3950 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3951 |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3952 /* Changing a named face means that all realized faces depending on |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3953 that face are invalid. Since we cannot tell which realized faces |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3954 depend on the face, make sure they are all removed. This is done |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3955 by incrementing face_change_count. The next call to |
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3956 init_iterator will then free realized faces. */ |
57107 | 3957 if (NILP (Fget (to, Qface_no_inherit))) |
3958 { | |
3959 ++face_change_count; | |
3960 ++windows_or_buffers_changed; | |
3961 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3962 |
24995 | 3963 return to; |
3964 } | |
3965 | |
3966 | |
3967 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
3968 Sinternal_set_lisp_face_attribute, 3, 4, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3969 doc: /* Set attribute ATTR of FACE to VALUE. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3970 FRAME being a frame means change the face on that frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3971 FRAME nil means change the face of the selected frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3972 FRAME t means change the default for new frames. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3973 FRAME 0 means change the face on all frames, and change the default |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3974 for new frames. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3975 (face, attr, value, frame) |
24995 | 3976 Lisp_Object face, attr, value, frame; |
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
3977 { |
24995 | 3978 Lisp_Object lface; |
3979 Lisp_Object old_value = Qnil; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3980 /* Set 1 if ATTR is QCfont. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3981 int font_attr_p = 0; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3982 /* Set 1 if ATTR is one of font-related attributes other than QCfont. */ |
24995 | 3983 int font_related_attr_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3984 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3985 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3986 CHECK_SYMBOL (attr); |
24995 | 3987 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3988 face = resolve_face_name (face); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3989 |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3990 /* If FRAME is 0, change face on all frames, and change the |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3991 default for new frames. */ |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3992 if (INTEGERP (frame) && XINT (frame) == 0) |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3993 { |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3994 Lisp_Object tail; |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3995 Finternal_set_lisp_face_attribute (face, attr, value, Qt); |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3996 FOR_EACH_FRAME (tail, frame) |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3997 Finternal_set_lisp_face_attribute (face, attr, value, frame); |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3998 return face; |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3999 } |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
4000 |
24995 | 4001 /* Set lface to the Lisp attribute vector of FACE. */ |
4002 if (EQ (frame, Qt)) | |
4003 lface = lface_from_face_name (NULL, face, 1); | |
4004 else | |
4005 { | |
4006 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4007 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4008 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4009 CHECK_LIVE_FRAME (frame); |
24995 | 4010 lface = lface_from_face_name (XFRAME (frame), face, 0); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4011 |
24995 | 4012 /* If a frame-local face doesn't exist yet, create one. */ |
4013 if (NILP (lface)) | |
4014 lface = Finternal_make_lisp_face (face, frame); | |
4015 } | |
4016 | |
4017 if (EQ (attr, QCfamily)) | |
4018 { | |
4019 if (!UNSPECIFIEDP (value)) | |
4020 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4021 CHECK_STRING (value); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4022 if (SCHARS (value) == 0) |
24995 | 4023 signal_error ("Invalid face family", value); |
4024 } | |
4025 old_value = LFACE_FAMILY (lface); | |
4026 LFACE_FAMILY (lface) = value; | |
4027 font_related_attr_p = 1; | |
4028 } | |
4029 else if (EQ (attr, QCheight)) | |
4030 { | |
4031 if (!UNSPECIFIEDP (value)) | |
4032 { | |
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4033 Lisp_Object test; |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4034 |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4035 test = (EQ (face, Qdefault) |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4036 ? value |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4037 /* The default face must have an absolute size, |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4038 otherwise, we do a test merge with a random |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4039 height to see if VALUE's ok. */ |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
4040 : merge_face_heights (value, make_number (10), Qnil)); |
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4041 |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4042 if (!INTEGERP (test) || XINT (test) <= 0) |
24995 | 4043 signal_error ("Invalid face height", value); |
4044 } | |
31178 | 4045 |
24995 | 4046 old_value = LFACE_HEIGHT (lface); |
4047 LFACE_HEIGHT (lface) = value; | |
4048 font_related_attr_p = 1; | |
4049 } | |
4050 else if (EQ (attr, QCweight)) | |
4051 { | |
4052 if (!UNSPECIFIEDP (value)) | |
4053 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4054 CHECK_SYMBOL (value); |
24995 | 4055 if (face_numeric_weight (value) < 0) |
4056 signal_error ("Invalid face weight", value); | |
4057 } | |
4058 old_value = LFACE_WEIGHT (lface); | |
4059 LFACE_WEIGHT (lface) = value; | |
4060 font_related_attr_p = 1; | |
4061 } | |
4062 else if (EQ (attr, QCslant)) | |
4063 { | |
4064 if (!UNSPECIFIEDP (value)) | |
4065 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4066 CHECK_SYMBOL (value); |
24995 | 4067 if (face_numeric_slant (value) < 0) |
4068 signal_error ("Invalid face slant", value); | |
4069 } | |
4070 old_value = LFACE_SLANT (lface); | |
4071 LFACE_SLANT (lface) = value; | |
4072 font_related_attr_p = 1; | |
4073 } | |
4074 else if (EQ (attr, QCunderline)) | |
4075 { | |
4076 if (!UNSPECIFIEDP (value)) | |
4077 if ((SYMBOLP (value) | |
4078 && !EQ (value, Qt) | |
4079 && !EQ (value, Qnil)) | |
4080 /* Underline color. */ | |
4081 || (STRINGP (value) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4082 && SCHARS (value) == 0)) |
24995 | 4083 signal_error ("Invalid face underline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4084 |
24995 | 4085 old_value = LFACE_UNDERLINE (lface); |
4086 LFACE_UNDERLINE (lface) = value; | |
4087 } | |
4088 else if (EQ (attr, QCoverline)) | |
4089 { | |
4090 if (!UNSPECIFIEDP (value)) | |
4091 if ((SYMBOLP (value) | |
4092 && !EQ (value, Qt) | |
4093 && !EQ (value, Qnil)) | |
4094 /* Overline color. */ | |
4095 || (STRINGP (value) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4096 && SCHARS (value) == 0)) |
24995 | 4097 signal_error ("Invalid face overline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4098 |
24995 | 4099 old_value = LFACE_OVERLINE (lface); |
4100 LFACE_OVERLINE (lface) = value; | |
4101 } | |
4102 else if (EQ (attr, QCstrike_through)) | |
4103 { | |
4104 if (!UNSPECIFIEDP (value)) | |
4105 if ((SYMBOLP (value) | |
4106 && !EQ (value, Qt) | |
4107 && !EQ (value, Qnil)) | |
4108 /* Strike-through color. */ | |
4109 || (STRINGP (value) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4110 && SCHARS (value) == 0)) |
24995 | 4111 signal_error ("Invalid face strike-through", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4112 |
24995 | 4113 old_value = LFACE_STRIKE_THROUGH (lface); |
4114 LFACE_STRIKE_THROUGH (lface) = value; | |
4115 } | |
4116 else if (EQ (attr, QCbox)) | |
4117 { | |
4118 int valid_p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4119 |
24995 | 4120 /* Allow t meaning a simple box of width 1 in foreground color |
4121 of the face. */ | |
4122 if (EQ (value, Qt)) | |
4123 value = make_number (1); | |
4124 | |
4125 if (UNSPECIFIEDP (value)) | |
4126 valid_p = 1; | |
4127 else if (NILP (value)) | |
4128 valid_p = 1; | |
4129 else if (INTEGERP (value)) | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4130 valid_p = XINT (value) != 0; |
24995 | 4131 else if (STRINGP (value)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4132 valid_p = SCHARS (value) > 0; |
24995 | 4133 else if (CONSP (value)) |
4134 { | |
4135 Lisp_Object tem; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4136 |
24995 | 4137 tem = value; |
4138 while (CONSP (tem)) | |
4139 { | |
4140 Lisp_Object k, v; | |
4141 | |
4142 k = XCAR (tem); | |
4143 tem = XCDR (tem); | |
4144 if (!CONSP (tem)) | |
4145 break; | |
4146 v = XCAR (tem); | |
4147 tem = XCDR (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4148 |
24995 | 4149 if (EQ (k, QCline_width)) |
4150 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4151 if (!INTEGERP (v) || XINT (v) == 0) |
24995 | 4152 break; |
4153 } | |
4154 else if (EQ (k, QCcolor)) | |
4155 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4156 if (!STRINGP (v) || SCHARS (v) == 0) |
24995 | 4157 break; |
4158 } | |
4159 else if (EQ (k, QCstyle)) | |
4160 { | |
4161 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
4162 break; | |
4163 } | |
4164 else | |
4165 break; | |
4166 } | |
4167 | |
4168 valid_p = NILP (tem); | |
4169 } | |
4170 else | |
4171 valid_p = 0; | |
4172 | |
4173 if (!valid_p) | |
4174 signal_error ("Invalid face box", value); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4175 |
24995 | 4176 old_value = LFACE_BOX (lface); |
4177 LFACE_BOX (lface) = value; | |
4178 } | |
4179 else if (EQ (attr, QCinverse_video) | |
4180 || EQ (attr, QCreverse_video)) | |
4181 { | |
4182 if (!UNSPECIFIEDP (value)) | |
4183 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4184 CHECK_SYMBOL (value); |
24995 | 4185 if (!EQ (value, Qt) && !NILP (value)) |
4186 signal_error ("Invalid inverse-video face attribute value", value); | |
4187 } | |
4188 old_value = LFACE_INVERSE (lface); | |
4189 LFACE_INVERSE (lface) = value; | |
4190 } | |
4191 else if (EQ (attr, QCforeground)) | |
4192 { | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4193 if (!UNSPECIFIEDP (value)) |
24995 | 4194 { |
4195 /* Don't check for valid color names here because it depends | |
4196 on the frame (display) whether the color will be valid | |
4197 when the face is realized. */ | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4198 CHECK_STRING (value); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4199 if (SCHARS (value) == 0) |
24995 | 4200 signal_error ("Empty foreground color value", value); |
4201 } | |
4202 old_value = LFACE_FOREGROUND (lface); | |
4203 LFACE_FOREGROUND (lface) = value; | |
4204 } | |
4205 else if (EQ (attr, QCbackground)) | |
4206 { | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4207 if (!UNSPECIFIEDP (value)) |
24995 | 4208 { |
4209 /* Don't check for valid color names here because it depends | |
4210 on the frame (display) whether the color will be valid | |
4211 when the face is realized. */ | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4212 CHECK_STRING (value); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4213 if (SCHARS (value) == 0) |
24995 | 4214 signal_error ("Empty background color value", value); |
4215 } | |
4216 old_value = LFACE_BACKGROUND (lface); | |
4217 LFACE_BACKGROUND (lface) = value; | |
4218 } | |
4219 else if (EQ (attr, QCstipple)) | |
4220 { | |
4221 #ifdef HAVE_X_WINDOWS | |
4222 if (!UNSPECIFIEDP (value) | |
4223 && !NILP (value) | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
4224 && NILP (Fbitmap_spec_p (value))) |
24995 | 4225 signal_error ("Invalid stipple attribute", value); |
4226 old_value = LFACE_STIPPLE (lface); | |
4227 LFACE_STIPPLE (lface) = value; | |
4228 #endif /* HAVE_X_WINDOWS */ | |
4229 } | |
4230 else if (EQ (attr, QCwidth)) | |
4231 { | |
4232 if (!UNSPECIFIEDP (value)) | |
4233 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4234 CHECK_SYMBOL (value); |
24995 | 4235 if (face_numeric_swidth (value) < 0) |
4236 signal_error ("Invalid face width", value); | |
4237 } | |
4238 old_value = LFACE_SWIDTH (lface); | |
4239 LFACE_SWIDTH (lface) = value; | |
4240 font_related_attr_p = 1; | |
4241 } | |
4242 else if (EQ (attr, QCfont)) | |
4243 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4244 #ifdef HAVE_WINDOW_SYSTEM |
44705
413dd322c77d
(clear_font_table): Don't free the default font of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43270
diff
changeset
|
4245 if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame))) |
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4246 { |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4247 /* Set font-related attributes of the Lisp face from an XLFD |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4248 font name. */ |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4249 struct frame *f; |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4250 Lisp_Object tmp; |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4251 |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4252 if (EQ (frame, Qt)) |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4253 f = SELECTED_FRAME (); |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4254 else |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4255 f = check_x_frame (frame); |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4256 |
51092
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4257 if (!UNSPECIFIEDP (value)) |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4258 { |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4259 CHECK_STRING (value); |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4260 |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4261 /* VALUE may be a fontset name or an alias of fontset. In |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4262 such a case, use the base fontset name. */ |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4263 tmp = Fquery_fontset (value, Qnil); |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4264 if (!NILP (tmp)) |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4265 value = tmp; |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4266 |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4267 if (!set_lface_from_font_name (f, lface, value, 1, 1)) |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4268 signal_error ("Invalid font or fontset name", value); |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4269 } |
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4270 |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4271 font_attr_p = 1; |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4272 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4273 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4274 } |
31178 | 4275 else if (EQ (attr, QCinherit)) |
4276 { | |
4277 Lisp_Object tail; | |
4278 if (SYMBOLP (value)) | |
4279 tail = Qnil; | |
4280 else | |
4281 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
4282 if (!SYMBOLP (XCAR (tail))) | |
4283 break; | |
4284 if (NILP (tail)) | |
4285 LFACE_INHERIT (lface) = value; | |
4286 else | |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
4287 signal_error ("Invalid face inheritance", value); |
31178 | 4288 } |
24995 | 4289 else if (EQ (attr, QCbold)) |
4290 { | |
4291 old_value = LFACE_WEIGHT (lface); | |
4292 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; | |
4293 font_related_attr_p = 1; | |
4294 } | |
4295 else if (EQ (attr, QCitalic)) | |
4296 { | |
4297 old_value = LFACE_SLANT (lface); | |
4298 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; | |
4299 font_related_attr_p = 1; | |
4300 } | |
4301 else | |
4302 signal_error ("Invalid face attribute name", attr); | |
4303 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4304 if (font_related_attr_p |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4305 && !UNSPECIFIEDP (value)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4306 /* If a font-related attribute other than QCfont is specified, the |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4307 original `font' attribute nor that of default face is useless |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4308 to determine a new font. Thus, we set it to nil so that font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4309 selection mechanism doesn't use it. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4310 LFACE_FONT (lface) = Qnil; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4311 |
24995 | 4312 /* Changing a named face means that all realized faces depending on |
4313 that face are invalid. Since we cannot tell which realized faces | |
4314 depend on the face, make sure they are all removed. This is done | |
4315 by incrementing face_change_count. The next call to | |
4316 init_iterator will then free realized faces. */ | |
4317 if (!EQ (frame, Qt) | |
57107 | 4318 && NILP (Fget (face, Qface_no_inherit)) |
24995 | 4319 && (EQ (attr, QCfont) |
4320 || NILP (Fequal (old_value, value)))) | |
4321 { | |
4322 ++face_change_count; | |
4323 ++windows_or_buffers_changed; | |
4324 } | |
4325 | |
34242
dd4e1abada68
(Finternal_set_lisp_face_attribute): If FRAME is `t', update
Miles Bader <miles@gnu.org>
parents:
34160
diff
changeset
|
4326 if (!UNSPECIFIEDP (value) |
24995 | 4327 && NILP (Fequal (old_value, value))) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4328 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4329 Lisp_Object param; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4330 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4331 param = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4332 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4333 if (EQ (face, Qdefault)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4334 { |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4335 #ifdef HAVE_WINDOW_SYSTEM |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4336 /* Changed font-related attributes of the `default' face are |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4337 reflected in changed `font' frame parameters. */ |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4338 if (FRAMEP (frame) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4339 && (font_related_attr_p || font_attr_p) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4340 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4341 set_font_frame_param (frame, lface); |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4342 else |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4343 #endif /* HAVE_WINDOW_SYSTEM */ |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4344 |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4345 if (EQ (attr, QCforeground)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4346 param = Qforeground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4347 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4348 param = Qbackground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4349 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4350 #ifdef HAVE_WINDOW_SYSTEM |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4351 #ifndef WINDOWSNT |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4352 else if (EQ (face, Qscroll_bar)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4353 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4354 /* Changing the colors of `scroll-bar' sets frame parameters |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4355 `scroll-bar-foreground' and `scroll-bar-background'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4356 if (EQ (attr, QCforeground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4357 param = Qscroll_bar_foreground; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4358 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4359 param = Qscroll_bar_background; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4360 } |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
4361 #endif /* not WINDOWSNT */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4362 else if (EQ (face, Qborder)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4363 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4364 /* Changing background color of `border' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4365 `border-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4366 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4367 param = Qborder_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4368 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4369 else if (EQ (face, Qcursor)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4370 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4371 /* Changing background color of `cursor' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4372 `cursor-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4373 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4374 param = Qcursor_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4375 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4376 else if (EQ (face, Qmouse)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4377 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4378 /* Changing background color of `mouse' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4379 `mouse-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4380 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4381 param = Qmouse_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4382 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4383 #endif /* HAVE_WINDOW_SYSTEM */ |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
4384 else if (EQ (face, Qmenu)) |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4385 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4386 /* Indicate that we have to update the menu bar when |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4387 realizing faces on FRAME. FRAME t change the |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4388 default for new frames. We do this by setting |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4389 setting the flag in new face caches */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4390 if (FRAMEP (frame)) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4391 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4392 struct frame *f = XFRAME (frame); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4393 if (FRAME_FACE_CACHE (f) == NULL) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4394 FRAME_FACE_CACHE (f) = make_face_cache (f); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4395 FRAME_FACE_CACHE (f)->menu_face_changed_p = 1; |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4396 } |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4397 else |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4398 menu_face_changed_default = 1; |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4399 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4400 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4401 if (!NILP (param)) |
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4402 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4403 if (EQ (frame, Qt)) |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4404 /* Update `default-frame-alist', which is used for new frames. */ |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4405 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4406 store_in_alist (&Vdefault_frame_alist, param, value); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4407 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4408 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4409 /* Update the current frame's parameters. */ |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4410 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4411 Lisp_Object cons; |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4412 cons = XCAR (Vparam_value_alist); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4413 XSETCAR (cons, param); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4414 XSETCDR (cons, value); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4415 Fmodify_frame_parameters (frame, Vparam_value_alist); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4416 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4417 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4418 } |
24995 | 4419 |
4420 return face; | |
4421 } | |
4422 | |
4423 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4424 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4425 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4426 /* Set the `font' frame parameter of FRAME determined from `default' |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4427 face attributes LFACE. If a face or fontset name is explicitely |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4428 specfied in LFACE, use it as is. Otherwise, determine a font name |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4429 from the other font-related atrributes of LFACE. In that case, if |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4430 there's no matching font, signals an error. */ |
24995 | 4431 |
4432 static void | |
4433 set_font_frame_param (frame, lface) | |
4434 Lisp_Object frame, lface; | |
4435 { | |
4436 struct frame *f = XFRAME (frame); | |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4437 |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4438 if (FRAME_WINDOW_P (f)) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4439 { |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4440 Lisp_Object font_name; |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4441 char *font; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4442 |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4443 if (STRINGP (LFACE_FONT (lface))) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4444 font_name = LFACE_FONT (lface); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4445 else |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4446 { |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4447 /* Choose a font name that reflects LFACE's attributes and has |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4448 the registry and encoding pattern specified in the default |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4449 fontset (3rd arg: -1) for ASCII characters (4th arg: 0). */ |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
4450 font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0, 0); |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4451 if (!font) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4452 error ("No font matches the specified attribute"); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4453 font_name = build_string (font); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4454 xfree (font); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4455 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4456 |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
4457 f->default_face_done_p = 0; |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4458 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil)); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4459 } |
24995 | 4460 } |
4461 | |
4462 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4463 /* Update the corresponding face when frame parameter PARAM on frame F |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4464 has been assigned the value NEW_VALUE. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4465 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4466 void |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4467 update_face_from_frame_parameter (f, param, new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4468 struct frame *f; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4469 Lisp_Object param, new_value; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4470 { |
57107 | 4471 Lisp_Object face = Qnil; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4472 Lisp_Object lface; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4473 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4474 /* If there are no faces yet, give up. This is the case when called |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4475 from Fx_create_frame, and we do the necessary things later in |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4476 face-set-after-frame-defaults. */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4477 if (NILP (f->face_alist)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4478 return; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4479 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4480 if (EQ (param, Qforeground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4481 { |
57107 | 4482 face = Qdefault; |
4483 lface = lface_from_face_name (f, face, 1); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4484 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4485 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4486 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4487 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4488 else if (EQ (param, Qbackground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4489 { |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4490 Lisp_Object frame; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4491 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4492 /* Changing the background color might change the background |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4493 mode, so that we have to load new defface specs. Call |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4494 frame-update-face-colors to do that. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4495 XSETFRAME (frame, f); |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4496 call1 (Qframe_update_face_colors, frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4497 |
57107 | 4498 face = Qdefault; |
4499 lface = lface_from_face_name (f, face, 1); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4500 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4501 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4502 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4503 } |
57107 | 4504 else if (EQ (param, Qborder_color)) |
4505 { | |
4506 face = Qborder; | |
4507 lface = lface_from_face_name (f, face, 1); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4508 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4509 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4510 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4511 else if (EQ (param, Qcursor_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4512 { |
57107 | 4513 face = Qcursor; |
4514 lface = lface_from_face_name (f, face, 1); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4515 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4516 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4517 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4518 else if (EQ (param, Qmouse_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4519 { |
57107 | 4520 face = Qmouse; |
4521 lface = lface_from_face_name (f, face, 1); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4522 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4523 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4524 } |
57107 | 4525 |
4526 /* Changing a named face means that all realized faces depending on | |
4527 that face are invalid. Since we cannot tell which realized faces | |
4528 depend on the face, make sure they are all removed. This is done | |
4529 by incrementing face_change_count. The next call to | |
4530 init_iterator will then free realized faces. */ | |
4531 if (!NILP (face) | |
4532 && NILP (Fget (face, Qface_no_inherit))) | |
4533 { | |
4534 ++face_change_count; | |
4535 ++windows_or_buffers_changed; | |
4536 } | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4537 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4538 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4539 |
24995 | 4540 /* Get the value of X resource RESOURCE, class CLASS for the display |
4541 of frame FRAME. This is here because ordinary `x-get-resource' | |
4542 doesn't take a frame argument. */ | |
4543 | |
4544 DEFUN ("internal-face-x-get-resource", Finternal_face_x_get_resource, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4545 Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4546 (resource, class, frame) |
24995 | 4547 Lisp_Object resource, class, frame; |
4548 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4549 Lisp_Object value = Qnil; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4550 CHECK_STRING (resource); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4551 CHECK_STRING (class); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4552 CHECK_LIVE_FRAME (frame); |
24995 | 4553 BLOCK_INPUT; |
4554 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
4555 resource, class, Qnil, Qnil); | |
4556 UNBLOCK_INPUT; | |
4557 return value; | |
4558 } | |
4559 | |
4560 | |
4561 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
4562 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
4563 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
4564 error; if SIGNAL_P is zero, return 0. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4565 |
24995 | 4566 static Lisp_Object |
4567 face_boolean_x_resource_value (value, signal_p) | |
4568 Lisp_Object value; | |
4569 int signal_p; | |
4570 { | |
4571 Lisp_Object result = make_number (0); | |
4572 | |
4573 xassert (STRINGP (value)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4574 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4575 if (xstricmp (SDATA (value), "on") == 0 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4576 || xstricmp (SDATA (value), "true") == 0) |
24995 | 4577 result = Qt; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4578 else if (xstricmp (SDATA (value), "off") == 0 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4579 || xstricmp (SDATA (value), "false") == 0) |
24995 | 4580 result = Qnil; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4581 else if (xstricmp (SDATA (value), "unspecified") == 0) |
24995 | 4582 result = Qunspecified; |
4583 else if (signal_p) | |
4584 signal_error ("Invalid face attribute value from X resource", value); | |
4585 | |
4586 return result; | |
4587 } | |
4588 | |
4589 | |
4590 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
4591 Finternal_set_lisp_face_attribute_from_resource, | |
4592 Sinternal_set_lisp_face_attribute_from_resource, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4593 3, 4, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4594 (face, attr, value, frame) |
24995 | 4595 Lisp_Object face, attr, value, frame; |
4596 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4597 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4598 CHECK_SYMBOL (attr); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4599 CHECK_STRING (value); |
24995 | 4600 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4601 if (xstricmp (SDATA (value), "unspecified") == 0) |
24995 | 4602 value = Qunspecified; |
4603 else if (EQ (attr, QCheight)) | |
4604 { | |
4605 value = Fstring_to_number (value, make_number (10)); | |
4606 if (XINT (value) <= 0) | |
4607 signal_error ("Invalid face height from X resource", value); | |
4608 } | |
4609 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
4610 value = face_boolean_x_resource_value (value, 1); | |
4611 else if (EQ (attr, QCweight) || EQ (attr, QCslant) || EQ (attr, QCwidth)) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4612 value = intern (SDATA (value)); |
24995 | 4613 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
4614 value = face_boolean_x_resource_value (value, 1); | |
4615 else if (EQ (attr, QCunderline) | |
4616 || EQ (attr, QCoverline) | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4617 || EQ (attr, QCstrike_through)) |
24995 | 4618 { |
4619 Lisp_Object boolean_value; | |
4620 | |
4621 /* If the result of face_boolean_x_resource_value is t or nil, | |
4622 VALUE does NOT specify a color. */ | |
4623 boolean_value = face_boolean_x_resource_value (value, 0); | |
4624 if (SYMBOLP (boolean_value)) | |
4625 value = boolean_value; | |
4626 } | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4627 else if (EQ (attr, QCbox)) |
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4628 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
24995 | 4629 |
4630 return Finternal_set_lisp_face_attribute (face, attr, value, frame); | |
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
4631 } |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4632 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4633 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4634 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4635 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4636 /*********************************************************************** |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4637 Menu face |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4638 ***********************************************************************/ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4639 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4640 #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4641 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4642 /* Make menus on frame F appear as specified by the `menu' face. */ |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4643 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4644 static void |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4645 x_update_menu_appearance (f) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4646 struct frame *f; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4647 { |
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4648 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4649 XrmDatabase rdb; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4650 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4651 if (dpyinfo |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4652 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4653 rdb != NULL)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4654 { |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4655 char line[512]; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4656 Lisp_Object lface = lface_from_face_name (f, Qmenu, 1); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4657 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID); |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4658 const char *myname = SDATA (Vx_resource_name); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4659 int changed_p = 0; |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4660 #ifdef USE_MOTIF |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4661 const char *popup_path = "popup_menu"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4662 #else |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4663 const char *popup_path = "menu.popup"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4664 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4665 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4666 if (STRINGP (LFACE_FOREGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4667 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4668 sprintf (line, "%s.%s*foreground: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4669 myname, popup_path, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4670 SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4671 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4672 sprintf (line, "%s.pane.menubar*foreground: %s", |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4673 myname, SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4674 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4675 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4676 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4677 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4678 if (STRINGP (LFACE_BACKGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4679 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4680 sprintf (line, "%s.%s*background: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4681 myname, popup_path, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4682 SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4683 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4684 sprintf (line, "%s.pane.menubar*background: %s", |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4685 myname, SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4686 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4687 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4688 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4689 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4690 if (face->font_name |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4691 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4692 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4693 || !UNSPECIFIEDP (LFACE_AVGWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4694 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4695 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4696 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4697 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4698 #ifdef USE_MOTIF |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4699 const char *suffix = "List"; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4700 #else |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4701 const char *suffix = ""; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4702 #endif |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4703 sprintf (line, "%s.pane.menubar*font%s: %s", |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4704 myname, suffix, face->font_name); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4705 XrmPutLineResource (&rdb, line); |
36996
46d9cc8def79
(x_update_menu_appearance): Use local variable
Gerd Moellmann <gerd@gnu.org>
parents:
36956
diff
changeset
|
4706 sprintf (line, "%s.%s*font%s: %s", |
46d9cc8def79
(x_update_menu_appearance): Use local variable
Gerd Moellmann <gerd@gnu.org>
parents:
36956
diff
changeset
|
4707 myname, popup_path, suffix, face->font_name); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4708 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4709 changed_p = 1; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4710 } |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4711 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4712 if (changed_p && f->output_data.x->menubar_widget) |
38818
b0327e4e1da7
(x_update_menu_appearance): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
38802
diff
changeset
|
4713 free_frame_menubar (f); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4714 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4715 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4716 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4717 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
24995 | 4718 |
4719 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4720 DEFUN ("face-attribute-relative-p", Fface_attribute_relative_p, |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4721 Sface_attribute_relative_p, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4722 2, 2, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4723 doc: /* Return non-nil if face ATTRIBUTE VALUE is relative. */) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4724 (attribute, value) |
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
4725 Lisp_Object attribute, value; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4726 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4727 if (EQ (value, Qunspecified)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4728 return Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4729 else if (EQ (attribute, QCheight)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4730 return INTEGERP (value) ? Qnil : Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4731 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4732 return Qnil; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4733 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4734 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4735 DEFUN ("merge-face-attribute", Fmerge_face_attribute, Smerge_face_attribute, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4736 3, 3, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4737 doc: /* Return face ATTRIBUTE VALUE1 merged with VALUE2. |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4738 If VALUE1 or VALUE2 are absolute (see `face-attribute-relative-p'), then |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4739 the result will be absolute, otherwise it will be relative. */) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4740 (attribute, value1, value2) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4741 Lisp_Object attribute, value1, value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4742 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4743 if (EQ (value1, Qunspecified)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4744 return value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4745 else if (EQ (attribute, QCheight)) |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
4746 return merge_face_heights (value1, value2, value1); |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4747 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4748 return value1; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4749 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4750 |
24995 | 4751 |
4752 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
4753 Sinternal_get_lisp_face_attribute, | |
4754 2, 3, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4755 doc: /* Return face attribute KEYWORD of face SYMBOL. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4756 If SYMBOL does not name a valid Lisp face or KEYWORD isn't a valid |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4757 face attribute name, signal an error. |
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4758 If the optional argument FRAME is given, report on face SYMBOL in that |
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4759 frame. If FRAME is t, report on the defaults for face SYMBOL (for new |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4760 frames). If FRAME is omitted or nil, use the selected frame. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4761 (symbol, keyword, frame) |
24995 | 4762 Lisp_Object symbol, keyword, frame; |
4763 { | |
4764 Lisp_Object lface, value = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4765 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4766 CHECK_SYMBOL (symbol); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4767 CHECK_SYMBOL (keyword); |
24995 | 4768 |
4769 if (EQ (frame, Qt)) | |
4770 lface = lface_from_face_name (NULL, symbol, 1); | |
4771 else | |
4772 { | |
4773 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4774 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4775 CHECK_LIVE_FRAME (frame); |
24995 | 4776 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
4777 } | |
4778 | |
4779 if (EQ (keyword, QCfamily)) | |
4780 value = LFACE_FAMILY (lface); | |
4781 else if (EQ (keyword, QCheight)) | |
4782 value = LFACE_HEIGHT (lface); | |
4783 else if (EQ (keyword, QCweight)) | |
4784 value = LFACE_WEIGHT (lface); | |
4785 else if (EQ (keyword, QCslant)) | |
4786 value = LFACE_SLANT (lface); | |
4787 else if (EQ (keyword, QCunderline)) | |
4788 value = LFACE_UNDERLINE (lface); | |
4789 else if (EQ (keyword, QCoverline)) | |
4790 value = LFACE_OVERLINE (lface); | |
4791 else if (EQ (keyword, QCstrike_through)) | |
4792 value = LFACE_STRIKE_THROUGH (lface); | |
4793 else if (EQ (keyword, QCbox)) | |
4794 value = LFACE_BOX (lface); | |
4795 else if (EQ (keyword, QCinverse_video) | |
4796 || EQ (keyword, QCreverse_video)) | |
4797 value = LFACE_INVERSE (lface); | |
4798 else if (EQ (keyword, QCforeground)) | |
4799 value = LFACE_FOREGROUND (lface); | |
4800 else if (EQ (keyword, QCbackground)) | |
4801 value = LFACE_BACKGROUND (lface); | |
4802 else if (EQ (keyword, QCstipple)) | |
4803 value = LFACE_STIPPLE (lface); | |
4804 else if (EQ (keyword, QCwidth)) | |
4805 value = LFACE_SWIDTH (lface); | |
31178 | 4806 else if (EQ (keyword, QCinherit)) |
4807 value = LFACE_INHERIT (lface); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4808 else if (EQ (keyword, QCfont)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4809 value = LFACE_FONT (lface); |
24995 | 4810 else |
4811 signal_error ("Invalid face attribute name", keyword); | |
4812 | |
4813 return value; | |
4814 } | |
4815 | |
4816 | |
4817 DEFUN ("internal-lisp-face-attribute-values", | |
4818 Finternal_lisp_face_attribute_values, | |
4819 Sinternal_lisp_face_attribute_values, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4820 doc: /* Return a list of valid discrete values for face attribute ATTR. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4821 Value is nil if ATTR doesn't have a discrete set of valid values. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4822 (attr) |
24995 | 4823 Lisp_Object attr; |
4824 { | |
4825 Lisp_Object result = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4826 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4827 CHECK_SYMBOL (attr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4828 |
24995 | 4829 if (EQ (attr, QCweight) |
4830 || EQ (attr, QCslant) | |
4831 || EQ (attr, QCwidth)) | |
4832 { | |
4833 /* Extract permissible symbols from tables. */ | |
4834 struct table_entry *table; | |
4835 int i, dim; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4836 |
24995 | 4837 if (EQ (attr, QCweight)) |
4838 table = weight_table, dim = DIM (weight_table); | |
4839 else if (EQ (attr, QCslant)) | |
4840 table = slant_table, dim = DIM (slant_table); | |
4841 else | |
4842 table = swidth_table, dim = DIM (swidth_table); | |
4843 | |
4844 for (i = 0; i < dim; ++i) | |
4845 { | |
4846 Lisp_Object symbol = *table[i].symbol; | |
4847 Lisp_Object tail = result; | |
4848 | |
4849 while (!NILP (tail) | |
4850 && !EQ (XCAR (tail), symbol)) | |
4851 tail = XCDR (tail); | |
4852 | |
4853 if (NILP (tail)) | |
4854 result = Fcons (symbol, result); | |
4855 } | |
4856 } | |
4857 else if (EQ (attr, QCunderline)) | |
4858 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4859 else if (EQ (attr, QCoverline)) | |
4860 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4861 else if (EQ (attr, QCstrike_through)) | |
4862 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4863 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
4864 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4865 | |
4866 return result; | |
4867 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4868 |
24995 | 4869 |
4870 DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face, | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4871 Sinternal_merge_in_global_face, 2, 2, 0, |
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
4872 doc: /* Add attributes from frame-default definition of FACE to FACE on FRAME. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4873 Default face attributes override any local face attributes. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4874 (face, frame) |
24995 | 4875 Lisp_Object face, frame; |
4876 { | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4877 int i; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4878 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4879 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4880 CHECK_LIVE_FRAME (frame); |
24995 | 4881 global_lface = lface_from_face_name (NULL, face, 1); |
4882 local_lface = lface_from_face_name (XFRAME (frame), face, 0); | |
4883 if (NILP (local_lface)) | |
4884 local_lface = Finternal_make_lisp_face (face, frame); | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4885 |
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4886 /* Make every specified global attribute override the local one. |
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4887 BEWARE!! This is only used from `face-set-after-frame-default' where |
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4888 the local frame is defined from default specs in `face-defface-spec' |
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4889 and those should be overridden by global settings. Hence the strange |
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4890 "global before local" priority. */ |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4891 lvec = XVECTOR (local_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4892 gvec = XVECTOR (global_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4893 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4894 if (! UNSPECIFIEDP (gvec[i])) |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4895 lvec[i] = gvec[i]; |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4896 |
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4897 return Qnil; |
24995 | 4898 } |
4899 | |
4900 | |
4901 /* The following function is implemented for compatibility with 20.2. | |
4902 The function is used in x-resolve-fonts when it is asked to | |
4903 return fonts with the same size as the font of a face. This is | |
4904 done in fontset.el. */ | |
4905 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4906 DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0, |
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
4907 doc: /* Return the font name of face FACE, or nil if it is unspecified. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4908 If the optional argument FRAME is given, report on face FACE in that frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4909 If FRAME is t, report on the defaults for face FACE (for new frames). |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4910 The font default for a face is either nil, or a list |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4911 of the form (bold), (italic) or (bold italic). |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4912 If FRAME is omitted or nil, use the selected frame. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4913 (face, frame) |
24995 | 4914 Lisp_Object face, frame; |
4915 { | |
4916 if (EQ (frame, Qt)) | |
4917 { | |
4918 Lisp_Object result = Qnil; | |
4919 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
4920 | |
4921 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
4922 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
4923 result = Fcons (Qbold, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4924 |
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4925 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
24995 | 4926 && !EQ (LFACE_SLANT (lface), Qnormal)) |
4927 result = Fcons (Qitalic, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4928 |
24995 | 4929 return result; |
4930 } | |
4931 else | |
4932 { | |
4933 struct frame *f = frame_or_selected_frame (frame, 1); | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4934 int face_id = lookup_named_face (f, face, 0, 1); |
24995 | 4935 struct face *face = FACE_FROM_ID (f, face_id); |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4936 return face ? build_string (face->font_name) : Qnil; |
24995 | 4937 } |
4938 } | |
4939 | |
4940 | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4941 /* Compare face-attribute values v1 and v2 for equality. Value is non-zero if |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4942 all attributes are `equal'. Tries to be fast because this function |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4943 is called quite often. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4944 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4945 static INLINE int |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4946 face_attr_equal_p (v1, v2) |
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4947 Lisp_Object v1, v2; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4948 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4949 /* Type can differ, e.g. when one attribute is unspecified, i.e. nil, |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4950 and the other is specified. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4951 if (XTYPE (v1) != XTYPE (v2)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4952 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4953 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4954 if (EQ (v1, v2)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4955 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4956 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4957 switch (XTYPE (v1)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4958 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4959 case Lisp_String: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4960 if (SBYTES (v1) != SBYTES (v2)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4961 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4962 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4963 return bcmp (SDATA (v1), SDATA (v2), SBYTES (v1)) == 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4964 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4965 case Lisp_Int: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4966 case Lisp_Symbol: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4967 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4968 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4969 default: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4970 return !NILP (Fequal (v1, v2)); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4971 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4972 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4973 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4974 |
24995 | 4975 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
4976 all attributes are `equal'. Tries to be fast because this function | |
4977 is called quite often. */ | |
4978 | |
4979 static INLINE int | |
4980 lface_equal_p (v1, v2) | |
4981 Lisp_Object *v1, *v2; | |
4982 { | |
4983 int i, equal_p = 1; | |
4984 | |
4985 for (i = 1; i < LFACE_VECTOR_SIZE && equal_p; ++i) | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4986 equal_p = face_attr_equal_p (v1[i], v2[i]); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4987 |
24995 | 4988 return equal_p; |
4989 } | |
4990 | |
4991 | |
4992 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
4993 Sinternal_lisp_face_equal_p, 2, 3, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4994 doc: /* True if FACE1 and FACE2 are equal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4995 If the optional argument FRAME is given, report on face FACE in that frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4996 If FRAME is t, report on the defaults for face FACE (for new frames). |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4997 If FRAME is omitted or nil, use the selected frame. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4998 (face1, face2, frame) |
24995 | 4999 Lisp_Object face1, face2, frame; |
5000 { | |
5001 int equal_p; | |
5002 struct frame *f; | |
5003 Lisp_Object lface1, lface2; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5004 |
24995 | 5005 if (EQ (frame, Qt)) |
5006 f = NULL; | |
5007 else | |
5008 /* Don't use check_x_frame here because this function is called | |
5009 before X frames exist. At that time, if FRAME is nil, | |
5010 selected_frame will be used which is the frame dumped with | |
5011 Emacs. That frame is not an X frame. */ | |
5012 f = frame_or_selected_frame (frame, 2); | |
5013 | |
5014 lface1 = lface_from_face_name (NULL, face1, 1); | |
5015 lface2 = lface_from_face_name (NULL, face2, 1); | |
5016 equal_p = lface_equal_p (XVECTOR (lface1)->contents, | |
5017 XVECTOR (lface2)->contents); | |
5018 return equal_p ? Qt : Qnil; | |
5019 } | |
5020 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5021 |
24995 | 5022 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
5023 Sinternal_lisp_face_empty_p, 1, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5024 doc: /* True if FACE has no attribute specified. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5025 If the optional argument FRAME is given, report on face FACE in that frame. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5026 If FRAME is t, report on the defaults for face FACE (for new frames). |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5027 If FRAME is omitted or nil, use the selected frame. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5028 (face, frame) |
24995 | 5029 Lisp_Object face, frame; |
5030 { | |
5031 struct frame *f; | |
5032 Lisp_Object lface; | |
5033 int i; | |
5034 | |
5035 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5036 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5037 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5038 f = XFRAME (frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5039 |
24995 | 5040 if (EQ (frame, Qt)) |
5041 lface = lface_from_face_name (NULL, face, 1); | |
5042 else | |
5043 lface = lface_from_face_name (f, face, 1); | |
5044 | |
5045 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5046 if (!UNSPECIFIEDP (AREF (lface, i))) |
24995 | 5047 break; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5048 |
24995 | 5049 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
5050 } | |
5051 | |
5052 | |
5053 DEFUN ("frame-face-alist", Fframe_face_alist, Sframe_face_alist, | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5054 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5055 doc: /* Return an alist of frame-local faces defined on FRAME. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5056 For internal use only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5057 (frame) |
24995 | 5058 Lisp_Object frame; |
5059 { | |
5060 struct frame *f = frame_or_selected_frame (frame, 0); | |
5061 return f->face_alist; | |
5062 } | |
5063 | |
5064 | |
5065 /* Return a hash code for Lisp string STRING with case ignored. Used | |
5066 below in computing a hash value for a Lisp face. */ | |
5067 | |
5068 static INLINE unsigned | |
5069 hash_string_case_insensitive (string) | |
5070 Lisp_Object string; | |
5071 { | |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
5072 const unsigned char *s; |
24995 | 5073 unsigned hash = 0; |
5074 xassert (STRINGP (string)); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5075 for (s = SDATA (string); *s; ++s) |
24995 | 5076 hash = (hash << 1) ^ tolower (*s); |
5077 return hash; | |
5078 } | |
5079 | |
5080 | |
5081 /* Return a hash code for face attribute vector V. */ | |
5082 | |
5083 static INLINE unsigned | |
5084 lface_hash (v) | |
5085 Lisp_Object *v; | |
5086 { | |
5087 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
5088 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) | |
5089 ^ hash_string_case_insensitive (v[LFACE_BACKGROUND_INDEX]) | |
28464
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5090 ^ XFASTINT (v[LFACE_WEIGHT_INDEX]) |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5091 ^ XFASTINT (v[LFACE_SLANT_INDEX]) |
cad4cc0508a0
Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents:
28461
diff
changeset
|
5092 ^ XFASTINT (v[LFACE_SWIDTH_INDEX]) |
24995 | 5093 ^ XFASTINT (v[LFACE_HEIGHT_INDEX])); |
5094 } | |
5095 | |
5096 | |
5097 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
5098 considering charsets/registries). They do if they specify the same | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5099 family, point size, weight, width, slant, and fontset. Both LFACE1 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5100 and LFACE2 must be fully-specified. */ |
24995 | 5101 |
5102 static INLINE int | |
5103 lface_same_font_attributes_p (lface1, lface2) | |
5104 Lisp_Object *lface1, *lface2; | |
5105 { | |
5106 xassert (lface_fully_specified_p (lface1) | |
5107 && lface_fully_specified_p (lface2)); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5108 return (xstricmp (SDATA (lface1[LFACE_FAMILY_INDEX]), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5109 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
31178 | 5110 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
24995 | 5111 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5112 && EQ (lface1[LFACE_AVGWIDTH_INDEX], lface2[LFACE_AVGWIDTH_INDEX]) |
24995 | 5113 && EQ (lface1[LFACE_WEIGHT_INDEX], lface2[LFACE_WEIGHT_INDEX]) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5114 && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5115 && (EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5116 || (STRINGP (lface1[LFACE_FONT_INDEX]) |
28263
73181b84ea57
(lface_same_font_attributes_p): Compare font attributes
Gerd Moellmann <gerd@gnu.org>
parents:
28237
diff
changeset
|
5117 && STRINGP (lface2[LFACE_FONT_INDEX]) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5118 && xstricmp (SDATA (lface1[LFACE_FONT_INDEX]), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5119 SDATA (lface2[LFACE_FONT_INDEX]))))); |
24995 | 5120 } |
5121 | |
5122 | |
5123 | |
5124 /*********************************************************************** | |
5125 Realized Faces | |
5126 ***********************************************************************/ | |
5127 | |
5128 /* Allocate and return a new realized face for Lisp face attribute | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5129 vector ATTR. */ |
24995 | 5130 |
5131 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5132 make_realized_face (attr) |
24995 | 5133 Lisp_Object *attr; |
5134 { | |
5135 struct face *face = (struct face *) xmalloc (sizeof *face); | |
5136 bzero (face, sizeof *face); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5137 face->ascii_face = face; |
24995 | 5138 bcopy (attr, face->lface, sizeof face->lface); |
5139 return face; | |
5140 } | |
5141 | |
5142 | |
5143 /* Free realized face FACE, including its X resources. FACE may | |
5144 be null. */ | |
5145 | |
5146 static void | |
5147 free_realized_face (f, face) | |
5148 struct frame *f; | |
5149 struct face *face; | |
5150 { | |
5151 if (face) | |
5152 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5153 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5154 if (FRAME_WINDOW_P (f)) |
24995 | 5155 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5156 /* Free fontset of FACE if it is ASCII face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5157 if (face->fontset >= 0 && face == face->ascii_face) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5158 free_face_fontset (f, face); |
24995 | 5159 if (face->gc) |
5160 { | |
5161 x_free_gc (f, face->gc); | |
5162 face->gc = 0; | |
5163 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5164 |
24995 | 5165 free_face_colors (f, face); |
5166 x_destroy_bitmap (f, face->stipple); | |
5167 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5168 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5169 |
5170 xfree (face); | |
5171 } | |
5172 } | |
5173 | |
5174 | |
5175 /* Prepare face FACE for subsequent display on frame F. This | |
5176 allocated GCs if they haven't been allocated yet or have been freed | |
5177 by clearing the face cache. */ | |
5178 | |
5179 void | |
5180 prepare_face_for_display (f, face) | |
5181 struct frame *f; | |
5182 struct face *face; | |
5183 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5184 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5185 xassert (FRAME_WINDOW_P (f)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5186 |
24995 | 5187 if (face->gc == 0) |
5188 { | |
5189 XGCValues xgcv; | |
5190 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
5191 | |
5192 xgcv.foreground = face->foreground; | |
5193 xgcv.background = face->background; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5194 #ifdef HAVE_X_WINDOWS |
24995 | 5195 xgcv.graphics_exposures = False; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5196 #endif |
24995 | 5197 /* The font of FACE may be null if we couldn't load it. */ |
5198 if (face->font) | |
5199 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5200 #ifdef HAVE_X_WINDOWS |
24995 | 5201 xgcv.font = face->font->fid; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5202 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5203 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5204 xgcv.font = face->font; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5205 #endif |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
5206 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5207 xgcv.font = face->font; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5208 #endif |
24995 | 5209 mask |= GCFont; |
5210 } | |
5211 | |
5212 BLOCK_INPUT; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5213 #ifdef HAVE_X_WINDOWS |
24995 | 5214 if (face->stipple) |
5215 { | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
5216 xgcv.fill_style = FillOpaqueStippled; |
24995 | 5217 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
5218 mask |= GCFillStyle | GCStipple; | |
5219 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5220 #endif |
24995 | 5221 face->gc = x_create_gc (f, mask, &xgcv); |
5222 UNBLOCK_INPUT; | |
5223 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5224 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5225 } |
5226 | |
5227 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5228 /* Returns the `distance' between the colors X and Y. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5229 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5230 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5231 color_distance (x, y) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5232 XColor *x, *y; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5233 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5234 /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5235 Quoting from that paper: |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5236 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5237 This formula has results that are very close to L*u*v* (with the |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5238 modified lightness curve) and, more importantly, it is a more even |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5239 algorithm: it does not have a range of colours where it suddenly |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5240 gives far from optimal results. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5241 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5242 See <http://www.compuphase.com/cmetric.htm> for more info. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5243 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5244 long r = (x->red - y->red) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5245 long g = (x->green - y->green) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5246 long b = (x->blue - y->blue) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5247 long r_mean = (x->red + y->red) >> 9; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5248 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5249 return |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5250 (((512 + r_mean) * r * r) >> 8) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5251 + 4 * g * g |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5252 + (((767 - r_mean) * b * b) >> 8); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5253 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5254 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5255 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5256 DEFUN ("color-distance", Fcolor_distance, Scolor_distance, 2, 3, 0, |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5257 doc: /* Return an integer distance between COLOR1 and COLOR2 on FRAME. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5258 COLOR1 and COLOR2 may be either strings containing the color name, |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5259 or lists of the form (RED GREEN BLUE). |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5260 If FRAME is unspecified or nil, the current frame is used. */) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5261 (color1, color2, frame) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5262 Lisp_Object color1, color2, frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5263 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5264 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5265 XColor cdef1, cdef2; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5266 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5267 if (NILP (frame)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5268 frame = selected_frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5269 CHECK_LIVE_FRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5270 f = XFRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5271 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5272 if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5273 || !STRINGP (color1) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5274 || !defined_color (f, SDATA (color1), &cdef1, 0)) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5275 signal_error ("Invalid color", color1); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5276 if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5277 || !STRINGP (color2) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5278 || !defined_color (f, SDATA (color2), &cdef2, 0)) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5279 signal_error ("Invalid color", color2); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5280 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5281 return make_number (color_distance (&cdef1, &cdef2)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5282 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5283 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5284 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5285 /*********************************************************************** |
24995 | 5286 Face Cache |
5287 ***********************************************************************/ | |
5288 | |
5289 /* Return a new face cache for frame F. */ | |
5290 | |
5291 static struct face_cache * | |
5292 make_face_cache (f) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5293 struct frame *f; |
24995 | 5294 { |
5295 struct face_cache *c; | |
5296 int size; | |
5297 | |
5298 c = (struct face_cache *) xmalloc (sizeof *c); | |
5299 bzero (c, sizeof *c); | |
5300 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
5301 c->buckets = (struct face **) xmalloc (size); | |
5302 bzero (c->buckets, size); | |
5303 c->size = 50; | |
5304 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
5305 c->f = f; | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5306 c->menu_face_changed_p = menu_face_changed_default; |
24995 | 5307 return c; |
5308 } | |
5309 | |
5310 | |
5311 /* Clear out all graphics contexts for all realized faces, except for | |
5312 the basic faces. This should be done from time to time just to avoid | |
5313 keeping too many graphics contexts that are no longer needed. */ | |
5314 | |
5315 static void | |
5316 clear_face_gcs (c) | |
5317 struct face_cache *c; | |
5318 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5319 if (c && FRAME_WINDOW_P (c->f)) |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5320 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5321 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5322 int i; |
5323 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
5324 { | |
5325 struct face *face = c->faces_by_id[i]; | |
5326 if (face && face->gc) | |
5327 { | |
5328 x_free_gc (c->f, face->gc); | |
5329 face->gc = 0; | |
5330 } | |
5331 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5332 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5333 } |
5334 } | |
5335 | |
5336 | |
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
5337 /* Free all realized faces in face cache C, including basic faces. |
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
5338 C may be null. If faces are freed, make sure the frame's current |
24995 | 5339 matrix is marked invalid, so that a display caused by an expose |
5340 event doesn't try to use faces we destroyed. */ | |
5341 | |
5342 static void | |
5343 free_realized_faces (c) | |
5344 struct face_cache *c; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5345 { |
24995 | 5346 if (c && c->used) |
5347 { | |
5348 int i, size; | |
5349 struct frame *f = c->f; | |
5350 | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5351 /* We must block input here because we can't process X events |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5352 safely while only some faces are freed, or when the frame's |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5353 current matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5354 BLOCK_INPUT; |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5355 |
24995 | 5356 for (i = 0; i < c->used; ++i) |
5357 { | |
5358 free_realized_face (f, c->faces_by_id[i]); | |
5359 c->faces_by_id[i] = NULL; | |
5360 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5361 |
24995 | 5362 c->used = 0; |
5363 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
5364 bzero (c->buckets, size); | |
5365 | |
5366 /* Must do a thorough redisplay the next time. Mark current | |
5367 matrices as invalid because they will reference faces freed | |
5368 above. This function is also called when a frame is | |
5369 destroyed. In this case, the root window of F is nil. */ | |
5370 if (WINDOWP (f->root_window)) | |
5371 { | |
5372 clear_current_matrices (f); | |
5373 ++windows_or_buffers_changed; | |
5374 } | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5375 |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5376 UNBLOCK_INPUT; |
24995 | 5377 } |
5378 } | |
5379 | |
5380 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5381 /* Free all faces realized for multibyte characters on frame F that |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5382 has FONTSET. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5383 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5384 void |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5385 free_realized_multibyte_face (f, fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5386 struct frame *f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5387 int fontset; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5388 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5389 struct face_cache *cache = FRAME_FACE_CACHE (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5390 struct face *face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5391 int i; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5392 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5393 /* We must block input here because we can't process X events safely |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5394 while only some faces are freed, or when the frame's current |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5395 matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5396 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5397 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5398 for (i = 0; i < cache->used; i++) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5399 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5400 face = cache->faces_by_id[i]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5401 if (face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5402 && face != face->ascii_face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5403 && face->fontset == fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5404 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5405 uncache_face (cache, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5406 free_realized_face (f, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5407 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5408 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5409 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5410 /* Must do a thorough redisplay the next time. Mark current |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5411 matrices as invalid because they will reference faces freed |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5412 above. This function is also called when a frame is destroyed. |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5413 In this case, the root window of F is nil. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5414 if (WINDOWP (f->root_window)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5415 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5416 clear_current_matrices (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5417 ++windows_or_buffers_changed; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5418 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5419 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5420 UNBLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5421 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5422 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5423 |
24995 | 5424 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
5425 This is done after attributes of a named face have been changed, | |
5426 because we can't tell which realized faces depend on that face. */ | |
5427 | |
5428 void | |
5429 free_all_realized_faces (frame) | |
5430 Lisp_Object frame; | |
5431 { | |
5432 if (NILP (frame)) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5433 { |
24995 | 5434 Lisp_Object rest; |
5435 FOR_EACH_FRAME (rest, frame) | |
5436 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
5437 } | |
5438 else | |
5439 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
5440 } | |
5441 | |
5442 | |
5443 /* Free face cache C and faces in it, including their X resources. */ | |
5444 | |
5445 static void | |
5446 free_face_cache (c) | |
5447 struct face_cache *c; | |
5448 { | |
5449 if (c) | |
5450 { | |
5451 free_realized_faces (c); | |
5452 xfree (c->buckets); | |
5453 xfree (c->faces_by_id); | |
5454 xfree (c); | |
5455 } | |
5456 } | |
5457 | |
5458 | |
5459 /* Cache realized face FACE in face cache C. HASH is the hash value | |
5460 of FACE. If FACE->fontset >= 0, add the new face to the end of the | |
5461 collision list of the face hash table of C. This is done because | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5462 otherwise lookup_face would find FACE for every character, even if |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5463 faces with the same attributes but for specific characters exist. */ |
24995 | 5464 |
5465 static void | |
5466 cache_face (c, face, hash) | |
5467 struct face_cache *c; | |
5468 struct face *face; | |
5469 unsigned hash; | |
5470 { | |
5471 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
5472 | |
5473 face->hash = hash; | |
5474 | |
5475 if (face->fontset >= 0) | |
5476 { | |
5477 struct face *last = c->buckets[i]; | |
5478 if (last) | |
5479 { | |
5480 while (last->next) | |
5481 last = last->next; | |
5482 last->next = face; | |
5483 face->prev = last; | |
5484 face->next = NULL; | |
5485 } | |
5486 else | |
5487 { | |
5488 c->buckets[i] = face; | |
5489 face->prev = face->next = NULL; | |
5490 } | |
5491 } | |
5492 else | |
5493 { | |
5494 face->prev = NULL; | |
5495 face->next = c->buckets[i]; | |
5496 if (face->next) | |
5497 face->next->prev = face; | |
5498 c->buckets[i] = face; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5499 } |
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5500 |
24995 | 5501 /* Find a free slot in C->faces_by_id and use the index of the free |
5502 slot as FACE->id. */ | |
5503 for (i = 0; i < c->used; ++i) | |
5504 if (c->faces_by_id[i] == NULL) | |
5505 break; | |
5506 face->id = i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5507 |
24995 | 5508 /* Maybe enlarge C->faces_by_id. */ |
53334
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5509 if (i == c->used) |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5510 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5511 if (c->used == c->size) |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5512 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5513 int new_size, sz; |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5514 new_size = min (2 * c->size, MAX_FACE_ID); |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5515 if (new_size == c->size) |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5516 abort (); /* Alternatives? ++kfs */ |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5517 sz = new_size * sizeof *c->faces_by_id; |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5518 c->faces_by_id = (struct face **) xrealloc (c->faces_by_id, sz); |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5519 c->size = new_size; |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5520 } |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5521 c->used++; |
24995 | 5522 } |
5523 | |
5524 #if GLYPH_DEBUG | |
5525 /* Check that FACE got a unique id. */ | |
5526 { | |
5527 int j, n; | |
5528 struct face *face; | |
5529 | |
5530 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
5531 for (face = c->buckets[j]; face; face = face->next) | |
5532 if (face->id == i) | |
5533 ++n; | |
5534 | |
5535 xassert (n == 1); | |
5536 } | |
5537 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5538 |
24995 | 5539 c->faces_by_id[i] = face; |
5540 } | |
5541 | |
5542 | |
5543 /* Remove face FACE from cache C. */ | |
5544 | |
5545 static void | |
5546 uncache_face (c, face) | |
5547 struct face_cache *c; | |
5548 struct face *face; | |
5549 { | |
5550 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5551 |
24995 | 5552 if (face->prev) |
5553 face->prev->next = face->next; | |
5554 else | |
5555 c->buckets[i] = face->next; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5556 |
24995 | 5557 if (face->next) |
5558 face->next->prev = face->prev; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5559 |
24995 | 5560 c->faces_by_id[face->id] = NULL; |
5561 if (face->id == c->used) | |
5562 --c->used; | |
5563 } | |
5564 | |
5565 | |
5566 /* Look up a realized face with face attributes ATTR in the face cache | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5567 of frame F. The face will be used to display character C. Value |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5568 is the ID of the face found. If no suitable face is found, realize |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5569 a new one. In that case, if C is a multibyte character, BASE_FACE |
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
5570 is a face that has the same attributes. */ |
24995 | 5571 |
5572 INLINE int | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5573 lookup_face (f, attr, c, base_face) |
24995 | 5574 struct frame *f; |
5575 Lisp_Object *attr; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5576 int c; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5577 struct face *base_face; |
24995 | 5578 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5579 struct face_cache *cache = FRAME_FACE_CACHE (f); |
24995 | 5580 unsigned hash; |
5581 int i; | |
5582 struct face *face; | |
5583 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5584 xassert (cache != NULL); |
24995 | 5585 check_lface_attrs (attr); |
5586 | |
5587 /* Look up ATTR in the face cache. */ | |
5588 hash = lface_hash (attr); | |
5589 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5590 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5591 for (face = cache->buckets[i]; face; face = face->next) |
24995 | 5592 if (face->hash == hash |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5593 && (!FRAME_WINDOW_P (f) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5594 || FACE_SUITABLE_FOR_CHAR_P (face, c)) |
24995 | 5595 && lface_equal_p (face->lface, attr)) |
5596 break; | |
5597 | |
5598 /* If not found, realize a new face. */ | |
5599 if (face == NULL) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5600 face = realize_face (cache, attr, c, base_face, -1); |
24995 | 5601 |
5602 #if GLYPH_DEBUG | |
5603 xassert (face == FACE_FROM_ID (f, face->id)); | |
28409 | 5604 |
5605 /* When this function is called from face_for_char (in this case, C is | |
5606 a multibyte character), a fontset of a face returned by | |
5607 realize_face is not yet set, i.e. FACE_SUITABLE_FOR_CHAR_P (FACE, | |
5608 C) is not sutisfied. The fontset is set for this face by | |
5609 face_for_char later. */ | |
28349
26f2a2e9a2b5
(lookup_face): Don't assert FACE_SUITABLE_FOR_CHAR_P.
Gerd Moellmann <gerd@gnu.org>
parents:
28263
diff
changeset
|
5610 #if 0 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5611 if (FRAME_WINDOW_P (f)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5612 xassert (FACE_SUITABLE_FOR_CHAR_P (face, c)); |
28349
26f2a2e9a2b5
(lookup_face): Don't assert FACE_SUITABLE_FOR_CHAR_P.
Gerd Moellmann <gerd@gnu.org>
parents:
28263
diff
changeset
|
5613 #endif |
24995 | 5614 #endif /* GLYPH_DEBUG */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5615 |
24995 | 5616 return face->id; |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5617 } |
24995 | 5618 |
5619 | |
5620 /* Return the face id of the realized face for named face SYMBOL on | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5621 frame F suitable for displaying character C. Value is -1 if the |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5622 face couldn't be determined, which might happen if the default face |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5623 isn't realized and cannot be realized. */ |
24995 | 5624 |
5625 int | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5626 lookup_named_face (f, symbol, c, signal_p) |
24995 | 5627 struct frame *f; |
5628 Lisp_Object symbol; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5629 int c; |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5630 int signal_p; |
24995 | 5631 { |
5632 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5633 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
5634 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
5635 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5636 if (default_face == NULL) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5637 { |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5638 if (!realize_basic_faces (f)) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5639 return -1; |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5640 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5641 } |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5642 |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5643 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p)) |
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5644 return -1; |
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5645 |
24995 | 5646 bcopy (default_face->lface, attrs, sizeof attrs); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5647 merge_face_vectors (f, symbol_attrs, attrs, 0); |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5648 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5649 return lookup_face (f, attrs, c, NULL); |
24995 | 5650 } |
5651 | |
5652 | |
5653 /* Return the ID of the realized ASCII face of Lisp face with ID | |
5654 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
5655 | |
5656 int | |
5657 ascii_face_of_lisp_face (f, lface_id) | |
5658 struct frame *f; | |
5659 int lface_id; | |
5660 { | |
5661 int face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5662 |
24995 | 5663 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
5664 { | |
5665 Lisp_Object face_name = lface_id_to_name[lface_id]; | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5666 face_id = lookup_named_face (f, face_name, 0, 1); |
24995 | 5667 } |
5668 else | |
5669 face_id = -1; | |
5670 | |
5671 return face_id; | |
5672 } | |
5673 | |
5674 | |
5675 /* Return a face for charset ASCII that is like the face with id | |
5676 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
5677 STEPS < 0 means larger. Value is the id of the face. */ | |
5678 | |
5679 int | |
5680 smaller_face (f, face_id, steps) | |
5681 struct frame *f; | |
5682 int face_id, steps; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5683 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5684 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5685 struct face *face; |
5686 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5687 int pt, last_pt, last_height; | |
5688 int delta; | |
5689 int new_face_id; | |
5690 struct face *new_face; | |
5691 | |
5692 /* If not called for an X frame, just return the original face. */ | |
5693 if (FRAME_TERMCAP_P (f)) | |
5694 return face_id; | |
5695 | |
5696 /* Try in increments of 1/2 pt. */ | |
5697 delta = steps < 0 ? 5 : -5; | |
5698 steps = abs (steps); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5699 |
24995 | 5700 face = FACE_FROM_ID (f, face_id); |
5701 bcopy (face->lface, attrs, sizeof attrs); | |
5702 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
5703 new_face_id = face_id; | |
5704 last_height = FONT_HEIGHT (face->font); | |
5705 | |
5706 while (steps | |
5707 && pt + delta > 0 | |
5708 /* Give up if we cannot find a font within 10pt. */ | |
5709 && abs (last_pt - pt) < 100) | |
5710 { | |
5711 /* Look up a face for a slightly smaller/larger font. */ | |
5712 pt += delta; | |
5713 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5714 new_face_id = lookup_face (f, attrs, 0, NULL); |
24995 | 5715 new_face = FACE_FROM_ID (f, new_face_id); |
5716 | |
5717 /* If height changes, count that as one step. */ | |
31463
628bb2264f46
(smaller_face): Compare font heights with `<' and `>'
Gerd Moellmann <gerd@gnu.org>
parents:
31449
diff
changeset
|
5718 if ((delta < 0 && FONT_HEIGHT (new_face->font) < last_height) |
628bb2264f46
(smaller_face): Compare font heights with `<' and `>'
Gerd Moellmann <gerd@gnu.org>
parents:
31449
diff
changeset
|
5719 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
24995 | 5720 { |
5721 --steps; | |
5722 last_height = FONT_HEIGHT (new_face->font); | |
5723 last_pt = pt; | |
5724 } | |
5725 } | |
5726 | |
5727 return new_face_id; | |
5728 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5729 #else /* not HAVE_WINDOW_SYSTEM */ |
24995 | 5730 |
5731 return face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5732 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5733 #endif /* not HAVE_WINDOW_SYSTEM */ |
24995 | 5734 } |
5735 | |
5736 | |
5737 /* Return a face for charset ASCII that is like the face with id | |
5738 FACE_ID on frame F, but has height HEIGHT. */ | |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
5739 |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
5740 int |
24995 | 5741 face_with_height (f, face_id, height) |
5742 struct frame *f; | |
5743 int face_id; | |
5744 int height; | |
5745 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5746 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5747 struct face *face; |
5748 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5749 | |
5750 if (FRAME_TERMCAP_P (f) | |
5751 || height <= 0) | |
5752 return face_id; | |
5753 | |
5754 face = FACE_FROM_ID (f, face_id); | |
5755 bcopy (face->lface, attrs, sizeof attrs); | |
5756 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5757 face_id = lookup_face (f, attrs, 0, NULL); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5758 #endif /* HAVE_WINDOW_SYSTEM */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5759 |
24995 | 5760 return face_id; |
5761 } | |
5762 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5763 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5764 /* Return the face id of the realized face for named face SYMBOL on |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5765 frame F suitable for displaying character C, and use attributes of |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5766 the face FACE_ID for attributes that aren't completely specified by |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5767 SYMBOL. This is like lookup_named_face, except that the default |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5768 attributes come from FACE_ID, not from the default face. FACE_ID |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5769 is assumed to be already realized. */ |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5770 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5771 int |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5772 lookup_derived_face (f, symbol, c, face_id) |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5773 struct frame *f; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5774 Lisp_Object symbol; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5775 int c; |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5776 int face_id; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5777 { |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5778 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5779 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5780 struct face *default_face = FACE_FROM_ID (f, face_id); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5781 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5782 if (!default_face) |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5783 abort (); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5784 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5785 get_lface_attributes (f, symbol, symbol_attrs, 1); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5786 bcopy (default_face->lface, attrs, sizeof attrs); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5787 merge_face_vectors (f, symbol_attrs, attrs, 0); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5788 return lookup_face (f, attrs, c, default_face); |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5789 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5790 |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5791 DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector, |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5792 Sface_attributes_as_vector, 1, 1, 0, |
41010
edd3b39a7cd1
(Fface_attributes_as_vector): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
40991
diff
changeset
|
5793 doc: /* Return a vector of face attributes corresponding to PLIST. */) |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5794 (plist) |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5795 Lisp_Object plist; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5796 { |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5797 Lisp_Object lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5798 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5799 Qunspecified); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5800 merge_face_ref (XFRAME (selected_frame), plist, XVECTOR (lface)->contents, |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5801 1, 0); |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5802 return lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5803 } |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5804 |
24995 | 5805 |
5806 | |
5807 /*********************************************************************** | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5808 Face capability testing |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5809 ***********************************************************************/ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5810 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5811 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5812 /* If the distance (as returned by color_distance) between two colors is |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5813 less than this, then they are considered the same, for determining |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5814 whether a color is supported or not. The range of values is 0-65535. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5815 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5816 #define TTY_SAME_COLOR_THRESHOLD 10000 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5817 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5818 #ifdef HAVE_WINDOW_SYSTEM |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5819 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5820 /* Return non-zero if all the face attributes in ATTRS are supported |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5821 on the window-system frame F. |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5822 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5823 The definition of `supported' is somewhat heuristic, but basically means |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5824 that a face containing all the attributes in ATTRS, when merged with the |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5825 default face for display, can be represented in a way that's |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5826 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5827 \(1) different in appearance than the default face, and |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5828 \(2) `close in spirit' to what the attributes specify, if not exact. */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5829 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5830 static int |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5831 x_supports_face_attributes_p (f, attrs, def_face) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5832 struct frame *f; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5833 Lisp_Object *attrs; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5834 struct face *def_face; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5835 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5836 Lisp_Object *def_attrs = def_face->lface; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5837 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5838 /* Check that other specified attributes are different that the default |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5839 face. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5840 if ((!UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5841 && face_attr_equal_p (attrs[LFACE_UNDERLINE_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5842 def_attrs[LFACE_UNDERLINE_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5843 || (!UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5844 && face_attr_equal_p (attrs[LFACE_INVERSE_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5845 def_attrs[LFACE_INVERSE_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5846 || (!UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5847 && face_attr_equal_p (attrs[LFACE_FOREGROUND_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5848 def_attrs[LFACE_FOREGROUND_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5849 || (!UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5850 && face_attr_equal_p (attrs[LFACE_BACKGROUND_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5851 def_attrs[LFACE_BACKGROUND_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5852 || (!UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5853 && face_attr_equal_p (attrs[LFACE_STIPPLE_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5854 def_attrs[LFACE_STIPPLE_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5855 || (!UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5856 && face_attr_equal_p (attrs[LFACE_OVERLINE_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5857 def_attrs[LFACE_OVERLINE_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5858 || (!UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5859 && face_attr_equal_p (attrs[LFACE_STRIKE_THROUGH_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5860 def_attrs[LFACE_STRIKE_THROUGH_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5861 || (!UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5862 && face_attr_equal_p (attrs[LFACE_BOX_INDEX], |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5863 def_attrs[LFACE_BOX_INDEX]))) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5864 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5865 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5866 /* Check font-related attributes, as those are the most commonly |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5867 "unsupported" on a window-system (because of missing fonts). */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5868 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5869 || !UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5870 || !UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5871 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5872 || !UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5873 || !UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX])) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5874 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5875 struct face *face; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5876 Lisp_Object merged_attrs[LFACE_VECTOR_SIZE]; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5877 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5878 bcopy (def_attrs, merged_attrs, sizeof merged_attrs); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5879 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5880 merge_face_vectors (f, attrs, merged_attrs, 0); |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5881 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5882 face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0)); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5883 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5884 if (! face) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5885 error ("cannot make face"); |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5886 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5887 /* If the font is the same, then not supported. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5888 if (face->font == def_face->font) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5889 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5890 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5891 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5892 /* Everything checks out, this face is supported. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5893 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5894 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5895 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5896 #endif /* HAVE_WINDOW_SYSTEM */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5897 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5898 /* Return non-zero if all the face attributes in ATTRS are supported |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5899 on the tty frame F. |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5900 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5901 The definition of `supported' is somewhat heuristic, but basically means |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5902 that a face containing all the attributes in ATTRS, when merged |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5903 with the default face for display, can be represented in a way that's |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5904 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5905 \(1) different in appearance than the default face, and |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5906 \(2) `close in spirit' to what the attributes specify, if not exact. |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5907 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5908 Point (2) implies that a `:weight black' attribute will be satisfied |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5909 by any terminal that can display bold, and a `:foreground "yellow"' as |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5910 long as the terminal can display a yellowish color, but `:slant italic' |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5911 will _not_ be satisfied by the tty display code's automatic |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5912 substitution of a `dim' face for italic. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5913 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5914 static int |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5915 tty_supports_face_attributes_p (f, attrs, def_face) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5916 struct frame *f; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5917 Lisp_Object *attrs; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5918 struct face *def_face; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5919 { |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5920 int weight; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5921 Lisp_Object val, fg, bg; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5922 XColor fg_tty_color, fg_std_color; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5923 XColor bg_tty_color, bg_std_color; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5924 unsigned test_caps = 0; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5925 Lisp_Object *def_attrs = def_face->lface; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5926 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5927 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5928 /* First check some easy-to-check stuff; ttys support none of the |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5929 following attributes, so we can just return false if any are requested |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5930 (even if `nominal' values are specified, we should still return false, |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5931 as that will be the same value that the default face uses). We |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5932 consider :slant unsupportable on ttys, even though the face code |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5933 actually `fakes' them using a dim attribute if possible. This is |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5934 because the faked result is too different from what the face |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5935 specifies. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5936 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5937 || !UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5938 || !UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5939 || !UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5940 || !UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5941 || !UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5942 || !UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5943 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX])) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5944 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5945 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5946 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5947 /* Test for terminal `capabilities' (non-color character attributes). */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5948 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5949 /* font weight (bold/dim) */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5950 weight = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5951 if (weight >= 0) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5952 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5953 int def_weight = face_numeric_weight (def_attrs[LFACE_WEIGHT_INDEX]); |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5954 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5955 if (weight > XLFD_WEIGHT_MEDIUM) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5956 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5957 if (def_weight > XLFD_WEIGHT_MEDIUM) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5958 return 0; /* same as default */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5959 test_caps = TTY_CAP_BOLD; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5960 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5961 else if (weight < XLFD_WEIGHT_MEDIUM) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5962 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5963 if (def_weight < XLFD_WEIGHT_MEDIUM) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5964 return 0; /* same as default */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5965 test_caps = TTY_CAP_DIM; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5966 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5967 else if (def_weight == XLFD_WEIGHT_MEDIUM) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5968 return 0; /* same as default */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5969 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5970 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5971 /* underlining */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5972 val = attrs[LFACE_UNDERLINE_INDEX]; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5973 if (!UNSPECIFIEDP (val)) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5974 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5975 if (STRINGP (val)) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5976 return 0; /* ttys can't use colored underlines */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5977 else if (face_attr_equal_p (val, def_attrs[LFACE_UNDERLINE_INDEX])) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5978 return 0; /* same as default */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5979 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5980 test_caps |= TTY_CAP_UNDERLINE; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5981 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5982 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5983 /* inverse video */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5984 val = attrs[LFACE_INVERSE_INDEX]; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5985 if (!UNSPECIFIEDP (val)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5986 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5987 if (face_attr_equal_p (val, def_attrs[LFACE_UNDERLINE_INDEX])) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5988 return 0; /* same as default */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5989 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5990 test_caps |= TTY_CAP_INVERSE; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5991 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5992 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5993 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5994 /* Color testing. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5995 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5996 /* Default the color indices in FG_TTY_COLOR and BG_TTY_COLOR, since |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5997 we use them when calling `tty_capable_p' below, even if the face |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5998 specifies no colors. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5999 fg_tty_color.pixel = FACE_TTY_DEFAULT_FG_COLOR; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6000 bg_tty_color.pixel = FACE_TTY_DEFAULT_BG_COLOR; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6001 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6002 /* Check if foreground color is close enough. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6003 fg = attrs[LFACE_FOREGROUND_INDEX]; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6004 if (STRINGP (fg)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6005 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6006 Lisp_Object def_fg = def_attrs[LFACE_FOREGROUND_INDEX]; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6007 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6008 if (face_attr_equal_p (fg, def_fg)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6009 return 0; /* same as default */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6010 else if (! tty_lookup_color (f, fg, &fg_tty_color, &fg_std_color)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6011 return 0; /* not a valid color */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6012 else if (color_distance (&fg_tty_color, &fg_std_color) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6013 > TTY_SAME_COLOR_THRESHOLD) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6014 return 0; /* displayed color is too different */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6015 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6016 /* Make sure the color is really different than the default. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6017 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6018 XColor def_fg_color; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6019 if (tty_lookup_color (f, def_fg, &def_fg_color, 0) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6020 && (color_distance (&fg_tty_color, &def_fg_color) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6021 <= TTY_SAME_COLOR_THRESHOLD)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6022 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6023 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6024 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6025 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6026 /* Check if background color is close enough. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6027 bg = attrs[LFACE_BACKGROUND_INDEX]; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6028 if (STRINGP (bg)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6029 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6030 Lisp_Object def_bg = def_attrs[LFACE_FOREGROUND_INDEX]; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6031 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6032 if (face_attr_equal_p (bg, def_bg)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6033 return 0; /* same as default */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6034 else if (! tty_lookup_color (f, bg, &bg_tty_color, &bg_std_color)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6035 return 0; /* not a valid color */ |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6036 else if (color_distance (&bg_tty_color, &bg_std_color) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6037 > TTY_SAME_COLOR_THRESHOLD) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6038 return 0; /* displayed color is too different */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6039 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6040 /* Make sure the color is really different than the default. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6041 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6042 XColor def_bg_color; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6043 if (tty_lookup_color (f, def_bg, &def_bg_color, 0) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6044 && (color_distance (&bg_tty_color, &def_bg_color) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6045 <= TTY_SAME_COLOR_THRESHOLD)) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6046 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6047 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6048 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6049 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6050 /* If both foreground and background are requested, see if the |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6051 distance between them is OK. We just check to see if the distance |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6052 between the tty's foreground and background is close enough to the |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6053 distance between the standard foreground and background. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6054 if (STRINGP (fg) && STRINGP (bg)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6055 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6056 int delta_delta |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6057 = (color_distance (&fg_std_color, &bg_std_color) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6058 - color_distance (&fg_tty_color, &bg_tty_color)); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6059 if (delta_delta > TTY_SAME_COLOR_THRESHOLD |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6060 || delta_delta < -TTY_SAME_COLOR_THRESHOLD) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6061 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6062 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6063 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6064 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6065 /* See if the capabilities we selected above are supported, with the |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6066 given colors. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6067 if (test_caps != 0 && |
83145 | 6068 ! tty_capable_p (FRAME_TTY (f), test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6069 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6070 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6071 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6072 /* Hmmm, everything checks out, this terminal must support this face. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6073 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6074 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6075 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6076 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6077 DEFUN ("display-supports-face-attributes-p", |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6078 Fdisplay_supports_face_attributes_p, Sdisplay_supports_face_attributes_p, |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6079 1, 2, 0, |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6080 doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported. |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6081 The optional argument DISPLAY can be a display name, a frame, or |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6082 nil (meaning the selected frame's display) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6083 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6084 The definition of `supported' is somewhat heuristic, but basically means |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6085 that a face containing all the attributes in ATTRIBUTES, when merged |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6086 with the default face for display, can be represented in a way that's |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6087 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6088 \(1) different in appearance than the default face, and |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6089 \(2) `close in spirit' to what the attributes specify, if not exact. |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6090 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6091 Point (2) implies that a `:weight black' attribute will be satisfied by |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6092 any display that can display bold, and a `:foreground \"yellow\"' as long |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6093 as it can display a yellowish color, but `:slant italic' will _not_ be |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6094 satisfied by the tty display code's automatic substitution of a `dim' |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6095 face for italic. */) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6096 (attributes, display) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6097 Lisp_Object attributes, display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6098 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6099 int supports, i; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6100 Lisp_Object frame; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6101 struct frame *f; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6102 struct face *def_face; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6103 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6104 |
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6105 if (noninteractive || !initialized) |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6106 /* We may not be able to access low-level face information in batch |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6107 mode, or before being dumped, and this function is not going to |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6108 be very useful in those cases anyway, so just give up. */ |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6109 return Qnil; |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6110 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6111 if (NILP (display)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6112 frame = selected_frame; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6113 else if (FRAMEP (display)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6114 frame = display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6115 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6116 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6117 /* Find any frame on DISPLAY. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6118 Lisp_Object fl_tail; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6119 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6120 frame = Qnil; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6121 for (fl_tail = Vframe_list; CONSP (fl_tail); fl_tail = XCDR (fl_tail)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6122 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6123 frame = XCAR (fl_tail); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6124 if (!NILP (Fequal (Fcdr (Fassq (Qdisplay, |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6125 XFRAME (frame)->param_alist)), |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6126 display))) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6127 break; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6128 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6129 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6130 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6131 CHECK_LIVE_FRAME (frame); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6132 f = XFRAME (frame); |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6133 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6134 for (i = 0; i < LFACE_VECTOR_SIZE; i++) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6135 attrs[i] = Qunspecified; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6136 merge_face_ref (f, attributes, attrs, 1, 0); |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6137 |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6138 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6139 if (def_face == NULL) |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6140 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6141 if (! realize_basic_faces (f)) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
6142 error ("Cannot realize default face"); |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6143 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6144 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6145 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6146 /* Dispatch to the appropriate handler. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6147 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6148 supports = tty_supports_face_attributes_p (f, attrs, def_face); |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
6149 #ifdef HAVE_WINDOW_SYSTEM |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6150 else |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6151 supports = x_supports_face_attributes_p (f, attrs, def_face); |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6152 #endif |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6153 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6154 return supports ? Qt : Qnil; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6155 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6156 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6157 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6158 /*********************************************************************** |
24995 | 6159 Font selection |
6160 ***********************************************************************/ | |
6161 | |
6162 DEFUN ("internal-set-font-selection-order", | |
6163 Finternal_set_font_selection_order, | |
6164 Sinternal_set_font_selection_order, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6165 doc: /* Set font selection order for face font selection to ORDER. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6166 ORDER must be a list of length 4 containing the symbols `:width', |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6167 `:height', `:weight', and `:slant'. Face attributes appearing |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6168 first in ORDER are matched first, e.g. if `:height' appears before |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6169 `:weight' in ORDER, font selection first tries to find a font with |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6170 a suitable height, and then tries to match the font weight. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6171 Value is ORDER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6172 (order) |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6173 Lisp_Object order; |
24995 | 6174 { |
6175 Lisp_Object list; | |
6176 int i; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6177 int indices[DIM (font_sort_order)]; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6178 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6179 CHECK_LIST (order); |
24995 | 6180 bzero (indices, sizeof indices); |
6181 i = 0; | |
6182 | |
6183 for (list = order; | |
6184 CONSP (list) && i < DIM (indices); | |
6185 list = XCDR (list), ++i) | |
6186 { | |
6187 Lisp_Object attr = XCAR (list); | |
6188 int xlfd; | |
6189 | |
6190 if (EQ (attr, QCwidth)) | |
6191 xlfd = XLFD_SWIDTH; | |
6192 else if (EQ (attr, QCheight)) | |
6193 xlfd = XLFD_POINT_SIZE; | |
6194 else if (EQ (attr, QCweight)) | |
6195 xlfd = XLFD_WEIGHT; | |
6196 else if (EQ (attr, QCslant)) | |
6197 xlfd = XLFD_SLANT; | |
6198 else | |
6199 break; | |
6200 | |
6201 if (indices[i] != 0) | |
6202 break; | |
6203 indices[i] = xlfd; | |
6204 } | |
6205 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6206 if (!NILP (list) || i != DIM (indices)) |
24995 | 6207 signal_error ("Invalid font sort order", order); |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6208 for (i = 0; i < DIM (font_sort_order); ++i) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6209 if (indices[i] == 0) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6210 signal_error ("Invalid font sort order", order); |
24995 | 6211 |
6212 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
6213 { | |
6214 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
6215 free_all_realized_faces (Qnil); | |
6216 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6217 |
24995 | 6218 return Qnil; |
6219 } | |
6220 | |
6221 | |
6222 DEFUN ("internal-set-alternative-font-family-alist", | |
6223 Finternal_set_alternative_font_family_alist, | |
6224 Sinternal_set_alternative_font_family_alist, 1, 1, 0, | |
40991
566c75efb733
(Finternal_set_alternative_font_family_alist): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40838
diff
changeset
|
6225 doc: /* Define alternative font families to try in face font selection. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6226 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6227 Each ALTERNATIVE is tried in order if no fonts of font family FAMILY can |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6228 be found. Value is ALIST. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6229 (alist) |
24995 | 6230 Lisp_Object alist; |
6231 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6232 CHECK_LIST (alist); |
24995 | 6233 Vface_alternative_font_family_alist = alist; |
6234 free_all_realized_faces (Qnil); | |
6235 return alist; | |
6236 } | |
6237 | |
6238 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6239 DEFUN ("internal-set-alternative-font-registry-alist", |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6240 Finternal_set_alternative_font_registry_alist, |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6241 Sinternal_set_alternative_font_registry_alist, 1, 1, 0, |
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
6242 doc: /* Define alternative font registries to try in face font selection. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6243 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6244 Each ALTERNATIVE is tried in order if no fonts of font registry REGISTRY can |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6245 be found. Value is ALIST. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6246 (alist) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6247 Lisp_Object alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6248 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6249 CHECK_LIST (alist); |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6250 Vface_alternative_font_registry_alist = alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6251 free_all_realized_faces (Qnil); |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6252 return alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6253 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6254 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6255 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6256 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 6257 |
6258 /* Value is non-zero if FONT is the name of a scalable font. The | |
6259 X11R6 XLFD spec says that point size, pixel size, and average width | |
6260 are zero for scalable fonts. Intlfonts contain at least one | |
6261 scalable font ("*-muleindian-1") for which this isn't true, so we | |
6262 just test average width. */ | |
6263 | |
6264 static int | |
6265 font_scalable_p (font) | |
6266 struct font_name *font; | |
6267 { | |
6268 char *s = font->fields[XLFD_AVGWIDTH]; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6269 return (*s == '0' && *(s + 1) == '\0') |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6270 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6271 /* Windows implementation of XLFD is slightly broken for backward |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6272 compatibility with previous broken versions, so test for |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6273 wildcards as well as 0. */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6274 || *s == '*' |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6275 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6276 ; |
24995 | 6277 } |
6278 | |
6279 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6280 /* Ignore the difference of font point size less than this value. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6281 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6282 #define FONT_POINT_SIZE_QUANTUM 5 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6283 |
24995 | 6284 /* Value is non-zero if FONT1 is a better match for font attributes |
6285 VALUES than FONT2. VALUES is an array of face attribute values in | |
6286 font sort order. COMPARE_PT_P zero means don't compare point | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6287 sizes. AVGWIDTH, if not zero, is a specified font average width |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6288 to compare with. */ |
24995 | 6289 |
6290 static int | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6291 better_font_p (values, font1, font2, compare_pt_p, avgwidth) |
24995 | 6292 int *values; |
6293 struct font_name *font1, *font2; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6294 int compare_pt_p, avgwidth; |
24995 | 6295 { |
6296 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6297 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6298 for (i = 0; i < DIM (font_sort_order); ++i) |
24995 | 6299 { |
6300 int xlfd_idx = font_sort_order[i]; | |
6301 | |
6302 if (compare_pt_p || xlfd_idx != XLFD_POINT_SIZE) | |
6303 { | |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6304 int delta1, delta2; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6305 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6306 if (xlfd_idx == XLFD_POINT_SIZE) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6307 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6308 delta1 = abs (values[i] - (font1->numeric[xlfd_idx] |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6309 / font1->rescale_ratio)); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6310 delta2 = abs (values[i] - (font2->numeric[xlfd_idx] |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6311 / font2->rescale_ratio)); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6312 if (abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6313 continue; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6314 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6315 else |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6316 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6317 delta1 = abs (values[i] - font1->numeric[xlfd_idx]); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6318 delta2 = abs (values[i] - font2->numeric[xlfd_idx]); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6319 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6320 |
24995 | 6321 if (delta1 > delta2) |
6322 return 0; | |
6323 else if (delta1 < delta2) | |
6324 return 1; | |
6325 else | |
6326 { | |
6327 /* The difference may be equal because, e.g., the face | |
6328 specifies `italic' but we have only `regular' and | |
6329 `oblique'. Prefer `oblique' in this case. */ | |
6330 if ((xlfd_idx == XLFD_WEIGHT || xlfd_idx == XLFD_SLANT) | |
6331 && font1->numeric[xlfd_idx] > values[i] | |
6332 && font2->numeric[xlfd_idx] < values[i]) | |
6333 return 1; | |
6334 } | |
6335 } | |
6336 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6337 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6338 if (avgwidth) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6339 { |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6340 int delta1 = abs (avgwidth - font1->numeric[XLFD_AVGWIDTH]); |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6341 int delta2 = abs (avgwidth - font2->numeric[XLFD_AVGWIDTH]); |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6342 if (delta1 > delta2) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6343 return 0; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6344 else if (delta1 < delta2) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6345 return 1; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6346 } |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6347 |
52200
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6348 if (! compare_pt_p) |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6349 { |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6350 /* We prefer a real scalable font; i.e. not what autoscaled. */ |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6351 int auto_scaled_1 = (font1->numeric[XLFD_POINT_SIZE] == 0 |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6352 && font1->numeric[XLFD_RESY] > 0); |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6353 int auto_scaled_2 = (font2->numeric[XLFD_POINT_SIZE] == 0 |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6354 && font2->numeric[XLFD_RESY] > 0); |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6355 |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6356 if (auto_scaled_1 != auto_scaled_2) |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6357 return auto_scaled_2; |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6358 } |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6359 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6360 return font1->registry_priority < font2->registry_priority; |
24995 | 6361 } |
6362 | |
6363 | |
6364 /* Value is non-zero if FONT is an exact match for face attributes in | |
6365 SPECIFIED. SPECIFIED is an array of face attribute values in font | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6366 sort order. AVGWIDTH, if non-zero, is an average width to compare |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6367 with. */ |
24995 | 6368 |
6369 static int | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6370 exact_face_match_p (specified, font, avgwidth) |
24995 | 6371 int *specified; |
6372 struct font_name *font; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6373 int avgwidth; |
24995 | 6374 { |
6375 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6376 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6377 for (i = 0; i < DIM (font_sort_order); ++i) |
24995 | 6378 if (specified[i] != font->numeric[font_sort_order[i]]) |
6379 break; | |
6380 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6381 return (i == DIM (font_sort_order) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6382 && (avgwidth <= 0 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6383 || avgwidth == font->numeric[XLFD_AVGWIDTH])); |
24995 | 6384 } |
6385 | |
6386 | |
6387 /* Value is the name of a scaled font, generated from scalable font | |
6388 FONT on frame F. SPECIFIED_PT is the point-size to scale FONT to. | |
6389 Value is allocated from heap. */ | |
6390 | |
6391 static char * | |
6392 build_scalable_font_name (f, font, specified_pt) | |
6393 struct frame *f; | |
6394 struct font_name *font; | |
6395 int specified_pt; | |
6396 { | |
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6397 char pixel_size[20]; |
24995 | 6398 int pixel_value; |
6399 double resy = FRAME_X_DISPLAY_INFO (f)->resy; | |
6400 double pt; | |
6401 | |
6402 /* If scalable font is for a specific resolution, compute | |
6403 the point size we must specify from the resolution of | |
6404 the display and the specified resolution of the font. */ | |
6405 if (font->numeric[XLFD_RESY] != 0) | |
6406 { | |
6407 pt = resy / font->numeric[XLFD_RESY] * specified_pt + 0.5; | |
34882 | 6408 pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt; |
24995 | 6409 } |
6410 else | |
6411 { | |
6412 pt = specified_pt; | |
34882 | 6413 pixel_value = resy / (PT_PER_INCH * 10.0) * pt; |
24995 | 6414 } |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6415 /* We may need a font of the different size. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6416 pixel_value *= font->rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6417 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6418 /* We should keep POINT_SIZE 0. Otherwise, X server can't open a |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6419 font of the specified PIXEL_SIZE. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6420 #if 0 |
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6421 { /* Set point size of the font. */ |
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6422 char point_size[20]; |
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6423 sprintf (point_size, "%d", (int) pt); |
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6424 font->fields[XLFD_POINT_SIZE] = point_size; |
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6425 font->numeric[XLFD_POINT_SIZE] = pt; |
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6426 } |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6427 #endif |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6428 |
24995 | 6429 /* Set pixel size. */ |
6430 sprintf (pixel_size, "%d", pixel_value); | |
6431 font->fields[XLFD_PIXEL_SIZE] = pixel_size; | |
6432 font->numeric[XLFD_PIXEL_SIZE] = pixel_value; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6433 |
24995 | 6434 /* If font doesn't specify its resolution, use the |
6435 resolution of the display. */ | |
6436 if (font->numeric[XLFD_RESY] == 0) | |
6437 { | |
6438 char buffer[20]; | |
6439 sprintf (buffer, "%d", (int) resy); | |
6440 font->fields[XLFD_RESY] = buffer; | |
6441 font->numeric[XLFD_RESY] = resy; | |
6442 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6443 |
24995 | 6444 if (strcmp (font->fields[XLFD_RESX], "0") == 0) |
6445 { | |
6446 char buffer[20]; | |
6447 int resx = FRAME_X_DISPLAY_INFO (f)->resx; | |
6448 sprintf (buffer, "%d", resx); | |
6449 font->fields[XLFD_RESX] = buffer; | |
6450 font->numeric[XLFD_RESX] = resx; | |
6451 } | |
6452 | |
6453 return build_font_name (font); | |
6454 } | |
6455 | |
6456 | |
6457 /* Value is non-zero if we are allowed to use scalable font FONT. We | |
6458 can't run a Lisp function here since this function may be called | |
6459 with input blocked. */ | |
6460 | |
6461 static int | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6462 may_use_scalable_font_p (font) |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
6463 const char *font; |
24995 | 6464 { |
6465 if (EQ (Vscalable_fonts_allowed, Qt)) | |
6466 return 1; | |
6467 else if (CONSP (Vscalable_fonts_allowed)) | |
6468 { | |
6469 Lisp_Object tail, regexp; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6470 |
24995 | 6471 for (tail = Vscalable_fonts_allowed; CONSP (tail); tail = XCDR (tail)) |
6472 { | |
6473 regexp = XCAR (tail); | |
6474 if (STRINGP (regexp) | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6475 && fast_c_string_match_ignore_case (regexp, font) >= 0) |
24995 | 6476 return 1; |
6477 } | |
6478 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6479 |
24995 | 6480 return 0; |
6481 } | |
6482 | |
6483 | |
6484 | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6485 /* Return the name of the best matching font for face attributes ATTRS |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6486 in the array of font_name structures FONTS which contains NFONTS |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6487 elements. WIDTH_RATIO is a factor with which to multiply average |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6488 widths if ATTRS specifies such a width. |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6489 |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6490 Value is a font name which is allocated from the heap. FONTS is |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6491 freed by this function. |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6492 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6493 If NEEDS_OVERSTRIKE is non-zero, a boolean is returned in it to |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6494 indicate whether the resulting font should be drawn using overstrike |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6495 to simulate bold-face. */ |
24995 | 6496 |
6497 static char * | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6498 best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) |
24995 | 6499 struct frame *f; |
6500 Lisp_Object *attrs; | |
6501 struct font_name *fonts; | |
6502 int nfonts; | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6503 int width_ratio; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6504 int *needs_overstrike; |
24995 | 6505 { |
6506 char *font_name; | |
6507 struct font_name *best; | |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
6508 int i, pt = 0; |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6509 int specified[5]; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6510 int exact_p, avgwidth; |
24995 | 6511 |
6512 if (nfonts == 0) | |
6513 return NULL; | |
6514 | |
6515 /* Make specified font attributes available in `specified', | |
6516 indexed by sort order. */ | |
6517 for (i = 0; i < DIM (font_sort_order); ++i) | |
6518 { | |
6519 int xlfd_idx = font_sort_order[i]; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6520 |
24995 | 6521 if (xlfd_idx == XLFD_SWIDTH) |
6522 specified[i] = face_numeric_swidth (attrs[LFACE_SWIDTH_INDEX]); | |
6523 else if (xlfd_idx == XLFD_POINT_SIZE) | |
6524 specified[i] = pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
6525 else if (xlfd_idx == XLFD_WEIGHT) | |
6526 specified[i] = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); | |
6527 else if (xlfd_idx == XLFD_SLANT) | |
6528 specified[i] = face_numeric_slant (attrs[LFACE_SLANT_INDEX]); | |
6529 else | |
6530 abort (); | |
6531 } | |
6532 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6533 avgwidth = (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6534 ? 0 |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6535 : XFASTINT (attrs[LFACE_AVGWIDTH_INDEX]) * width_ratio); |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6536 |
24995 | 6537 exact_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6538 |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6539 if (needs_overstrike) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6540 *needs_overstrike = 0; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6541 |
24995 | 6542 /* Start with the first non-scalable font in the list. */ |
6543 for (i = 0; i < nfonts; ++i) | |
6544 if (!font_scalable_p (fonts + i)) | |
6545 break; | |
6546 | |
6547 /* Find the best match among the non-scalable fonts. */ | |
6548 if (i < nfonts) | |
6549 { | |
6550 best = fonts + i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6551 |
24995 | 6552 for (i = 1; i < nfonts; ++i) |
6553 if (!font_scalable_p (fonts + i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6554 && better_font_p (specified, fonts + i, best, 1, avgwidth)) |
24995 | 6555 { |
6556 best = fonts + i; | |
6557 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6558 exact_p = exact_face_match_p (specified, best, avgwidth); |
24995 | 6559 if (exact_p) |
6560 break; | |
6561 } | |
6562 } | |
6563 else | |
6564 best = NULL; | |
6565 | |
6566 /* Unless we found an exact match among non-scalable fonts, see if | |
6567 we can find a better match among scalable fonts. */ | |
6568 if (!exact_p) | |
6569 { | |
6570 /* A scalable font is better if | |
6571 | |
6572 1. its weight, slant, swidth attributes are better, or. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6573 |
24995 | 6574 2. the best non-scalable font doesn't have the required |
6575 point size, and the scalable fonts weight, slant, swidth | |
6576 isn't worse. */ | |
6577 | |
6578 int non_scalable_has_exact_height_p; | |
6579 | |
6580 if (best && best->numeric[XLFD_POINT_SIZE] == pt) | |
6581 non_scalable_has_exact_height_p = 1; | |
6582 else | |
6583 non_scalable_has_exact_height_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6584 |
24995 | 6585 for (i = 0; i < nfonts; ++i) |
6586 if (font_scalable_p (fonts + i)) | |
6587 { | |
6588 if (best == NULL | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6589 || better_font_p (specified, fonts + i, best, 0, 0) |
24995 | 6590 || (!non_scalable_has_exact_height_p |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6591 && !better_font_p (specified, best, fonts + i, 0, 0))) |
52200
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6592 { |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6593 non_scalable_has_exact_height_p = 1; |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6594 best = fonts + i; |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6595 } |
24995 | 6596 } |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6597 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6598 if (needs_overstrike) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6599 { |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6600 enum xlfd_weight want_weight = specified[XLFD_WEIGHT]; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6601 enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT]; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6602 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6603 if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6604 { |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6605 /* We want a bold font, but didn't get one; try to use |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6606 overstriking instead to simulate bold-face. However, |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6607 don't overstrike an already-bold fontn unless the |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6608 desired weight grossly exceeds the available weight. */ |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6609 if (got_weight > XLFD_WEIGHT_MEDIUM) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6610 *needs_overstrike = (got_weight - want_weight) > 2; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6611 else |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6612 *needs_overstrike = 1; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6613 } |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6614 } |
24995 | 6615 } |
6616 | |
6617 if (font_scalable_p (best)) | |
6618 font_name = build_scalable_font_name (f, best, pt); | |
6619 else | |
6620 font_name = build_font_name (best); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6621 |
24995 | 6622 /* Free font_name structures. */ |
6623 free_font_names (fonts, nfonts); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6624 |
24995 | 6625 return font_name; |
6626 } | |
6627 | |
6628 | |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6629 /* Get a list of matching fonts on frame F, considering FAMILY |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6630 and alternative font families from Vface_alternative_font_registry_alist. |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6631 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6632 FAMILY is the font family whose alternatives are considered. |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6633 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6634 REGISTRY, if a string, specifies a font registry and encoding to |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6635 match. A value of nil means include fonts of any registry and |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6636 encoding. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6637 |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6638 Return in *FONTS a pointer to a vector of font_name structures for |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6639 the fonts matched. Value is the number of fonts found. */ |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6640 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6641 static int |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6642 try_alternative_families (f, family, registry, fonts) |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6643 struct frame *f; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6644 Lisp_Object family, registry; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6645 struct font_name **fonts; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6646 { |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6647 Lisp_Object alter; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6648 int nfonts = 0; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6649 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6650 nfonts = font_list (f, Qnil, family, registry, fonts); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6651 if (nfonts == 0) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6652 { |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6653 /* Try alternative font families. */ |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6654 alter = Fassoc (family, Vface_alternative_font_family_alist); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6655 if (CONSP (alter)) |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6656 { |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6657 for (alter = XCDR (alter); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6658 CONSP (alter) && nfonts == 0; |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6659 alter = XCDR (alter)) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6660 { |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6661 if (STRINGP (XCAR (alter))) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6662 nfonts = font_list (f, Qnil, XCAR (alter), registry, fonts); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6663 } |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6664 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6665 |
49864
a2add8cdc33a
(try_alternative_families): Try all scalable fonts if
Kenichi Handa <handa@m17n.org>
parents:
49863
diff
changeset
|
6666 /* Try all scalable fonts before giving up. */ |
a2add8cdc33a
(try_alternative_families): Try all scalable fonts if
Kenichi Handa <handa@m17n.org>
parents:
49863
diff
changeset
|
6667 if (nfonts == 0 && ! EQ (Vscalable_fonts_allowed, Qt)) |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6668 { |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6669 int count = SPECPDL_INDEX (); |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6670 specbind (Qscalable_fonts_allowed, Qt); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6671 nfonts = try_alternative_families (f, family, registry, fonts); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6672 unbind_to (count, Qnil); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6673 } |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6674 } |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6675 return nfonts; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6676 } |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6677 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6678 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6679 /* Get a list of matching fonts on frame F. |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6680 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6681 FAMILY, if a string, specifies a font family derived from the fontset. |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6682 It is only used if the face does not specify any family in ATTRS or |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6683 if we cannot find any font of the face's family. |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6684 |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6685 REGISTRY, if a string, specifies a font registry and encoding to |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6686 match. A value of nil means include fonts of any registry and |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6687 encoding. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6688 |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6689 If PREFER_FACE_FAMILY is nonzero, perfer face's family to FAMILY. |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6690 Otherwise, prefer FAMILY. |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6691 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6692 Return in *FONTS a pointer to a vector of font_name structures for |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6693 the fonts matched. Value is the number of fonts found. */ |
24995 | 6694 |
6695 static int | |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6696 try_font_list (f, attrs, family, registry, fonts, prefer_face_family) |
24995 | 6697 struct frame *f; |
6698 Lisp_Object *attrs; | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6699 Lisp_Object family, registry; |
24995 | 6700 struct font_name **fonts; |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6701 int prefer_face_family; |
24995 | 6702 { |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6703 int nfonts = 0; |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6704 Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX]; |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6705 Lisp_Object try_family; |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6706 |
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6707 try_family = (prefer_face_family || NILP (family)) ? face_family : family; |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6708 |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6709 if (STRINGP (try_family)) |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6710 nfonts = try_alternative_families (f, try_family, registry, fonts); |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6711 |
45848 | 6712 #ifdef MAC_OS |
6713 /* When realizing the default face and a font spec does not matched | |
6714 exactly, Emacs looks for ones with the same registry as the | |
6715 default font. On the Mac, this is mac-roman, which does not work | |
6716 if the family is -etl-fixed, e.g. The following widens the | |
6717 choices and fixes that problem. */ | |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6718 if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6719 && xstricmp (SDATA (registry), "mac-roman") == 0) |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6720 nfonts = try_alternative_families (f, try_family, Qnil, fonts); |
45848 | 6721 #endif |
6722 | |
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6723 if (EQ (try_family, family)) |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6724 family = face_family; |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6725 |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6726 if (nfonts == 0 && STRINGP (family)) |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6727 nfonts = try_alternative_families (f, family, registry, fonts); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6728 |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6729 /* Try font family of the default face or "fixed". */ |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6730 if (nfonts == 0) |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6731 { |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6732 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6733 if (default_face) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6734 family = default_face->lface[LFACE_FAMILY_INDEX]; |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6735 else |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6736 family = build_string ("fixed"); |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6737 nfonts = font_list (f, Qnil, family, registry, fonts); |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6738 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6739 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6740 /* Try any family with the given registry. */ |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6741 if (nfonts == 0) |
52203
0941be5b523e
(try_font_list): Call try_alternative_families to try any family
Kenichi Handa <handa@m17n.org>
parents:
52200
diff
changeset
|
6742 nfonts = try_alternative_families (f, Qnil, registry, fonts); |
24995 | 6743 |
6744 return nfonts; | |
6745 } | |
6746 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6747 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6748 /* Return the fontset id of the base fontset name or alias name given |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6749 by the fontset attribute of ATTRS. Value is -1 if the fontset |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6750 attribute of ATTRS doesn't name a fontset. */ |
24995 | 6751 |
6752 static int | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6753 face_fontset (attrs) |
24995 | 6754 Lisp_Object *attrs; |
6755 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6756 Lisp_Object name; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6757 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6758 name = attrs[LFACE_FONT_INDEX]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6759 if (!STRINGP (name)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6760 return -1; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6761 return fs_query_fontset (name, 0); |
24995 | 6762 } |
6763 | |
6764 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6765 /* Choose a name of font to use on frame F to display character C with |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6766 Lisp face attributes specified by ATTRS. The font name is |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6767 determined by the font-related attributes in ATTRS and the name |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6768 pattern for C in FONTSET. Value is the font name which is |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6769 allocated from the heap and must be freed by the caller, or NULL if |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6770 we can get no information about the font name of C. It is assured |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6771 that we always get some information for a single byte |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6772 character. |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6773 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6774 If NEEDS_OVERSTRIKE is non-zero, a boolean is returned in it to |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6775 indicate whether the resulting font should be drawn using overstrike |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6776 to simulate bold-face. */ |
24995 | 6777 |
6778 static char * | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6779 choose_face_font (f, attrs, fontset, c, needs_overstrike) |
24995 | 6780 struct frame *f; |
6781 Lisp_Object *attrs; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6782 int fontset, c; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6783 int *needs_overstrike; |
24995 | 6784 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6785 Lisp_Object pattern; |
24995 | 6786 char *font_name = NULL; |
6787 struct font_name *fonts; | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6788 int nfonts, width_ratio; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6789 |
50412
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6790 if (needs_overstrike) |
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6791 *needs_overstrike = 0; |
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6792 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6793 /* Get (foundry and) family name and registry (and encoding) name of |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6794 a font for C. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6795 pattern = fontset_font_pattern (f, fontset, c); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6796 if (NILP (pattern)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6797 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6798 xassert (!SINGLE_BYTE_CHAR_P (c)); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6799 return NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6800 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6801 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6802 /* If what we got is a name pattern, return it. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6803 if (STRINGP (pattern)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6804 return xstrdup (SDATA (pattern)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6805 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6806 /* Get a list of fonts matching that pattern and choose the |
24995 | 6807 best match for the specified face attributes from it. */ |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6808 nfonts = try_font_list (f, attrs, XCAR (pattern), XCDR (pattern), &fonts, |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6809 (SINGLE_BYTE_CHAR_P (c) |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6810 || CHAR_CHARSET (c) == charset_latin_iso8859_1)); |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6811 width_ratio = (SINGLE_BYTE_CHAR_P (c) |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6812 ? 1 |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6813 : CHARSET_WIDTH (CHAR_CHARSET (c))); |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6814 font_name = best_matching_font (f, attrs, fonts, nfonts, width_ratio, |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6815 needs_overstrike); |
24995 | 6816 return font_name; |
6817 } | |
6818 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6819 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 6820 |
6821 | |
6822 | |
6823 /*********************************************************************** | |
6824 Face Realization | |
6825 ***********************************************************************/ | |
6826 | |
6827 /* Realize basic faces on frame F. Value is zero if frame parameters | |
6828 of F don't contain enough information needed to realize the default | |
6829 face. */ | |
6830 | |
6831 static int | |
6832 realize_basic_faces (f) | |
2342 | 6833 struct frame *f; |
24995 | 6834 { |
6835 int success_p = 0; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6836 int count = SPECPDL_INDEX (); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6837 |
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
6838 /* Block input here so that we won't be surprised by an X expose |
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
6839 event, for instance, without having the faces set up. */ |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6840 BLOCK_INPUT; |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6841 specbind (Qscalable_fonts_allowed, Qt); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6842 |
24995 | 6843 if (realize_default_face (f)) |
6844 { | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6845 realize_named_face (f, Qmode_line, MODE_LINE_FACE_ID); |
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6846 realize_named_face (f, Qmode_line_inactive, MODE_LINE_INACTIVE_FACE_ID); |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6847 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
41129 | 6848 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
25546 | 6849 realize_named_face (f, Qheader_line, HEADER_LINE_FACE_ID); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6850 realize_named_face (f, Qscroll_bar, SCROLL_BAR_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6851 realize_named_face (f, Qborder, BORDER_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6852 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6853 realize_named_face (f, Qmouse, MOUSE_FACE_ID); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6854 realize_named_face (f, Qmenu, MENU_FACE_ID); |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6855 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
6856 /* Reflect changes in the `menu' face in menu bars. */ |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
6857 if (FRAME_FACE_CACHE (f)->menu_face_changed_p) |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6858 { |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
6859 FRAME_FACE_CACHE (f)->menu_face_changed_p = 0; |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6860 #ifdef USE_X_TOOLKIT |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82984
diff
changeset
|
6861 if (FRAME_WINDOW_P (f)) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82984
diff
changeset
|
6862 x_update_menu_appearance (f); |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
6863 #endif |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6864 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6865 |
24995 | 6866 success_p = 1; |
6867 } | |
6868 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6869 unbind_to (count, Qnil); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6870 UNBLOCK_INPUT; |
24995 | 6871 return success_p; |
6872 } | |
6873 | |
6874 | |
6875 /* Realize the default face on frame F. If the face is not fully | |
6876 specified, make it fully-specified. Attributes of the default face | |
6877 that are not explicitly specified are taken from frame parameters. */ | |
6878 | |
6879 static int | |
6880 realize_default_face (f) | |
6881 struct frame *f; | |
6882 { | |
6883 struct face_cache *c = FRAME_FACE_CACHE (f); | |
6884 Lisp_Object lface; | |
6885 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6886 Lisp_Object frame_font; | |
6887 struct face *face; | |
6888 | |
6889 /* If the `default' face is not yet known, create it. */ | |
6890 lface = lface_from_face_name (f, Qdefault, 0); | |
6891 if (NILP (lface)) | |
51315
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6892 { |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6893 Lisp_Object frame; |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6894 XSETFRAME (frame, f); |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6895 lface = Finternal_make_lisp_face (Qdefault, frame); |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6896 } |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6897 |
24995 | 6898 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6899 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6900 if (FRAME_WINDOW_P (f)) |
24995 | 6901 { |
6902 /* Set frame_font to the value of the `font' frame parameter. */ | |
6903 frame_font = Fassq (Qfont, f->param_alist); | |
6904 xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font))); | |
6905 frame_font = XCDR (frame_font); | |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6906 set_lface_from_font_name (f, lface, frame_font, |
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6907 f->default_face_done_p, 1); |
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
6908 f->default_face_done_p = 1; |
24995 | 6909 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6910 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 6911 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6912 if (!FRAME_WINDOW_P (f)) |
24995 | 6913 { |
6914 LFACE_FAMILY (lface) = build_string ("default"); | |
6915 LFACE_SWIDTH (lface) = Qnormal; | |
6916 LFACE_HEIGHT (lface) = make_number (1); | |
43069
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6917 if (UNSPECIFIEDP (LFACE_WEIGHT (lface))) |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6918 LFACE_WEIGHT (lface) = Qnormal; |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6919 if (UNSPECIFIEDP (LFACE_SLANT (lface))) |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6920 LFACE_SLANT (lface) = Qnormal; |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6921 LFACE_AVGWIDTH (lface) = Qunspecified; |
24995 | 6922 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6923 |
24995 | 6924 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
6925 LFACE_UNDERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6926 |
24995 | 6927 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
6928 LFACE_OVERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6929 |
24995 | 6930 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
6931 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6932 |
24995 | 6933 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
6934 LFACE_BOX (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6935 |
24995 | 6936 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
6937 LFACE_INVERSE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6938 |
24995 | 6939 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
6940 { | |
6941 /* This function is called so early that colors are not yet | |
6942 set in the frame parameter list. */ | |
6943 Lisp_Object color = Fassq (Qforeground_color, f->param_alist); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6944 |
24995 | 6945 if (CONSP (color) && STRINGP (XCDR (color))) |
6946 LFACE_FOREGROUND (lface) = XCDR (color); | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6947 else if (FRAME_WINDOW_P (f)) |
24995 | 6948 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6949 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6950 LFACE_FOREGROUND (lface) = build_string (unspecified_fg); |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
6951 else |
24995 | 6952 abort (); |
6953 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6954 |
24995 | 6955 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
6956 { | |
6957 /* This function is called so early that colors are not yet | |
6958 set in the frame parameter list. */ | |
6959 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
6960 if (CONSP (color) && STRINGP (XCDR (color))) | |
6961 LFACE_BACKGROUND (lface) = XCDR (color); | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6962 else if (FRAME_WINDOW_P (f)) |
24995 | 6963 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6964 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6965 LFACE_BACKGROUND (lface) = build_string (unspecified_bg); |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
6966 else |
24995 | 6967 abort (); |
6968 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6969 |
24995 | 6970 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
6971 LFACE_STIPPLE (lface) = Qnil; | |
6972 | |
6973 /* Realize the face; it must be fully-specified now. */ | |
6974 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
6975 check_lface (lface); | |
6976 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6977 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); |
24995 | 6978 return 1; |
6979 } | |
6980 | |
6981 | |
6982 /* Realize basic faces other than the default face in face cache C. | |
6983 SYMBOL is the face name, ID is the face id the realized face must | |
6984 have. The default face must have been realized already. */ | |
6985 | |
6986 static void | |
6987 realize_named_face (f, symbol, id) | |
6988 struct frame *f; | |
6989 Lisp_Object symbol; | |
6990 int id; | |
6991 { | |
6992 struct face_cache *c = FRAME_FACE_CACHE (f); | |
6993 Lisp_Object lface = lface_from_face_name (f, symbol, 0); | |
6994 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6995 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
6996 struct face *new_face; | |
6997 | |
6998 /* The default face must exist and be fully specified. */ | |
6999 get_lface_attributes (f, Qdefault, attrs, 1); | |
7000 check_lface_attrs (attrs); | |
7001 xassert (lface_fully_specified_p (attrs)); | |
7002 | |
7003 /* If SYMBOL isn't know as a face, create it. */ | |
7004 if (NILP (lface)) | |
7005 { | |
7006 Lisp_Object frame; | |
7007 XSETFRAME (frame, f); | |
7008 lface = Finternal_make_lisp_face (symbol, frame); | |
7009 } | |
7010 | |
7011 /* Merge SYMBOL's face with the default face. */ | |
7012 get_lface_attributes (f, symbol, symbol_attrs, 1); | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7013 merge_face_vectors (f, symbol_attrs, attrs, 0); |
24995 | 7014 |
7015 /* Realize the face. */ | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7016 new_face = realize_face (c, attrs, 0, NULL, id); |
24995 | 7017 } |
7018 | |
7019 | |
7020 /* Realize the fully-specified face with attributes ATTRS in face | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7021 cache CACHE for character C. If C is a multibyte character, |
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7022 BASE_FACE is a face that has the same attributes. Otherwise, |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7023 BASE_FACE is ignored. If FORMER_FACE_ID is non-negative, it is an |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7024 ID of face to remove before caching the new face. Value is a |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7025 pointer to the newly created realized face. */ |
24995 | 7026 |
7027 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7028 realize_face (cache, attrs, c, base_face, former_face_id) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7029 struct face_cache *cache; |
24995 | 7030 Lisp_Object *attrs; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7031 int c; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7032 struct face *base_face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7033 int former_face_id; |
24995 | 7034 { |
7035 struct face *face; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7036 |
24995 | 7037 /* LFACE must be fully specified. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7038 xassert (cache != NULL); |
24995 | 7039 check_lface_attrs (attrs); |
7040 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7041 if (former_face_id >= 0 && cache->used > former_face_id) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7042 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7043 /* Remove the former face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7044 struct face *former_face = cache->faces_by_id[former_face_id]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7045 uncache_face (cache, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7046 free_realized_face (cache->f, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7047 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7048 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7049 if (FRAME_WINDOW_P (cache->f)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7050 face = realize_x_face (cache, attrs, c, base_face); |
35443 | 7051 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7052 face = realize_tty_face (cache, attrs, c); |
83021
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
7053 else if (FRAME_INITIAL_P (cache->f)) |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
7054 { |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
7055 /* Create a dummy face. */ |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
7056 face = make_realized_face (attrs); |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
7057 } |
24995 | 7058 else |
7059 abort (); | |
7060 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7061 /* Insert the new face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7062 cache_face (cache, face, lface_hash (attrs)); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7063 #ifdef HAVE_WINDOW_SYSTEM |
28544
b42146066357
(realize_face): Change FRAME_X_P to FRAME_WINDOW_P.
Jason Rumney <jasonr@gnu.org>
parents:
28529
diff
changeset
|
7064 if (FRAME_WINDOW_P (cache->f) && face->font == NULL) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7065 load_face_font (cache->f, face, c); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7066 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 7067 return face; |
7068 } | |
7069 | |
7070 | |
7071 /* Realize the fully-specified face with attributes ATTRS in face | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7072 cache CACHE for character C. Do it for X frame CACHE->f. If C is |
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7073 a multibyte character, BASE_FACE is a face that has the same |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7074 attributes. Otherwise, BASE_FACE is ignored. If the new face |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7075 doesn't share font with the default face, a fontname is allocated |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7076 from the heap and set in `font_name' of the new face, but it is not |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7077 yet loaded here. Value is a pointer to the newly created realized |
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7078 face. */ |
24995 | 7079 |
7080 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7081 realize_x_face (cache, attrs, c, base_face) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7082 struct face_cache *cache; |
24995 | 7083 Lisp_Object *attrs; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7084 int c; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7085 struct face *base_face; |
24995 | 7086 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7087 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 7088 struct face *face, *default_face; |
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
7089 struct frame *f; |
24995 | 7090 Lisp_Object stipple, overline, strike_through, box; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7091 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7092 xassert (FRAME_WINDOW_P (cache->f)); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7093 xassert (SINGLE_BYTE_CHAR_P (c) |
28753
582ba7ff96f7
(realize_x_face): Fix the argument of the second
Kenichi Handa <handa@m17n.org>
parents:
28620
diff
changeset
|
7094 || base_face); |
24995 | 7095 |
7096 /* Allocate a new realized face. */ | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7097 face = make_realized_face (attrs); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7098 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7099 f = cache->f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7100 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7101 /* If C is a multibyte character, we share all face attirbutes with |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7102 BASE_FACE including the realized fontset. But, we must load a |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7103 different font. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7104 if (!SINGLE_BYTE_CHAR_P (c)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7105 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7106 bcopy (base_face, face, sizeof *face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7107 face->gc = 0; |
29394
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7108 |
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7109 /* Don't try to free the colors copied bitwise from BASE_FACE. */ |
40555
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
7110 face->colors_copied_bitwise_p = 1; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7111 |
29394
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7112 /* to force realize_face to load font */ |
84489c72fb8e
(realize_x_face): When copying BASE_FACE bitwise to the
Gerd Moellmann <gerd@gnu.org>
parents:
29284
diff
changeset
|
7113 face->font = NULL; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7114 return face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7115 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7116 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7117 /* Now we are realizing a face for ASCII (and unibyte) characters. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7118 |
24995 | 7119 /* Determine the font to use. Most of the time, the font will be |
7120 the same as the font of the default face, so try that first. */ | |
7121 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
7122 if (default_face | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7123 && FACE_SUITABLE_FOR_CHAR_P (default_face, c) |
24995 | 7124 && lface_same_font_attributes_p (default_face->lface, attrs)) |
7125 { | |
7126 face->font = default_face->font; | |
7127 face->fontset = default_face->fontset; | |
7128 face->font_info_id = default_face->font_info_id; | |
7129 face->font_name = default_face->font_name; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7130 face->ascii_face = face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7131 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7132 /* But, as we can't share the fontset, make a new realized |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7133 fontset that has the same base fontset as of the default |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7134 face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7135 face->fontset |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7136 = make_fontset_for_ascii_face (f, default_face->fontset); |
24995 | 7137 } |
7138 else | |
7139 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7140 /* If the face attribute ATTRS specifies a fontset, use it as |
30211
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7141 the base of a new realized fontset. Otherwise, use the same |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7142 base fontset as of the default face. The base determines |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7143 registry and encoding of a font. It may also determine |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7144 foundry and family. The other fields of font name pattern |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7145 are constructed from ATTRS. */ |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7146 int fontset = face_fontset (attrs); |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7147 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7148 if ((fontset == -1) && default_face) |
30211
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7149 fontset = default_face->fontset; |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
7150 face->fontset = make_fontset_for_ascii_face (f, fontset); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7151 face->font = NULL; /* to force realize_face to load font */ |
24995 | 7152 } |
7153 | |
7154 /* Load colors, and set remaining attributes. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7155 |
24995 | 7156 load_face_colors (f, face, attrs); |
7157 | |
7158 /* Set up box. */ | |
7159 box = attrs[LFACE_BOX_INDEX]; | |
7160 if (STRINGP (box)) | |
7161 { | |
7162 /* A simple box of line width 1 drawn in color given by | |
7163 the string. */ | |
7164 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
7165 LFACE_BOX_INDEX); | |
7166 face->box = FACE_SIMPLE_BOX; | |
7167 face->box_line_width = 1; | |
7168 } | |
7169 else if (INTEGERP (box)) | |
7170 { | |
7171 /* Simple box of specified line width in foreground color of the | |
7172 face. */ | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7173 xassert (XINT (box) != 0); |
24995 | 7174 face->box = FACE_SIMPLE_BOX; |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7175 face->box_line_width = XINT (box); |
24995 | 7176 face->box_color = face->foreground; |
7177 face->box_color_defaulted_p = 1; | |
7178 } | |
7179 else if (CONSP (box)) | |
7180 { | |
7181 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
7182 being one of `raised' or `sunken'. */ | |
7183 face->box = FACE_SIMPLE_BOX; | |
7184 face->box_color = face->foreground; | |
7185 face->box_color_defaulted_p = 1; | |
7186 face->box_line_width = 1; | |
7187 | |
7188 while (CONSP (box)) | |
7189 { | |
7190 Lisp_Object keyword, value; | |
7191 | |
7192 keyword = XCAR (box); | |
7193 box = XCDR (box); | |
7194 | |
7195 if (!CONSP (box)) | |
7196 break; | |
7197 value = XCAR (box); | |
7198 box = XCDR (box); | |
7199 | |
7200 if (EQ (keyword, QCline_width)) | |
7201 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7202 if (INTEGERP (value) && XINT (value) != 0) |
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
7203 face->box_line_width = XINT (value); |
24995 | 7204 } |
7205 else if (EQ (keyword, QCcolor)) | |
7206 { | |
7207 if (STRINGP (value)) | |
7208 { | |
7209 face->box_color = load_color (f, face, value, | |
7210 LFACE_BOX_INDEX); | |
7211 face->use_box_color_for_shadows_p = 1; | |
7212 } | |
7213 } | |
7214 else if (EQ (keyword, QCstyle)) | |
7215 { | |
7216 if (EQ (value, Qreleased_button)) | |
7217 face->box = FACE_RAISED_BOX; | |
7218 else if (EQ (value, Qpressed_button)) | |
7219 face->box = FACE_SUNKEN_BOX; | |
7220 } | |
7221 } | |
7222 } | |
7223 | |
7224 /* Text underline, overline, strike-through. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7225 |
24995 | 7226 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7227 { |
24995 | 7228 /* Use default color (same as foreground color). */ |
7229 face->underline_p = 1; | |
7230 face->underline_defaulted_p = 1; | |
7231 face->underline_color = 0; | |
7232 } | |
7233 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
7234 { | |
7235 /* Use specified color. */ | |
7236 face->underline_p = 1; | |
7237 face->underline_defaulted_p = 0; | |
7238 face->underline_color | |
7239 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
7240 LFACE_UNDERLINE_INDEX); | |
7241 } | |
7242 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
7243 { | |
7244 face->underline_p = 0; | |
7245 face->underline_defaulted_p = 0; | |
7246 face->underline_color = 0; | |
7247 } | |
7248 | |
7249 overline = attrs[LFACE_OVERLINE_INDEX]; | |
7250 if (STRINGP (overline)) | |
7251 { | |
7252 face->overline_color | |
7253 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
7254 LFACE_OVERLINE_INDEX); | |
7255 face->overline_p = 1; | |
7256 } | |
7257 else if (EQ (overline, Qt)) | |
7258 { | |
7259 face->overline_color = face->foreground; | |
7260 face->overline_color_defaulted_p = 1; | |
7261 face->overline_p = 1; | |
7262 } | |
7263 | |
7264 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
7265 if (STRINGP (strike_through)) | |
7266 { | |
7267 face->strike_through_color | |
7268 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
7269 LFACE_STRIKE_THROUGH_INDEX); | |
7270 face->strike_through_p = 1; | |
7271 } | |
7272 else if (EQ (strike_through, Qt)) | |
7273 { | |
7274 face->strike_through_color = face->foreground; | |
7275 face->strike_through_color_defaulted_p = 1; | |
7276 face->strike_through_p = 1; | |
7277 } | |
7278 | |
7279 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
7280 if (!NILP (stipple)) | |
7281 face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h); | |
7282 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7283 xassert (FACE_SUITABLE_FOR_CHAR_P (face, c)); |
24995 | 7284 return face; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7285 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 7286 } |
7287 | |
7288 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7289 /* Map a specified color of face FACE on frame F to a tty color index. |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7290 IDX is either LFACE_FOREGROUND_INDEX or LFACE_BACKGROUND_INDEX, and |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7291 specifies which color to map. Set *DEFAULTED to 1 if mapping to the |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7292 default foreground/background colors. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7293 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7294 static void |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7295 map_tty_color (f, face, idx, defaulted) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7296 struct frame *f; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7297 struct face *face; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7298 enum lface_attribute_index idx; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7299 int *defaulted; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7300 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7301 Lisp_Object frame, color, def; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7302 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7303 unsigned long default_pixel, default_other_pixel, pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7304 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7305 xassert (idx == LFACE_FOREGROUND_INDEX || idx == LFACE_BACKGROUND_INDEX); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7306 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7307 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7308 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7309 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7310 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7311 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7312 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7313 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7314 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7315 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7316 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
7317 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7318 XSETFRAME (frame, f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7319 color = face->lface[idx]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
7320 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7321 if (STRINGP (color) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7322 && SCHARS (color) |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7323 && CONSP (Vtty_defined_color_alist) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7324 && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)), |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7325 CONSP (def))) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7326 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7327 /* Associations in tty-defined-color-alist are of the form |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7328 (NAME INDEX R G B). We need the INDEX part. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7329 pixel = XINT (XCAR (XCDR (def))); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7330 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7331 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7332 if (pixel == default_pixel && STRINGP (color)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7333 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7334 pixel = load_color (f, face, color, idx); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7335 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7336 #if defined (MSDOS) || defined (WINDOWSNT) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7337 /* If the foreground of the default face is the default color, |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7338 use the foreground color defined by the frame. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7339 #ifdef MSDOS |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7340 if (FRAME_MSDOS_P (f)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7341 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7342 #endif /* MSDOS */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7343 if (pixel == default_pixel |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7344 || pixel == FACE_TTY_DEFAULT_COLOR) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7345 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7346 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7347 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7348 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7349 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7350 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7351 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7352 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7353 else if (pixel == default_other_pixel) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7354 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7355 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7356 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7357 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7358 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7359 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7360 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7361 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7362 #ifdef MSDOS |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7363 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7364 #endif |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7365 #endif /* MSDOS or WINDOWSNT */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7366 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7367 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7368 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7369 face->foreground = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7370 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7371 face->background = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7372 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7373 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7374 |
24995 | 7375 /* Realize the fully-specified face with attributes ATTRS in face |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7376 cache CACHE for character C. Do it for TTY frame CACHE->f. Value is a |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7377 pointer to the newly created realized face. */ |
24995 | 7378 |
7379 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7380 realize_tty_face (cache, attrs, c) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7381 struct face_cache *cache; |
24995 | 7382 Lisp_Object *attrs; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7383 int c; |
24995 | 7384 { |
7385 struct face *face; | |
7386 int weight, slant; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7387 int face_colors_defaulted = 0; |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7388 struct frame *f = cache->f; |
24995 | 7389 |
7390 /* Frame must be a termcap frame. */ | |
35443 | 7391 xassert (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7392 |
24995 | 7393 /* Allocate a new realized face. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7394 face = make_realized_face (attrs); |
35443 | 7395 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty"; |
24995 | 7396 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7397 /* Map face attributes to TTY appearances. We map slant to |
24995 | 7398 dimmed text because we want italic text to appear differently |
7399 and because dimmed text is probably used infrequently. */ | |
7400 weight = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); | |
7401 slant = face_numeric_slant (attrs[LFACE_SLANT_INDEX]); | |
7402 | |
7403 if (weight > XLFD_WEIGHT_MEDIUM) | |
7404 face->tty_bold_p = 1; | |
7405 if (weight < XLFD_WEIGHT_MEDIUM || slant != XLFD_SLANT_ROMAN) | |
7406 face->tty_dim_p = 1; | |
7407 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
7408 face->tty_underline_p = 1; | |
7409 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
7410 face->tty_reverse_p = 1; | |
7411 | |
7412 /* Map color names to color indices. */ | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7413 map_tty_color (f, face, LFACE_FOREGROUND_INDEX, &face_colors_defaulted); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7414 map_tty_color (f, face, LFACE_BACKGROUND_INDEX, &face_colors_defaulted); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
7415 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7416 /* Swap colors if face is inverse-video. If the colors are taken |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7417 from the frame colors, they are already inverted, since the |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7418 frame-creation function calls x-handle-reverse-video. */ |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7419 if (face->tty_reverse_p && !face_colors_defaulted) |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7420 { |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7421 unsigned long tem = face->foreground; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7422 face->foreground = face->background; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7423 face->background = tem; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7424 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
7425 |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7426 if (tty_suppress_bold_inverse_default_colors_p |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7427 && face->tty_bold_p |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7428 && face->background == FACE_TTY_DEFAULT_FG_COLOR |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7429 && face->foreground == FACE_TTY_DEFAULT_BG_COLOR) |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7430 face->tty_bold_p = 0; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7431 |
24995 | 7432 return face; |
7433 } | |
7434 | |
7435 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7436 DEFUN ("tty-suppress-bold-inverse-default-colors", |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7437 Ftty_suppress_bold_inverse_default_colors, |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7438 Stty_suppress_bold_inverse_default_colors, 1, 1, 0, |
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
7439 doc: /* Suppress/allow boldness of faces with inverse default colors. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7440 SUPPRESS non-nil means suppress it. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7441 This affects bold faces on TTYs whose foreground is the default background |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7442 color of the display and whose background is the default foreground color. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7443 For such faces, the bold face attribute is ignored if this variable |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7444 is non-nil. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7445 (suppress) |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7446 Lisp_Object suppress; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7447 { |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7448 tty_suppress_bold_inverse_default_colors_p = !NILP (suppress); |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7449 ++face_change_count; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7450 return suppress; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7451 } |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7452 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
7453 |
24995 | 7454 |
7455 /*********************************************************************** | |
7456 Computing Faces | |
7457 ***********************************************************************/ | |
7458 | |
7459 /* Return the ID of the face to use to display character CH with face | |
7460 property PROP on frame F in current_buffer. */ | |
7461 | |
7462 int | |
7463 compute_char_face (f, ch, prop) | |
7464 struct frame *f; | |
7465 int ch; | |
7466 Lisp_Object prop; | |
7467 { | |
7468 int face_id; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7469 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7470 if (NILP (current_buffer->enable_multibyte_characters)) |
37433
94967574484c
(compute_char_face): If buffer is unibyte, set CH to
Gerd Moellmann <gerd@gnu.org>
parents:
37394
diff
changeset
|
7471 ch = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7472 |
24995 | 7473 if (NILP (prop)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7474 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7475 struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7476 face_id = FACE_FOR_CHAR (f, face, ch); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7477 } |
24995 | 7478 else |
7479 { | |
7480 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
7481 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
7482 bcopy (default_face->lface, attrs, sizeof attrs); | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7483 merge_face_ref (f, prop, attrs, 1, 0); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7484 face_id = lookup_face (f, attrs, ch, NULL); |
24995 | 7485 } |
7486 | |
7487 return face_id; | |
7488 } | |
7489 | |
7490 /* Return the face ID associated with buffer position POS for | |
7491 displaying ASCII characters. Return in *ENDPTR the position at | |
7492 which a different face is needed, as far as text properties and | |
7493 overlays are concerned. W is a window displaying current_buffer. | |
7494 | |
7495 REGION_BEG, REGION_END delimit the region, so it can be | |
7496 highlighted. | |
7497 | |
7498 LIMIT is a position not to scan beyond. That is to limit the time | |
7499 this function can take. | |
7500 | |
7501 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
7502 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7503 The face returned is suitable for displaying ASCII characters. */ |
24995 | 7504 |
7505 int | |
7506 face_at_buffer_position (w, pos, region_beg, region_end, | |
7507 endptr, limit, mouse) | |
2391 | 7508 struct window *w; |
2342 | 7509 int pos; |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7510 int region_beg, region_end; |
2342 | 7511 int *endptr; |
5084
863e092a5891
(compute_char_face): Accept new arg LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
7512 int limit; |
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
7513 int mouse; |
2342 | 7514 { |
24995 | 7515 struct frame *f = XFRAME (w->frame); |
7516 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7517 Lisp_Object prop, position; |
24995 | 7518 int i, noverlays; |
2342 | 7519 Lisp_Object *overlay_vec; |
2391 | 7520 Lisp_Object frame; |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7521 int endpos; |
24995 | 7522 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
7523 Lisp_Object limit1, end; | |
7524 struct face *default_face; | |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7525 |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7526 /* W must display the current buffer. We could write this function |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7527 to use the frame and buffer of W, but right now it doesn't. */ |
25359
14135aa647e2
(face_at_buffer_position): Don't xassert that
Gerd Moellmann <gerd@gnu.org>
parents:
25301
diff
changeset
|
7528 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
2391 | 7529 |
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
7530 XSETFRAME (frame, f); |
24995 | 7531 XSETFASTINT (position, pos); |
2342 | 7532 |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7533 endpos = ZV; |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7534 if (pos < region_beg && region_beg < endpos) |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7535 endpos = region_beg; |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7536 |
24995 | 7537 /* Get the `face' or `mouse_face' text property at POS, and |
7538 determine the next position at which the property changes. */ | |
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
7539 prop = Fget_text_property (position, propname, w->buffer); |
24995 | 7540 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
7541 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
7542 if (INTEGERP (end)) | |
7543 endpos = XINT (end); | |
7544 | |
7545 /* Look at properties from overlays. */ | |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7546 { |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7547 int next_overlay; |
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
7548 |
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
7549 GET_OVERLAYS_AT (pos, overlay_vec, noverlays, &next_overlay, 0); |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7550 if (next_overlay < endpos) |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
7551 endpos = next_overlay; |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7552 } |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7553 |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
7554 *endptr = endpos; |
2342 | 7555 |
24995 | 7556 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7557 |
24995 | 7558 /* Optimize common cases where we can use the default face. */ |
7559 if (noverlays == 0 | |
7560 && NILP (prop) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7561 && !(pos >= region_beg && pos < region_end)) |
24995 | 7562 return DEFAULT_FACE_ID; |
7563 | |
7564 /* Begin with attributes from the default face. */ | |
7565 bcopy (default_face->lface, attrs, sizeof attrs); | |
7566 | |
7567 /* Merge in attributes specified via text properties. */ | |
7568 if (!NILP (prop)) | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7569 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 7570 |
7571 /* Now merge the overlay data. */ | |
5858
021e58905963
(compute_char_face): Extract overlay-sorting code as a separate function,
Karl Heuer <kwzh@gnu.org>
parents:
5801
diff
changeset
|
7572 noverlays = sort_overlays (overlay_vec, noverlays, w); |
2342 | 7573 for (i = 0; i < noverlays; i++) |
7574 { | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7575 Lisp_Object oend; |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7576 int oendpos; |
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
7577 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7578 prop = Foverlay_get (overlay_vec[i], propname); |
24995 | 7579 if (!NILP (prop)) |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7580 merge_face_ref (f, prop, attrs, 1, 0); |
2342 | 7581 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7582 oend = OVERLAY_END (overlay_vec[i]); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7583 oendpos = OVERLAY_POSITION (oend); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7584 if (oendpos < endpos) |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7585 endpos = oendpos; |
2342 | 7586 } |
7587 | |
24995 | 7588 /* If in the region, merge in the region face. */ |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7589 if (pos >= region_beg && pos < region_end) |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7590 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7591 merge_named_face (f, Qregion, attrs, 0); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7592 |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7593 if (region_end < endpos) |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7594 endpos = region_end; |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7595 } |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
7596 |
2342 | 7597 *endptr = endpos; |
7598 | |
24995 | 7599 /* Look up a realized face with the given face attributes, |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7600 or realize a new one for ASCII characters. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7601 return lookup_face (f, attrs, 0, NULL); |
2342 | 7602 } |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7603 |
24995 | 7604 |
7605 /* Compute the face at character position POS in Lisp string STRING on | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7606 window W, for ASCII characters. |
24995 | 7607 |
7608 If STRING is an overlay string, it comes from position BUFPOS in | |
7609 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
7610 not an overlay string. W must display the current buffer. | |
7611 REGION_BEG and REGION_END give the start and end positions of the | |
34289
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
7612 region; both are -1 if no region is visible. |
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
7613 |
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
7614 BASE_FACE_ID is the id of a face to merge with. For strings coming |
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
7615 from overlays or the `display' property it is the face at BUFPOS. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7616 |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7617 If MOUSE_P is non-zero, use the character's mouse-face, not its face. |
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7618 |
24995 | 7619 Set *ENDPTR to the next position where to check for faces in |
7620 STRING; -1 if the face is constant from POS to the end of the | |
7621 string. | |
7622 | |
7623 Value is the id of the face to use. The face returned is suitable | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7624 for displaying ASCII characters. */ |
24995 | 7625 |
7626 int | |
7627 face_at_string_position (w, string, pos, bufpos, region_beg, | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7628 region_end, endptr, base_face_id, mouse_p) |
24995 | 7629 struct window *w; |
7630 Lisp_Object string; | |
7631 int pos, bufpos; | |
7632 int region_beg, region_end; | |
7633 int *endptr; | |
7634 enum face_id base_face_id; | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7635 int mouse_p; |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7636 { |
24995 | 7637 Lisp_Object prop, position, end, limit; |
7638 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
7639 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
7640 struct face *base_face; | |
7641 int multibyte_p = STRING_MULTIBYTE (string); | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7642 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
24995 | 7643 |
7644 /* Get the value of the face property at the current position within | |
7645 STRING. Value is nil if there is no face property. */ | |
7646 XSETFASTINT (position, pos); | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7647 prop = Fget_text_property (position, prop_name, string); |
24995 | 7648 |
7649 /* Get the next position at which to check for faces. Value of end | |
7650 is nil if face is constant all the way to the end of the string. | |
7651 Otherwise it is a string position where to check faces next. | |
7652 Limit is the maximum position up to which to check for property | |
7653 changes in Fnext_single_property_change. Strings are usually | |
7654 short, so set the limit to the end of the string. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7655 XSETFASTINT (limit, SCHARS (string)); |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
7656 end = Fnext_single_property_change (position, prop_name, string, limit); |
24995 | 7657 if (INTEGERP (end)) |
7658 *endptr = XFASTINT (end); | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
7659 else |
24995 | 7660 *endptr = -1; |
7661 | |
7662 base_face = FACE_FROM_ID (f, base_face_id); | |
7663 xassert (base_face); | |
7664 | |
7665 /* Optimize the default case that there is no face property and we | |
7666 are not in the region. */ | |
7667 if (NILP (prop) | |
7668 && (base_face_id != DEFAULT_FACE_ID | |
7669 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
7670 that the region doesn't have to be taken into account. */ | |
7671 || bufpos <= 0 | |
7672 || bufpos < region_beg | |
7673 || bufpos >= region_end) | |
7674 && (multibyte_p | |
7675 /* We can't realize faces for different charsets differently | |
7676 if we don't have fonts, so we can stop here if not working | |
7677 on a window-system frame. */ | |
7678 || !FRAME_WINDOW_P (f) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7679 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
24995 | 7680 return base_face->id; |
7681 | |
7682 /* Begin with attributes from the base face. */ | |
7683 bcopy (base_face->lface, attrs, sizeof attrs); | |
7684 | |
7685 /* Merge in attributes specified via text properties. */ | |
7686 if (!NILP (prop)) | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7687 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 7688 |
7689 /* If in the region, merge in the region face. */ | |
7690 if (bufpos | |
7691 && bufpos >= region_beg | |
7692 && bufpos < region_end) | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
7693 merge_named_face (f, Qregion, attrs, 0); |
24995 | 7694 |
7695 /* Look up a realized face with the given face attributes, | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7696 or realize a new one for ASCII characters. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7697 return lookup_face (f, attrs, 0, NULL); |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7698 } |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7699 |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
7700 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7701 /* Merge a face into a realized face. |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7702 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7703 F is frame where faces are (to be) realized. |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7704 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7705 FACE_NAME is named face to merge. |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7706 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7707 If FACE_NAME is nil, FACE_ID is face_id of realized face to merge. |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7708 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7709 If FACE_NAME is t, FACE_ID is lface_id of face to merge. |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7710 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7711 BASE_FACE_ID is realized face to merge into. |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7712 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7713 Return new face id. |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7714 */ |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7715 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7716 int |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7717 merge_faces (f, face_name, face_id, base_face_id) |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7718 struct frame *f; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7719 Lisp_Object face_name; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7720 int face_id, base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7721 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7722 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7723 struct face *base_face; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7724 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7725 base_face = FACE_FROM_ID (f, base_face_id); |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7726 if (!base_face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7727 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7728 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7729 if (EQ (face_name, Qt)) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7730 { |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7731 if (face_id < 0 || face_id >= lface_id_to_name_size) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7732 return base_face_id; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7733 face_name = lface_id_to_name[face_id]; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7734 face_id = lookup_derived_face (f, face_name, 0, base_face_id); |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7735 if (face_id >= 0) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7736 return face_id; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7737 return base_face_id; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7738 } |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7739 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7740 /* Begin with attributes from the base face. */ |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7741 bcopy (base_face->lface, attrs, sizeof attrs); |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7742 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7743 if (!NILP (face_name)) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7744 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7745 if (!merge_named_face (f, face_name, attrs, 0)) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7746 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7747 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7748 else |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7749 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7750 struct face *face; |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7751 if (face_id < 0) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
7752 return base_face_id; |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7753 face = FACE_FROM_ID (f, face_id); |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7754 if (!face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7755 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7756 merge_face_vectors (f, face->lface, attrs, 0); |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7757 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7758 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7759 /* Look up a realized face with the given face attributes, |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7760 or realize a new one for ASCII characters. */ |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7761 return lookup_face (f, attrs, 0, NULL); |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7762 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
7763 |
2336 | 7764 |
24995 | 7765 /*********************************************************************** |
7766 Tests | |
7767 ***********************************************************************/ | |
7768 | |
7769 #if GLYPH_DEBUG | |
7770 | |
7771 /* Print the contents of the realized face FACE to stderr. */ | |
7772 | |
7773 static void | |
7774 dump_realized_face (face) | |
7775 struct face *face; | |
2336 | 7776 { |
24995 | 7777 fprintf (stderr, "ID: %d\n", face->id); |
7778 #ifdef HAVE_X_WINDOWS | |
7779 fprintf (stderr, "gc: %d\n", (int) face->gc); | |
7780 #endif | |
7781 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
7782 face->foreground, | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7783 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
24995 | 7784 fprintf (stderr, "background: 0x%lx (%s)\n", |
7785 face->background, | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7786 SDATA (face->lface[LFACE_BACKGROUND_INDEX])); |
24995 | 7787 fprintf (stderr, "font_name: %s (%s)\n", |
7788 face->font_name, | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7789 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
24995 | 7790 #ifdef HAVE_X_WINDOWS |
7791 fprintf (stderr, "font = %p\n", face->font); | |
7792 #endif | |
7793 fprintf (stderr, "font_info_id = %d\n", face->font_info_id); | |
7794 fprintf (stderr, "fontset: %d\n", face->fontset); | |
7795 fprintf (stderr, "underline: %d (%s)\n", | |
7796 face->underline_p, | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7797 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
24995 | 7798 fprintf (stderr, "hash: %d\n", face->hash); |
7799 fprintf (stderr, "charset: %d\n", face->charset); | |
7800 } | |
7801 | |
7802 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7803 DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7804 (n) |
24995 | 7805 Lisp_Object n; |
7806 { | |
7807 if (NILP (n)) | |
2336 | 7808 { |
24995 | 7809 int i; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7810 |
24995 | 7811 fprintf (stderr, "font selection order: "); |
7812 for (i = 0; i < DIM (font_sort_order); ++i) | |
7813 fprintf (stderr, "%d ", font_sort_order[i]); | |
7814 fprintf (stderr, "\n"); | |
7815 | |
7816 fprintf (stderr, "alternative fonts: "); | |
7817 debug_print (Vface_alternative_font_family_alist); | |
7818 fprintf (stderr, "\n"); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7819 |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
7820 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
24995 | 7821 Fdump_face (make_number (i)); |
2336 | 7822 } |
24995 | 7823 else |
7824 { | |
7825 struct face *face; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
7826 CHECK_NUMBER (n); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
7827 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
24995 | 7828 if (face == NULL) |
7829 error ("Not a valid face"); | |
7830 dump_realized_face (face); | |
7831 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7832 |
2336 | 7833 return Qnil; |
7834 } | |
7835 | |
7836 | |
24995 | 7837 DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7838 0, 0, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
7839 () |
2336 | 7840 { |
24995 | 7841 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
7842 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
7843 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
2336 | 7844 return Qnil; |
7845 } | |
24995 | 7846 |
7847 #endif /* GLYPH_DEBUG != 0 */ | |
7848 | |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
7849 |
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
7850 |
24995 | 7851 /*********************************************************************** |
7852 Initialization | |
7853 ***********************************************************************/ | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
7854 |
2336 | 7855 void |
2391 | 7856 syms_of_xfaces () |
2336 | 7857 { |
2391 | 7858 Qface = intern ("face"); |
7859 staticpro (&Qface); | |
57107 | 7860 Qface_no_inherit = intern ("face-no-inherit"); |
7861 staticpro (&Qface_no_inherit); | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7862 Qbitmap_spec_p = intern ("bitmap-spec-p"); |
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7863 staticpro (&Qbitmap_spec_p); |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7864 Qframe_update_face_colors = intern ("frame-update-face-colors"); |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7865 staticpro (&Qframe_update_face_colors); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7866 |
24995 | 7867 /* Lisp face attribute keywords. */ |
7868 QCfamily = intern (":family"); | |
7869 staticpro (&QCfamily); | |
7870 QCheight = intern (":height"); | |
7871 staticpro (&QCheight); | |
7872 QCweight = intern (":weight"); | |
7873 staticpro (&QCweight); | |
7874 QCslant = intern (":slant"); | |
7875 staticpro (&QCslant); | |
7876 QCunderline = intern (":underline"); | |
7877 staticpro (&QCunderline); | |
7878 QCinverse_video = intern (":inverse-video"); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7879 staticpro (&QCinverse_video); |
24995 | 7880 QCreverse_video = intern (":reverse-video"); |
7881 staticpro (&QCreverse_video); | |
7882 QCforeground = intern (":foreground"); | |
7883 staticpro (&QCforeground); | |
7884 QCbackground = intern (":background"); | |
7885 staticpro (&QCbackground); | |
7886 QCstipple = intern (":stipple");; | |
7887 staticpro (&QCstipple); | |
7888 QCwidth = intern (":width"); | |
7889 staticpro (&QCwidth); | |
7890 QCfont = intern (":font"); | |
7891 staticpro (&QCfont); | |
7892 QCbold = intern (":bold"); | |
7893 staticpro (&QCbold); | |
7894 QCitalic = intern (":italic"); | |
7895 staticpro (&QCitalic); | |
7896 QCoverline = intern (":overline"); | |
7897 staticpro (&QCoverline); | |
7898 QCstrike_through = intern (":strike-through"); | |
7899 staticpro (&QCstrike_through); | |
7900 QCbox = intern (":box"); | |
7901 staticpro (&QCbox); | |
31178 | 7902 QCinherit = intern (":inherit"); |
7903 staticpro (&QCinherit); | |
24995 | 7904 |
7905 /* Symbols used for Lisp face attribute values. */ | |
7906 QCcolor = intern (":color"); | |
7907 staticpro (&QCcolor); | |
7908 QCline_width = intern (":line-width"); | |
7909 staticpro (&QCline_width); | |
7910 QCstyle = intern (":style"); | |
7911 staticpro (&QCstyle); | |
7912 Qreleased_button = intern ("released-button"); | |
7913 staticpro (&Qreleased_button); | |
7914 Qpressed_button = intern ("pressed-button"); | |
7915 staticpro (&Qpressed_button); | |
7916 Qnormal = intern ("normal"); | |
7917 staticpro (&Qnormal); | |
7918 Qultra_light = intern ("ultra-light"); | |
7919 staticpro (&Qultra_light); | |
7920 Qextra_light = intern ("extra-light"); | |
7921 staticpro (&Qextra_light); | |
7922 Qlight = intern ("light"); | |
7923 staticpro (&Qlight); | |
7924 Qsemi_light = intern ("semi-light"); | |
7925 staticpro (&Qsemi_light); | |
7926 Qsemi_bold = intern ("semi-bold"); | |
7927 staticpro (&Qsemi_bold); | |
7928 Qbold = intern ("bold"); | |
7929 staticpro (&Qbold); | |
7930 Qextra_bold = intern ("extra-bold"); | |
7931 staticpro (&Qextra_bold); | |
7932 Qultra_bold = intern ("ultra-bold"); | |
7933 staticpro (&Qultra_bold); | |
7934 Qoblique = intern ("oblique"); | |
7935 staticpro (&Qoblique); | |
7936 Qitalic = intern ("italic"); | |
7937 staticpro (&Qitalic); | |
7938 Qreverse_oblique = intern ("reverse-oblique"); | |
7939 staticpro (&Qreverse_oblique); | |
7940 Qreverse_italic = intern ("reverse-italic"); | |
7941 staticpro (&Qreverse_italic); | |
7942 Qultra_condensed = intern ("ultra-condensed"); | |
7943 staticpro (&Qultra_condensed); | |
7944 Qextra_condensed = intern ("extra-condensed"); | |
7945 staticpro (&Qextra_condensed); | |
7946 Qcondensed = intern ("condensed"); | |
7947 staticpro (&Qcondensed); | |
7948 Qsemi_condensed = intern ("semi-condensed"); | |
7949 staticpro (&Qsemi_condensed); | |
7950 Qsemi_expanded = intern ("semi-expanded"); | |
7951 staticpro (&Qsemi_expanded); | |
7952 Qexpanded = intern ("expanded"); | |
7953 staticpro (&Qexpanded); | |
7954 Qextra_expanded = intern ("extra-expanded"); | |
7955 staticpro (&Qextra_expanded); | |
7956 Qultra_expanded = intern ("ultra-expanded"); | |
7957 staticpro (&Qultra_expanded); | |
7958 Qbackground_color = intern ("background-color"); | |
7959 staticpro (&Qbackground_color); | |
7960 Qforeground_color = intern ("foreground-color"); | |
7961 staticpro (&Qforeground_color); | |
7962 Qunspecified = intern ("unspecified"); | |
7963 staticpro (&Qunspecified); | |
7964 | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7965 Qface_alias = intern ("face-alias"); |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7966 staticpro (&Qface_alias); |
24995 | 7967 Qdefault = intern ("default"); |
7968 staticpro (&Qdefault); | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
7969 Qtool_bar = intern ("tool-bar"); |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
7970 staticpro (&Qtool_bar); |
24995 | 7971 Qregion = intern ("region"); |
7972 staticpro (&Qregion); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7973 Qfringe = intern ("fringe"); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7974 staticpro (&Qfringe); |
25546 | 7975 Qheader_line = intern ("header-line"); |
7976 staticpro (&Qheader_line); | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7977 Qscroll_bar = intern ("scroll-bar"); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7978 staticpro (&Qscroll_bar); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
7979 Qmenu = intern ("menu"); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
7980 staticpro (&Qmenu); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7981 Qcursor = intern ("cursor"); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7982 staticpro (&Qcursor); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7983 Qborder = intern ("border"); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7984 staticpro (&Qborder); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7985 Qmouse = intern ("mouse"); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
7986 staticpro (&Qmouse); |
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
7987 Qmode_line_inactive = intern ("mode-line-inactive"); |
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
7988 staticpro (&Qmode_line_inactive); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7989 Qtty_color_desc = intern ("tty-color-desc"); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7990 staticpro (&Qtty_color_desc); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
7991 Qtty_color_standard_values = intern ("tty-color-standard-values"); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
7992 staticpro (&Qtty_color_standard_values); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7993 Qtty_color_by_index = intern ("tty-color-by-index"); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
7994 staticpro (&Qtty_color_by_index); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7995 Qtty_color_alist = intern ("tty-color-alist"); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
7996 staticpro (&Qtty_color_alist); |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
7997 Qscalable_fonts_allowed = intern ("scalable-fonts-allowed"); |
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
7998 staticpro (&Qscalable_fonts_allowed); |
24995 | 7999 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
8000 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
8001 staticpro (&Vparam_value_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
8002 Vface_alternative_font_family_alist = Qnil; |
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
8003 staticpro (&Vface_alternative_font_family_alist); |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
8004 Vface_alternative_font_registry_alist = Qnil; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
8005 staticpro (&Vface_alternative_font_registry_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
8006 |
24995 | 8007 defsubr (&Sinternal_make_lisp_face); |
8008 defsubr (&Sinternal_lisp_face_p); | |
8009 defsubr (&Sinternal_set_lisp_face_attribute); | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
8010 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 8011 defsubr (&Sinternal_set_lisp_face_attribute_from_resource); |
27137
0ade9883b546
(syms_of_xfaces): defsubr Scolor_gray_p and
Eli Zaretskii <eliz@gnu.org>
parents:
27120
diff
changeset
|
8012 #endif |
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
8013 defsubr (&Scolor_gray_p); |
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
8014 defsubr (&Scolor_supported_p); |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
8015 defsubr (&Sface_attribute_relative_p); |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
8016 defsubr (&Smerge_face_attribute); |
24995 | 8017 defsubr (&Sinternal_get_lisp_face_attribute); |
8018 defsubr (&Sinternal_lisp_face_attribute_values); | |
8019 defsubr (&Sinternal_lisp_face_equal_p); | |
8020 defsubr (&Sinternal_lisp_face_empty_p); | |
8021 defsubr (&Sinternal_copy_lisp_face); | |
8022 defsubr (&Sinternal_merge_in_global_face); | |
8023 defsubr (&Sface_font); | |
8024 defsubr (&Sframe_face_alist); | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
8025 defsubr (&Sdisplay_supports_face_attributes_p); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
8026 defsubr (&Scolor_distance); |
24995 | 8027 defsubr (&Sinternal_set_font_selection_order); |
8028 defsubr (&Sinternal_set_alternative_font_family_alist); | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
8029 defsubr (&Sinternal_set_alternative_font_registry_alist); |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
8030 defsubr (&Sface_attributes_as_vector); |
24995 | 8031 #if GLYPH_DEBUG |
8032 defsubr (&Sdump_face); | |
8033 defsubr (&Sshow_face_resources); | |
8034 #endif /* GLYPH_DEBUG */ | |
8035 defsubr (&Sclear_face_cache); | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
8036 defsubr (&Stty_suppress_bold_inverse_default_colors); |
24995 | 8037 |
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
8038 #if defined DEBUG_X_COLORS && defined HAVE_X_WINDOWS |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
8039 defsubr (&Sdump_colors); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
8040 #endif |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
8041 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8042 DEFVAR_LISP ("font-list-limit", &Vfont_list_limit, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8043 doc: /* *Limit for font matching. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8044 If an integer > 0, font matching functions won't load more than |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8045 that number of fonts when searching for a matching font. */); |
25270 | 8046 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
8047 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8048 DEFVAR_LISP ("face-new-frame-defaults", &Vface_new_frame_defaults, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8049 doc: /* List of global face definitions (for internal use only.) */); |
24995 | 8050 Vface_new_frame_defaults = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
8051 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8052 DEFVAR_LISP ("face-default-stipple", &Vface_default_stipple, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8053 doc: /* *Default stipple pattern used on monochrome displays. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8054 This stipple pattern is used on monochrome displays |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8055 instead of shades of gray for a face background color. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8056 See `set-face-stipple' for possible values for this variable. */); |
24995 | 8057 Vface_default_stipple = build_string ("gray3"); |
8058 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8059 DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8060 doc: /* An alist of defined terminal colors and their RGB values. */); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
8061 Vtty_defined_color_alist = Qnil; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
8062 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8063 DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8064 doc: /* Allowed scalable fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8065 A value of nil means don't allow any scalable fonts. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8066 A value of t means allow any scalable font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8067 Otherwise, value must be a list of regular expressions. A font may be |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8068 scaled if its name matches a regular expression in the list. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8069 Note that if value is nil, a scalable font might still be used, if no |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8070 other font of the appropriate family and registry is available. */); |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
8071 Vscalable_fonts_allowed = Qnil; |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
8072 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8073 DEFVAR_LISP ("face-ignored-fonts", &Vface_ignored_fonts, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
8074 doc: /* List of ignored fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8075 Each element is a regular expression that matches names of fonts to |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
8076 ignore. */); |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
8077 Vface_ignored_fonts = Qnil; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
8078 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8079 DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist, |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8080 doc: /* Alist of fonts vs the rescaling factors. |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8081 Each element is a cons (FONT-NAME-PATTERN . RESCALE-RATIO), where |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8082 FONT-NAME-PATTERN is a regular expression matching a font name, and |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8083 RESCALE-RATIO is a floating point number to specify how much larger |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8084 \(or smaller) font we should use. For instance, if a face requests |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8085 a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8086 Vface_font_rescale_alist = Qnil; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
8087 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
8088 #ifdef HAVE_WINDOW_SYSTEM |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
8089 defsubr (&Sbitmap_spec_p); |
24995 | 8090 defsubr (&Sx_list_fonts); |
8091 defsubr (&Sinternal_face_x_get_resource); | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
8092 defsubr (&Sx_family_fonts); |
24995 | 8093 defsubr (&Sx_font_family_list); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
8094 #endif /* HAVE_WINDOW_SYSTEM */ |
2336 | 8095 } |
52401 | 8096 |
8097 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
8098 (do not change this comment) */ |