Mercurial > emacs
annotate src/xfaces.c @ 60957:d7efcbcdef3b
(X Resources): GTK options documented too.
(Resources): Clarify meaning of program name.
(Table of Resources): Add visualClass.
(GTK resources): Rewrite.
(GTK widget names, GTK Names in Emacs, GTK styles): Cleanups.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 26 Mar 2005 02:00:32 +0000 |
parents | 18fb43577f76 |
children | c897778cd685 26c9034f3533 13796b0653c7 |
rev | line source |
---|---|
24995 | 1 /* xfaces.c -- "Face" primitives. |
59905
d6551c039c8f
Copyright update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59903
diff
changeset
|
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
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> | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
198 |
2336 | 199 #include "lisp.h" |
17047 | 200 #include "charset.h" |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
201 #include "keyboard.h" |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
202 #include "frame.h" |
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
203 |
29897
cd1bb44e646d
Include fontset.h dependent on HAVE_WINDOW_SYSTEM, not HAVE_X_WINDOWS.
Dave Love <fx@gnu.org>
parents:
29768
diff
changeset
|
204 #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
|
205 #include "fontset.h" |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
206 #endif /* HAVE_WINDOW_SYSTEM */ |
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
207 |
9572 | 208 #ifdef HAVE_X_WINDOWS |
2336 | 209 #include "xterm.h" |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
210 #ifdef USE_MOTIF |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
211 #include <Xm/Xm.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
212 #include <Xm/XmStrDefs.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
213 #endif /* USE_MOTIF */ |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
214 #endif /* HAVE_X_WINDOWS */ |
24995 | 215 |
9572 | 216 #ifdef MSDOS |
217 #include "dosfns.h" | |
218 #endif | |
24995 | 219 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
220 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
221 #include "w32term.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
222 #include "fontset.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
223 /* 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
|
224 code with #ifdef blocks. */ |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
225 #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
|
226 #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
|
227 #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
|
228 #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
|
229 #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
|
230 #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
|
231 #define GCGraphicsExposures 0 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
232 #endif /* WINDOWSNT */ |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
233 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
234 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
235 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
236 #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
|
237 #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
|
238 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
239 |
2336 | 240 #include "buffer.h" |
2391 | 241 #include "dispextern.h" |
2438 | 242 #include "blockinput.h" |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
243 #include "window.h" |
8848 | 244 #include "intervals.h" |
2336 | 245 |
9572 | 246 #ifdef HAVE_X_WINDOWS |
24995 | 247 |
248 /* 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
|
249 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
|
250 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
|
251 #included. */ |
24995 | 252 |
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
253 #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
|
254 #include <time.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
255 #undef USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
256 #include <X11/Xos.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
257 #define USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
258 #define __TIMEVAL__ |
24995 | 259 #else /* not XOS_NEEDS_TIME_H */ |
2336 | 260 #include <X11/Xos.h> |
24995 | 261 #endif /* not XOS_NEEDS_TIME_H */ |
262 | |
9572 | 263 #endif /* HAVE_X_WINDOWS */ |
24995 | 264 |
265 #include <ctype.h> | |
266 | |
267 #define abs(X) ((X) < 0 ? -(X) : (X)) | |
268 | |
34882 | 269 /* Number of pt per inch (from the TeXbook). */ |
270 | |
271 #define PT_PER_INCH 72.27 | |
272 | |
24995 | 273 /* Non-zero if face attribute ATTR is unspecified. */ |
274 | |
275 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
276 | |
277 /* Value is the number of elements of VECTOR. */ | |
278 | |
279 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
280 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
281 /* Make a copy of string S on the stack using alloca. Value is a pointer |
24995 | 282 to the copy. */ |
283 | |
284 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
285 | |
286 /* Make a copy of the contents of Lisp string S on the stack using | |
287 alloca. Value is a pointer to the copy. */ | |
288 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
289 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
24995 | 290 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
291 /* Size of hash table of realized faces in face caches (should be a |
24995 | 292 prime number). */ |
293 | |
294 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
295 | |
296 /* Keyword symbols used for face attribute names. */ | |
297 | |
298 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
299 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
300 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
301 Lisp_Object QCreverse_video; | |
31178 | 302 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
24995 | 303 |
304 /* Symbols used for attribute values. */ | |
305 | |
306 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
307 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
308 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
309 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
310 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
311 Lisp_Object Qultra_expanded; | |
312 Lisp_Object Qreleased_button, Qpressed_button; | |
313 Lisp_Object QCstyle, QCcolor, QCline_width; | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
314 Lisp_Object Qunspecified; |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
315 |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
316 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
24995 | 317 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
318 /* 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
|
319 has changed, frame_update_face_colors. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
320 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
321 Lisp_Object Qframe_update_face_colors; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
322 |
24995 | 323 /* Names of basic faces. */ |
324 | |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
325 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
|
326 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
|
327 Lisp_Object Qmode_line_inactive; |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
328 extern Lisp_Object Qmode_line; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
329 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
330 /* 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
|
331 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
|
332 the aliased face. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
333 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
334 Lisp_Object Qface_alias; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
335 |
24995 | 336 /* Default stipple pattern used on monochrome displays. This stipple |
337 pattern is used on monochrome displays instead of shades of gray | |
338 for a face background color. See `set-face-stipple' for possible | |
339 values for this variable. */ | |
340 | |
341 Lisp_Object Vface_default_stipple; | |
342 | |
343 /* Alist of alternative font families. Each element is of the form | |
344 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
345 try FAMILY1, then FAMILY2, ... */ | |
346 | |
347 Lisp_Object Vface_alternative_font_family_alist; | |
348 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
349 /* 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
|
350 (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
|
351 loaded, try REGISTRY1, then REGISTRY2, ... */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
352 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
353 Lisp_Object Vface_alternative_font_registry_alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
354 |
24995 | 355 /* Allowed scalable fonts. A value of nil means don't allow any |
356 scalable fonts. A value of t means allow the use of any scalable | |
357 font. Otherwise, value must be a list of regular expressions. A | |
358 font may be scaled if its name matches a regular expression in the | |
359 list. */ | |
360 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
361 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
24995 | 362 |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
363 /* 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
|
364 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
365 Lisp_Object Vface_ignored_fonts; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
366 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
367 /* 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
|
368 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
369 Lisp_Object Vface_font_rescale_alist; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
370 |
25270 | 371 /* Maximum number of fonts to consider in font_list. If not an |
372 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
373 | |
374 Lisp_Object Vfont_list_limit; | |
375 #define DEFAULT_FONT_LIST_LIMIT 100 | |
376 | |
24995 | 377 /* The symbols `foreground-color' and `background-color' which can be |
378 used as part of a `face' property. This is for compatibility with | |
379 Emacs 20.2. */ | |
380 | |
381 Lisp_Object Qforeground_color, Qbackground_color; | |
382 | |
383 /* The symbols `face' and `mouse-face' used as text properties. */ | |
2342 | 384 |
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
385 Lisp_Object Qface; |
24995 | 386 extern Lisp_Object Qmouse_face; |
387 | |
57107 | 388 /* Property for basic faces which other faces cannot inherit. */ |
389 | |
390 Lisp_Object Qface_no_inherit; | |
391 | |
24995 | 392 /* Error symbol for wrong_type_argument in load_pixmap. */ |
393 | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
394 Lisp_Object Qbitmap_spec_p; |
2391 | 395 |
24995 | 396 /* Alist of global face definitions. Each element is of the form |
397 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
398 is a Lisp vector of face attributes. These faces are used | |
399 to initialize faces for new frames. */ | |
400 | |
401 Lisp_Object Vface_new_frame_defaults; | |
402 | |
403 /* The next ID to assign to Lisp faces. */ | |
404 | |
405 static int next_lface_id; | |
406 | |
407 /* A vector mapping Lisp face Id's to face names. */ | |
408 | |
409 static Lisp_Object *lface_id_to_name; | |
410 static int lface_id_to_name_size; | |
411 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
412 /* 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
|
413 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
414 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
24995 | 415 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
416 /* 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
|
417 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
418 Lisp_Object Qtty_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
419 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
420 /* 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
|
421 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
422 Lisp_Object Vtty_defined_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
423 |
24995 | 424 /* Counter for calls to clear_face_cache. If this counter reaches |
425 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
426 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
427 | |
428 static int clear_font_table_count; | |
429 #define CLEAR_FONT_TABLE_COUNT 100 | |
430 #define CLEAR_FONT_TABLE_NFONTS 10 | |
431 | |
432 /* Non-zero means face attributes have been changed since the last | |
433 redisplay. Used in redisplay_internal. */ | |
434 | |
435 int face_change_count; | |
436 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
437 /* 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
|
438 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
|
439 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
|
440 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
|
441 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
442 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
|
443 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
444 /* 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
|
445 Finternal_set_lisp_face_attribute. */ |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
446 |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
447 static Lisp_Object Vparam_value_alist; |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
448 |
24995 | 449 /* The total number of colors currently allocated. */ |
450 | |
451 #if GLYPH_DEBUG | |
452 static int ncolors_allocated; | |
453 static int npixmaps_allocated; | |
454 static int ngcs; | |
455 #endif | |
456 | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
457 /* 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
|
458 been changed. */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
459 |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
460 int menu_face_changed_default; |
24995 | 461 |
2336 | 462 |
24995 | 463 /* Function prototypes. */ |
464 | |
465 struct font_name; | |
466 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
|
467 struct named_merge_point; |
24995 | 468 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
469 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
|
470 enum lface_attribute_index, int *)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
471 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
|
472 static int may_use_scalable_font_p P_ ((const char *)); |
24995 | 473 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
474 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
|
475 int, int)); |
24995 | 476 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
|
477 struct font_name **, int, int)); |
24995 | 478 static int font_scalable_p P_ ((struct font_name *)); |
479 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int)); | |
480 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); | |
481 static unsigned char *xstrlwr P_ ((unsigned char *)); | |
482 static void signal_error P_ ((char *, Lisp_Object)); | |
483 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
|
484 static void load_face_font P_ ((struct frame *, struct face *, int)); |
24995 | 485 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); |
486 static void free_face_colors P_ ((struct frame *, struct face *)); | |
487 static int face_color_gray_p P_ ((struct frame *, char *)); | |
488 static char *build_font_name P_ ((struct font_name *)); | |
489 static void free_font_names P_ ((struct font_name *, int)); | |
490 static int sorted_font_list P_ ((struct frame *, char *, | |
491 int (*cmpfn) P_ ((const void *, const void *)), | |
492 struct font_name **)); | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
493 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
|
494 Lisp_Object, struct font_name **)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
495 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
|
496 Lisp_Object, struct font_name **)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
497 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
|
498 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
|
499 int)); |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
500 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
|
501 Lisp_Object, struct font_name **)); |
24995 | 502 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
|
503 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
|
504 struct face *, int)); |
24995 | 505 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
|
506 Lisp_Object *, int, struct face *)); |
24995 | 507 static struct face *realize_tty_face P_ ((struct face_cache *, |
508 Lisp_Object *, int)); | |
509 static int realize_basic_faces P_ ((struct frame *)); | |
510 static int realize_default_face P_ ((struct frame *)); | |
511 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
512 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
513 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
514 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
515 static unsigned lface_hash P_ ((Lisp_Object *)); | |
516 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
517 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
518 static void free_realized_face P_ ((struct frame *, struct face *)); | |
519 static void clear_face_gcs P_ ((struct face_cache *)); | |
520 static void free_face_cache P_ ((struct face_cache *)); | |
521 static int face_numeric_weight P_ ((Lisp_Object)); | |
522 static int face_numeric_slant P_ ((Lisp_Object)); | |
523 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
|
524 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
|
525 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
|
526 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
|
527 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
|
528 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
|
529 int, struct named_merge_point *)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
530 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
|
531 Lisp_Object, int, int)); |
24995 | 532 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
|
533 static struct face *make_realized_face P_ ((Lisp_Object *)); |
24995 | 534 static void free_realized_faces P_ ((struct face_cache *)); |
535 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
|
536 struct font_name *, int, int, int *)); |
24995 | 537 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
538 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
539 static int xlfd_numeric_slant P_ ((struct font_name *)); | |
540 static int xlfd_numeric_weight P_ ((struct font_name *)); | |
541 static int xlfd_numeric_swidth P_ ((struct font_name *)); | |
542 static Lisp_Object xlfd_symbolic_slant P_ ((struct font_name *)); | |
543 static Lisp_Object xlfd_symbolic_weight P_ ((struct font_name *)); | |
544 static Lisp_Object xlfd_symbolic_swidth P_ ((struct font_name *)); | |
545 static int xlfd_fixed_p P_ ((struct font_name *)); | |
546 static int xlfd_numeric_value P_ ((struct table_entry *, int, struct font_name *, | |
547 int, int)); | |
548 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
|
549 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
|
550 Lisp_Object)); |
24995 | 551 static struct table_entry *xlfd_lookup_field_contents P_ ((struct table_entry *, int, |
552 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
|
553 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
554 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 555 |
556 static int split_font_name P_ ((struct frame *, struct font_name *, int)); | |
557 static int xlfd_point_size P_ ((struct frame *, struct font_name *)); | |
558 static void sort_fonts P_ ((struct frame *, struct font_name *, int, | |
559 int (*cmpfn) P_ ((const void *, const void *)))); | |
560 static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
561 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
|
562 static void clear_font_table P_ ((struct x_display_info *)); |
24995 | 563 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
564 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
565 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
|
566 #endif /* WINDOWSNT */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
567 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
568 #ifdef USE_X_TOOLKIT |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
569 static void x_update_menu_appearance P_ ((struct frame *)); |
39675 | 570 |
571 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
|
572 #endif /* USE_X_TOOLKIT */ |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
573 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
574 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 575 |
576 | |
577 /*********************************************************************** | |
578 Utilities | |
579 ***********************************************************************/ | |
580 | |
581 #ifdef HAVE_X_WINDOWS | |
582 | |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
583 #ifdef DEBUG_X_COLORS |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
584 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
585 /* 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
|
586 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
|
587 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
|
588 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
|
589 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
|
590 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
|
591 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
|
592 single display/screen. --gerd. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 /* Reference counts for pixel colors. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 int color_count[256]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 /* Register color PIXEL as allocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 register_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 ++color_count[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 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 /* Register color PIXEL as deallocated. */ |
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 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 unregister_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
614 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
615 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 if (color_count[pixel] > 0) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 --color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 else |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 abort (); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
620 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
621 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 /* Register N colors from PIXELS as deallocated. */ |
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 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
626 unregister_colors (pixels, n) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
627 unsigned long *pixels; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
628 int n; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
629 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
630 int i; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
631 for (i = 0; i < n; ++i) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
632 unregister_color (pixels[i]); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
633 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
634 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
635 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
636 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
|
637 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
|
638 () |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 int i, n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 fputc ('\n', stderr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
643 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 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
|
645 if (color_count[i]) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 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
|
648 ++n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 if (n % 5 == 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
650 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
651 else |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
652 fputc ('\t', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
653 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
654 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
655 if (n % 5 != 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
656 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
657 return Qnil; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
658 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
659 |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
660 #endif /* DEBUG_X_COLORS */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
661 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
662 |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
663 /* 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
|
664 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
|
665 is called. */ |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
666 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
667 void |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
668 x_free_colors (f, pixels, npixels) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
669 struct frame *f; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
670 unsigned long *pixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
671 int npixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
672 { |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
673 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
674 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
675 /* 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
|
676 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
|
677 if (class != StaticColor && class != StaticGray && class != TrueColor) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
678 { |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
679 #ifdef DEBUG_X_COLORS |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
680 unregister_colors (pixels, npixels); |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
681 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
682 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
|
683 pixels, npixels, 0); |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
684 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
685 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
686 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
688 /* 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
|
689 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
|
690 is called. */ |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
692 void |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 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
|
694 Display *dpy; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
695 Screen *screen; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
696 Colormap cmap; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 unsigned long *pixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 int npixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 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
|
701 int class = dpyinfo->visual->class; |
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 /* 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
|
704 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
|
705 if (class != StaticColor && class != StaticGray && class != TrueColor) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
706 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
707 #ifdef DEBUG_X_COLORS |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
708 unregister_colors (pixels, npixels); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
709 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
710 XFreeColors (dpy, cmap, pixels, npixels, 0); |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
711 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
712 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
713 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
714 |
24995 | 715 /* Create and return a GC for use on frame F. GC values and mask |
716 are given by XGCV and MASK. */ | |
717 | |
718 static INLINE GC | |
719 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
|
720 struct frame *f; |
24995 | 721 unsigned long mask; |
722 XGCValues *xgcv; | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
723 { |
2336 | 724 GC gc; |
24995 | 725 BLOCK_INPUT; |
726 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
727 UNBLOCK_INPUT; | |
728 IF_DEBUG (++ngcs); | |
729 return gc; | |
730 } | |
731 | |
732 | |
733 /* Free GC which was used on frame F. */ | |
734 | |
735 static INLINE void | |
736 x_free_gc (f, gc) | |
737 struct frame *f; | |
738 GC gc; | |
739 { | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
740 BLOCK_INPUT; |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
741 IF_DEBUG (xassert (--ngcs >= 0)); |
24995 | 742 XFreeGC (FRAME_X_DISPLAY (f), gc); |
743 UNBLOCK_INPUT; | |
744 } | |
745 | |
746 #endif /* HAVE_X_WINDOWS */ | |
747 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
749 /* W32 emulation of GCs */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
750 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
751 static INLINE GC |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 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
|
753 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 unsigned long mask; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 XGCValues *xgcv; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
756 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
757 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
758 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 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
|
760 UNBLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 IF_DEBUG (++ngcs); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 return gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
763 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
764 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
765 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
766 /* 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
|
767 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
768 static INLINE void |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
769 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
|
770 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
771 GC gc; |
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 BLOCK_INPUT; |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
774 IF_DEBUG (xassert (--ngcs >= 0)); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
775 xfree (gc); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
776 UNBLOCK_INPUT; |
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 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
779 #endif /* WINDOWSNT */ |
24995 | 780 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
781 #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
|
782 /* 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
|
783 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
784 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
|
785 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
786 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
|
787 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
|
788 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
|
789 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
|
790 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
|
791 { |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
792 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
|
793 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
|
794 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
|
795 } |
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 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
|
798 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
|
799 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
|
800 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
|
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 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
|
803 } |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
804 |
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
805 #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
|
806 |
24995 | 807 /* Like stricmp. Used to compare parts of font names which are in |
808 ISO8859-1. */ | |
809 | |
810 int | |
811 xstricmp (s1, s2) | |
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
812 const unsigned char *s1, *s2; |
24995 | 813 { |
814 while (*s1 && *s2) | |
815 { | |
816 unsigned char c1 = tolower (*s1); | |
817 unsigned char c2 = tolower (*s2); | |
818 if (c1 != c2) | |
819 return c1 < c2 ? -1 : 1; | |
820 ++s1, ++s2; | |
821 } | |
822 | |
823 if (*s1 == 0) | |
824 return *s2 == 0 ? 0 : -1; | |
825 return 1; | |
826 } | |
827 | |
828 | |
829 /* Like strlwr, which might not always be available. */ | |
830 | |
831 static unsigned char * | |
832 xstrlwr (s) | |
833 unsigned char *s; | |
834 { | |
835 unsigned char *p = s; | |
836 | |
837 for (p = s; *p; ++p) | |
838 *p = tolower (*p); | |
839 | |
840 return s; | |
841 } | |
842 | |
843 | |
844 /* Signal `error' with message S, and additional argument ARG. */ | |
845 | |
846 static void | |
847 signal_error (s, arg) | |
848 char *s; | |
849 Lisp_Object arg; | |
850 { | |
851 Fsignal (Qerror, Fcons (build_string (s), Fcons (arg, Qnil))); | |
852 } | |
853 | |
854 | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
855 /* 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
|
856 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
|
857 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
|
858 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
|
859 Lisp function definitions. */ |
24995 | 860 |
861 static INLINE struct frame * | |
862 frame_or_selected_frame (frame, nparam) | |
863 Lisp_Object frame; | |
864 int nparam; | |
865 { | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
866 if (NILP (frame)) |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
867 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
868 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
869 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
870 return XFRAME (frame); |
24995 | 871 } |
872 | |
873 | |
874 /*********************************************************************** | |
875 Frames and faces | |
876 ***********************************************************************/ | |
877 | |
878 /* 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
|
879 |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
880 void |
24995 | 881 init_frame_faces (f) |
882 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
|
883 { |
24995 | 884 /* Make a face cache, if F doesn't have one. */ |
885 if (FRAME_FACE_CACHE (f) == NULL) | |
886 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
887 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
888 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 889 /* 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
|
890 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
|
891 { |
24995 | 892 if (FRAME_X_IMAGE_CACHE (f) == NULL) |
893 FRAME_X_IMAGE_CACHE (f) = make_image_cache (); | |
894 ++FRAME_X_IMAGE_CACHE (f)->refcount; | |
895 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
896 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 897 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
898 /* Realize basic faces. Must have enough information in frame |
24995 | 899 parameters to realize basic faces at this point. */ |
900 #ifdef HAVE_X_WINDOWS | |
901 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
902 #endif | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
903 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
904 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
|
905 #endif |
45848 | 906 #ifdef MAC_OS |
907 if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | |
908 #endif | |
24995 | 909 if (!realize_basic_faces (f)) |
910 abort (); | |
911 } | |
912 | |
913 | |
914 /* Free face cache of frame F. Called from Fdelete_frame. */ | |
915 | |
916 void | |
917 free_frame_faces (f) | |
918 struct frame *f; | |
919 { | |
920 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
|
921 |
24995 | 922 if (face_cache) |
923 { | |
924 free_face_cache (face_cache); | |
925 FRAME_FACE_CACHE (f) = NULL; | |
926 } | |
927 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
928 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
929 if (FRAME_WINDOW_P (f)) |
24995 | 930 { |
931 struct image_cache *image_cache = FRAME_X_IMAGE_CACHE (f); | |
932 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
|
933 { |
24995 | 934 --image_cache->refcount; |
935 if (image_cache->refcount == 0) | |
936 free_image_cache (f); | |
937 } | |
938 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
939 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 940 } |
941 | |
942 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
943 /* 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
|
944 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
|
945 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
|
946 of named faces. */ |
24995 | 947 |
948 void | |
949 recompute_basic_faces (f) | |
950 struct frame *f; | |
951 { | |
952 if (FRAME_FACE_CACHE (f)) | |
953 { | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
954 clear_face_cache (0); |
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
955 if (!realize_basic_faces (f)) |
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
956 abort (); |
24995 | 957 } |
958 } | |
959 | |
960 | |
961 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
962 try to free unused fonts, too. */ | |
963 | |
964 void | |
965 clear_face_cache (clear_fonts_p) | |
966 int clear_fonts_p; | |
967 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
968 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 969 Lisp_Object tail, frame; |
970 struct frame *f; | |
971 | |
972 if (clear_fonts_p | |
973 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
974 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
975 struct x_display_info *dpyinfo; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
976 |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
977 /* 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
|
978 one X screen. */ |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
979 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
|
980 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
|
981 clear_font_table (dpyinfo); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
982 |
24995 | 983 /* From time to time see if we can unload some fonts. This also |
984 frees all realized faces on all frames. Fonts needed by | |
985 faces will be loaded again when faces are realized again. */ | |
986 clear_font_table_count = 0; | |
987 | |
988 FOR_EACH_FRAME (tail, frame) | |
989 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
990 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
|
991 if (FRAME_WINDOW_P (f) |
24995 | 992 && 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
|
993 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
|
994 } |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
995 } |
24995 | 996 else |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
997 { |
24995 | 998 /* Clear GCs of realized faces. */ |
999 FOR_EACH_FRAME (tail, frame) | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1000 { |
24995 | 1001 f = XFRAME (frame); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1002 if (FRAME_WINDOW_P (f)) |
24995 | 1003 { |
1004 clear_face_gcs (FRAME_FACE_CACHE (f)); | |
1005 clear_image_cache (f, 0); | |
1006 } | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1007 } |
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1008 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1009 #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
|
1010 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1011 |
24995 | 1012 |
1013 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
|
1014 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
|
1015 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
|
1016 (thoroughly) |
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1017 Lisp_Object thoroughly; |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1018 { |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
1019 clear_face_cache (!NILP (thoroughly)); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1020 ++face_change_count; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
1021 ++windows_or_buffers_changed; |
24995 | 1022 return Qnil; |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1023 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
1024 |
24995 | 1025 |
1026 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1027 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1028 |
1029 | |
38435 | 1030 /* Remove fonts from the font table of DPYINFO except for the default |
1031 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
|
1032 from time to time. */ |
24995 | 1033 |
1034 static void | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1035 clear_font_table (dpyinfo) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1036 struct x_display_info *dpyinfo; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1037 { |
24995 | 1038 int i; |
1039 | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1040 /* Free those fonts that are not used by frames on DPYINFO. */ |
24995 | 1041 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
|
1042 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1043 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
|
1044 Lisp_Object tail, frame; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1045 |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1046 /* 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
|
1047 if (font_info->name == NULL) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1048 continue; |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1049 |
44705
413dd322c77d
(clear_font_table): Don't free the default font of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43270
diff
changeset
|
1050 /* 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
|
1051 FOR_EACH_FRAME (tail, frame) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1052 { |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1053 struct frame *f = XFRAME (frame); |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1054 if (FRAME_WINDOW_P (f) |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1055 && 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
|
1056 break; |
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 |
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
1059 if (!NILP (tail)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1060 continue; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1061 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1062 /* Free names. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1063 if (font_info->full_name != font_info->name) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1064 xfree (font_info->full_name); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1065 xfree (font_info->name); |
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 the font. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1068 BLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1069 #ifdef HAVE_X_WINDOWS |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1070 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
|
1071 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1072 #ifdef WINDOWSNT |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1073 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
|
1074 #endif |
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58439
diff
changeset
|
1075 #ifdef MAC_OS |
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58439
diff
changeset
|
1076 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
|
1077 #endif |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1078 UNBLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1079 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1080 /* Mark font table slot free. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1081 font_info->font = NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1082 font_info->name = font_info->full_name = NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1083 } |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1084 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1085 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1086 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1087 |
1088 | |
1089 | |
1090 /*********************************************************************** | |
1091 X Pixmaps | |
1092 ***********************************************************************/ | |
1093 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1094 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1095 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1096 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
|
1097 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
|
1098 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
|
1099 \(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
|
1100 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
|
1101 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
|
1102 \(WIDTH + 7)/8 bytes. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1103 (object) |
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1104 Lisp_Object object; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1105 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1106 int pixmap_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1107 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1108 if (STRINGP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1109 /* 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
|
1110 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1111 else if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1112 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1113 /* 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
|
1114 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
|
1115 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
|
1116 Lisp_Object width, height, data; |
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 height = width = data = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1119 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1120 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1121 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1122 width = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1123 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1124 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1125 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1126 height = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1127 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1128 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1129 data = XCAR (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 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1132 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1133 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1134 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1135 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
|
1136 / 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
|
1137 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
|
1138 pixmap_p = 1; |
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 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1141 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1142 return pixmap_p ? Qt : Qnil; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1143 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1144 |
24995 | 1145 |
1146 /* Load a bitmap according to NAME (which is either a file name or a | |
1147 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
1148 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
1149 bitmap cannot be loaded, display a message saying so, and return | |
1150 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
1151 if these pointers are not null. */ | |
1152 | |
1153 static int | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1154 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
|
1155 FRAME_PTR f; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1156 Lisp_Object name; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1157 unsigned int *w_ptr, *h_ptr; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1158 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1159 int bitmap_id; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1160 Lisp_Object tem; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1161 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1162 if (NILP (name)) |
24995 | 1163 return 0; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1164 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1165 tem = Fbitmap_spec_p (name); |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1166 if (NILP (tem)) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1167 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
|
1168 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1169 BLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1170 if (CONSP (name)) |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1171 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1172 /* Decode a bitmap spec into a bitmap. */ |
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 int h, w; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1175 Lisp_Object bits; |
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 w = XINT (Fcar (name)); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1178 h = XINT (Fcar (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1179 bits = Fcar (Fcdr (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1180 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1181 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
|
1182 w, h); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1183 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1184 else |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1185 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1186 /* 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
|
1187 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
|
1188 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1189 UNBLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1190 |
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1191 if (bitmap_id < 0) |
24995 | 1192 { |
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1193 add_to_log ("Invalid or undefined bitmap %s", name, Qnil); |
24995 | 1194 bitmap_id = 0; |
1195 | |
1196 if (w_ptr) | |
1197 *w_ptr = 0; | |
1198 if (h_ptr) | |
1199 *h_ptr = 0; | |
1200 } | |
1201 else | |
1202 { | |
1203 #if GLYPH_DEBUG | |
1204 ++npixmaps_allocated; | |
1205 #endif | |
1206 if (w_ptr) | |
1207 *w_ptr = x_bitmap_width (f, bitmap_id); | |
1208 | |
1209 if (h_ptr) | |
1210 *h_ptr = x_bitmap_height (f, bitmap_id); | |
1211 } | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1212 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1213 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
|
1214 } |
9572 | 1215 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1216 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1217 |
9572 | 1218 |
2336 | 1219 |
24995 | 1220 /*********************************************************************** |
1221 Fonts | |
1222 ***********************************************************************/ | |
1223 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1224 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1225 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1226 /* 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
|
1227 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
|
1228 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
|
1229 |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1230 static void |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1231 load_face_font (f, face, c) |
24995 | 1232 struct frame *f; |
1233 struct face *face; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1234 int c; |
24995 | 1235 { |
1236 struct font_info *font_info = NULL; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1237 char *font_name; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1238 int needs_overstrike; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1239 |
24995 | 1240 face->font_info_id = -1; |
1241 face->font = NULL; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1242 |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
1243 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
|
1244 &needs_overstrike); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1245 if (!font_name) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1246 return; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1247 |
24995 | 1248 BLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1249 font_info = FS_LOAD_FACE_FONT (f, c, font_name, face); |
24995 | 1250 UNBLOCK_INPUT; |
1251 | |
1252 if (font_info) | |
1253 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1254 face->font_info_id = font_info->font_idx; |
24995 | 1255 face->font = font_info->font; |
1256 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
|
1257 face->overstrike = needs_overstrike; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1258 if (face->gc) |
24995 | 1259 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1260 x_free_gc (f, face->gc); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1261 face->gc = 0; |
24995 | 1262 } |
1263 } | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1264 else |
25799
1c370ec939da
(load_pixmap): Call add_to_log without frame parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25678
diff
changeset
|
1265 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
|
1266 build_string (font_name), Qnil); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1267 xfree (font_name); |
24995 | 1268 } |
1269 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1270 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1271 |
1272 | |
1273 | |
1274 /*********************************************************************** | |
1275 X Colors | |
1276 ***********************************************************************/ | |
1277 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1278 /* 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
|
1279 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
|
1280 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
|
1281 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1282 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1283 parse_rgb_list (rgb_list, color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1284 Lisp_Object rgb_list; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1285 XColor *color; |
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 #define PARSE_RGB_LIST_FIELD(field) \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1288 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
|
1289 { \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1290 color->field = XINT (XCAR (rgb_list)); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1291 rgb_list = XCDR (rgb_list); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1292 } \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1293 else \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1294 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1295 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1296 PARSE_RGB_LIST_FIELD (red); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1297 PARSE_RGB_LIST_FIELD (green); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1298 PARSE_RGB_LIST_FIELD (blue); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1299 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1300 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1301 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1302 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1303 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1304 /* 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
|
1305 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
|
1306 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
|
1307 returned in it. */ |
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 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1310 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
|
1311 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1312 Lisp_Object color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1313 XColor *tty_color, *std_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1314 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1315 Lisp_Object frame, color_desc; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1316 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1317 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
|
1318 return 0; |
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 XSETFRAME (frame, f); |
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 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
|
1323 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
|
1324 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1325 Lisp_Object rgb; |
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 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1328 return 0; |
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 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
|
1331 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1332 rgb = XCDR (XCDR (color_desc)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1333 if (! parse_rgb_list (rgb, tty_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1334 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1335 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1336 /* Should we fill in STD_COLOR too? */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1337 if (std_color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1338 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1339 /* 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
|
1340 *std_color = *tty_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1341 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1342 /* 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
|
1343 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
|
1344 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
|
1345 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
|
1346 if ((!STRINGP (XCAR (color_desc)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1347 || 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
|
1348 && !NILP (Ffboundp (Qtty_color_standard_values))) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1349 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1350 /* Look up STD_COLOR separately. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1351 rgb = call1 (Qtty_color_standard_values, color); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1352 if (! parse_rgb_list (rgb, std_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1353 return 0; |
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 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1356 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1357 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1358 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1359 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
|
1360 /* 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
|
1361 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
|
1362 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
|
1363 load color" messages in the *Messages* buffer. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1364 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1365 else |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1366 /* 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
|
1367 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1368 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1369 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1370 /* 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
|
1371 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1372 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1373 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
|
1374 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1375 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1376 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1377 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1378 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1379 int status = 1; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1380 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1381 /* Defaults. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1382 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
|
1383 color_def->red = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1384 color_def->blue = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1385 color_def->green = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1386 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1387 if (*color_name) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1388 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
|
1389 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1390 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
|
1391 { |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1392 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
|
1393 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
|
1394 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
|
1395 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
|
1396 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1397 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1398 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
|
1399 status = 1; |
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1400 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1401 return status; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1402 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1403 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1404 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1405 /* 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
|
1406 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
|
1407 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
|
1408 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1409 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
|
1410 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1411 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1412 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
|
1413 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1414 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1415 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1416 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1417 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1418 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
|
1419 return tty_defined_color (f, color_name, color_def, alloc); |
24995 | 1420 #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
|
1421 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
|
1422 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
|
1423 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1424 #ifdef WINDOWSNT |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1425 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
|
1426 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
|
1427 #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
|
1428 #ifdef MAC_OS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1429 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
|
1430 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
|
1431 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1432 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1433 abort (); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1434 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1435 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1436 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1437 /* 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
|
1438 Lisp string. */ |
26729
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 Lisp_Object |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1441 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
|
1442 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1443 int idx; |
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 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
|
1446 { |
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1447 Lisp_Object frame; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1448 Lisp_Object coldesc; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1449 |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1450 XSETFRAME (frame, f); |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1451 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
|
1452 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1453 if (!NILP (coldesc)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1454 return XCAR (coldesc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1455 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1456 #ifdef MSDOS |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1457 /* 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
|
1458 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
|
1459 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
|
1460 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
|
1461 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1462 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1463 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1464 return build_string (unspecified_fg); |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1465 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1466 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
|
1467 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1468 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1469 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
|
1470 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1471 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1472 return Qunspecified; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1473 } |
24995 | 1474 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1475 |
24995 | 1476 /* Return non-zero if COLOR_NAME is a shade of gray (or white or |
1477 black) on frame F. The algorithm is taken from 20.2 faces.el. */ | |
1478 | |
1479 static int | |
1480 face_color_gray_p (f, color_name) | |
1481 struct frame *f; | |
1482 char *color_name; | |
1483 { | |
1484 XColor color; | |
1485 int gray_p; | |
1486 | |
1487 if (defined_color (f, color_name, &color, 0)) | |
1488 gray_p = ((abs (color.red - color.green) | |
1489 < max (color.red, color.green) / 20) | |
1490 && (abs (color.green - color.blue) | |
1491 < max (color.green, color.blue) / 20) | |
1492 && (abs (color.blue - color.red) | |
1493 < max (color.blue, color.red) / 20)); | |
1494 else | |
1495 gray_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1496 |
24995 | 1497 return gray_p; |
1498 } | |
1499 | |
1500 | |
1501 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
1502 BACKGROUND_P non-zero means the color will be used as background | |
1503 color. */ | |
1504 | |
1505 static int | |
1506 face_color_supported_p (f, color_name, background_p) | |
1507 struct frame *f; | |
1508 char *color_name; | |
1509 int background_p; | |
1510 { | |
1511 Lisp_Object frame; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1512 XColor not_used; |
24995 | 1513 |
1514 XSETFRAME (frame, f); | |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1515 return |
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1516 #ifdef HAVE_WINDOW_SYSTEM |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1517 FRAME_WINDOW_P (f) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1518 ? (!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
|
1519 || xstricmp (color_name, "black") == 0 |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1520 || xstricmp (color_name, "white") == 0 |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1521 || (background_p |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1522 && 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
|
1523 || (!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
|
1524 && 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
|
1525 : |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1526 #endif |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1527 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
|
1528 } |
24995 | 1529 |
1530 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1531 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
|
1532 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
|
1533 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
|
1534 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
|
1535 (color, frame) |
24995 | 1536 Lisp_Object color, frame; |
1537 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1538 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1539 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1540 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1541 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1542 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1543 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1544 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1545 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
|
1546 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
24995 | 1547 } |
1548 | |
1549 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1550 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
|
1551 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
|
1552 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
|
1553 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
|
1554 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
|
1555 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
|
1556 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
|
1557 (color, frame, background_p) |
24995 | 1558 Lisp_Object frame, color, background_p; |
1559 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1560 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1561 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1562 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1563 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1564 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1565 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1566 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1567 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
|
1568 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
24995 | 1569 return Qt; |
1570 return Qnil; | |
1571 } | |
1572 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1573 |
24995 | 1574 /* Load color with name NAME for use by face FACE on frame F. |
1575 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
1576 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
1577 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
1578 pixel color. If color cannot be loaded, display a message, and | |
1579 return the foreground, background or underline color of F, but | |
1580 record that fact in flags of the face so that we don't try to free | |
1581 these colors. */ | |
1582 | |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1583 unsigned long |
24995 | 1584 load_color (f, face, name, target_index) |
1585 struct frame *f; | |
1586 struct face *face; | |
1587 Lisp_Object name; | |
1588 enum lface_attribute_index target_index; | |
1589 { | |
1590 XColor color; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1591 |
24995 | 1592 xassert (STRINGP (name)); |
1593 xassert (target_index == LFACE_FOREGROUND_INDEX | |
1594 || target_index == LFACE_BACKGROUND_INDEX | |
1595 || target_index == LFACE_UNDERLINE_INDEX | |
1596 || target_index == LFACE_OVERLINE_INDEX | |
1597 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
1598 || target_index == LFACE_BOX_INDEX); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1599 |
24995 | 1600 /* if the color map is full, defined_color will return a best match |
1601 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
|
1602 if (!defined_color (f, SDATA (name), &color, 1)) |
24995 | 1603 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1604 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
|
1605 |
24995 | 1606 switch (target_index) |
1607 { | |
1608 case LFACE_FOREGROUND_INDEX: | |
1609 face->foreground_defaulted_p = 1; | |
1610 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1611 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1612 |
24995 | 1613 case LFACE_BACKGROUND_INDEX: |
1614 face->background_defaulted_p = 1; | |
1615 color.pixel = FRAME_BACKGROUND_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_UNDERLINE_INDEX: |
1619 face->underline_defaulted_p = 1; | |
1620 color.pixel = FRAME_FOREGROUND_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_OVERLINE_INDEX: |
1624 face->overline_color_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_STRIKE_THROUGH_INDEX: |
1629 face->strike_through_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_BOX_INDEX: |
1634 face->box_color_defaulted_p = 1; | |
1635 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1636 break; | |
1637 | |
1638 default: | |
1639 abort (); | |
1640 } | |
1641 } | |
1642 #if GLYPH_DEBUG | |
1643 else | |
1644 ++ncolors_allocated; | |
1645 #endif | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1646 |
24995 | 1647 return color.pixel; |
1648 } | |
1649 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1650 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1651 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1652 |
1653 /* Load colors for face FACE which is used on frame F. Colors are | |
1654 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
1655 of ATTRS. If the background color specified is not supported on F, | |
1656 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
1657 | |
1658 static void | |
1659 load_face_colors (f, face, attrs) | |
1660 struct frame *f; | |
1661 struct face *face; | |
1662 Lisp_Object *attrs; | |
1663 { | |
1664 Lisp_Object fg, bg; | |
1665 | |
1666 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
1667 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
1668 | |
1669 /* Swap colors if face is inverse-video. */ | |
1670 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
1671 { | |
1672 Lisp_Object tmp; | |
1673 tmp = fg; | |
1674 fg = bg; | |
1675 bg = tmp; | |
1676 } | |
1677 | |
1678 /* Check for support for foreground, not for background because | |
1679 face_color_supported_p is smart enough to know that grays are | |
1680 "supported" as background because we are supposed to use stipple | |
1681 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
|
1682 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
|
1683 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
24995 | 1684 { |
1685 x_destroy_bitmap (f, face->stipple); | |
1686 face->stipple = load_pixmap (f, Vface_default_stipple, | |
1687 &face->pixmap_w, &face->pixmap_h); | |
1688 } | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1689 |
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1690 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
24995 | 1691 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
1692 } | |
1693 | |
1694 | |
1695 /* Free color PIXEL on frame F. */ | |
1696 | |
1697 void | |
1698 unload_color (f, pixel) | |
1699 struct frame *f; | |
1700 unsigned long pixel; | |
1701 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1702 #ifdef HAVE_X_WINDOWS |
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1703 if (pixel != -1) |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1704 { |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1705 BLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1706 x_free_colors (f, &pixel, 1); |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1707 UNBLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1708 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1709 #endif |
24995 | 1710 } |
1711 | |
1712 | |
1713 /* Free colors allocated for FACE. */ | |
1714 | |
1715 static void | |
1716 free_face_colors (f, face) | |
1717 struct frame *f; | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1718 struct face *face; |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1719 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1720 #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
|
1721 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
|
1722 return; |
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1723 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1724 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1725 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1726 if (!face->foreground_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1727 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1728 x_free_colors (f, &face->foreground, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1729 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1730 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1731 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1732 if (!face->background_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1733 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1734 x_free_colors (f, &face->background, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1735 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1736 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1737 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1738 if (face->underline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1739 && !face->underline_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1740 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1741 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
|
1742 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1743 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1744 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1745 if (face->overline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1746 && !face->overline_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1747 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1748 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
|
1749 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1750 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1751 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1752 if (face->strike_through_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1753 && !face->strike_through_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1754 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1755 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
|
1756 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1757 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1758 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1759 if (face->box != FACE_NO_BOX |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1760 && !face->box_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1761 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1762 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
|
1763 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1764 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1765 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1766 UNBLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1767 #endif /* HAVE_X_WINDOWS */ |
24995 | 1768 } |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1769 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1770 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1771 |
1772 | |
1773 | |
1774 /*********************************************************************** | |
1775 XLFD Font Names | |
1776 ***********************************************************************/ | |
1777 | |
1778 /* An enumerator for each field of an XLFD font name. */ | |
1779 | |
1780 enum xlfd_field | |
1781 { | |
1782 XLFD_FOUNDRY, | |
1783 XLFD_FAMILY, | |
1784 XLFD_WEIGHT, | |
1785 XLFD_SLANT, | |
1786 XLFD_SWIDTH, | |
1787 XLFD_ADSTYLE, | |
1788 XLFD_PIXEL_SIZE, | |
1789 XLFD_POINT_SIZE, | |
1790 XLFD_RESX, | |
1791 XLFD_RESY, | |
1792 XLFD_SPACING, | |
1793 XLFD_AVGWIDTH, | |
1794 XLFD_REGISTRY, | |
1795 XLFD_ENCODING, | |
1796 XLFD_LAST | |
1797 }; | |
1798 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1799 /* An enumerator for each possible slant value of a font. Taken from |
24995 | 1800 the XLFD specification. */ |
1801 | |
1802 enum xlfd_slant | |
1803 { | |
1804 XLFD_SLANT_UNKNOWN, | |
1805 XLFD_SLANT_ROMAN, | |
1806 XLFD_SLANT_ITALIC, | |
1807 XLFD_SLANT_OBLIQUE, | |
1808 XLFD_SLANT_REVERSE_ITALIC, | |
1809 XLFD_SLANT_REVERSE_OBLIQUE, | |
1810 XLFD_SLANT_OTHER | |
1811 }; | |
1812 | |
1813 /* Relative font weight according to XLFD documentation. */ | |
1814 | |
1815 enum xlfd_weight | |
1816 { | |
1817 XLFD_WEIGHT_UNKNOWN, | |
1818 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
1819 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
1820 XLFD_WEIGHT_LIGHT, /* 30 */ | |
1821 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
1822 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1823 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
1824 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
1825 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
1826 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
1827 }; | |
1828 | |
1829 /* Relative proportionate width. */ | |
1830 | |
1831 enum xlfd_swidth | |
1832 { | |
1833 XLFD_SWIDTH_UNKNOWN, | |
1834 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
1835 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
1836 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
1837 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
1838 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1839 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
1840 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
1841 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
1842 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
1843 }; | |
1844 | |
1845 /* Structure used for tables mapping XLFD weight, slant, and width | |
1846 names to numeric and symbolic values. */ | |
1847 | |
1848 struct table_entry | |
1849 { | |
1850 char *name; | |
1851 int numeric; | |
1852 Lisp_Object *symbol; | |
1853 }; | |
1854 | |
1855 /* Table of XLFD slant names and their numeric and symbolic | |
1856 representations. This table must be sorted by slant names in | |
1857 ascending order. */ | |
1858 | |
1859 static struct table_entry slant_table[] = | |
1860 { | |
1861 {"i", XLFD_SLANT_ITALIC, &Qitalic}, | |
1862 {"o", XLFD_SLANT_OBLIQUE, &Qoblique}, | |
1863 {"ot", XLFD_SLANT_OTHER, &Qitalic}, | |
1864 {"r", XLFD_SLANT_ROMAN, &Qnormal}, | |
1865 {"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic}, | |
1866 {"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique} | |
1867 }; | |
1868 | |
1869 /* Table of XLFD weight names. This table must be sorted by weight | |
1870 names in ascending order. */ | |
1871 | |
1872 static struct table_entry weight_table[] = | |
1873 { | |
1874 {"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold}, | |
1875 {"bold", XLFD_WEIGHT_BOLD, &Qbold}, | |
1876 {"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
|
1877 {"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
24995 | 1878 {"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, |
1879 {"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light}, | |
1880 {"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
1881 {"heavy", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold}, | |
1882 {"light", XLFD_WEIGHT_LIGHT, &Qlight}, | |
1883 {"medium", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1884 {"normal", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1885 {"regular", XLFD_WEIGHT_MEDIUM, &Qnormal}, | |
1886 {"semibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold}, | |
1887 {"semilight", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light}, | |
1888 {"ultralight", XLFD_WEIGHT_ULTRA_LIGHT, &Qultra_light}, | |
1889 {"ultrabold", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold} | |
1890 }; | |
1891 | |
1892 /* Table of XLFD width names. This table must be sorted by width | |
1893 names in ascending order. */ | |
1894 | |
1895 static struct table_entry swidth_table[] = | |
1896 { | |
1897 {"compressed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1898 {"condensed", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1899 {"demiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
1900 {"expanded", XLFD_SWIDTH_EXPANDED, &Qexpanded}, | |
1901 {"extracondensed", XLFD_SWIDTH_EXTRA_CONDENSED, &Qextra_condensed}, | |
1902 {"extraexpanded", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded}, | |
1903 {"medium", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1904 {"narrow", XLFD_SWIDTH_CONDENSED, &Qcondensed}, | |
1905 {"normal", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1906 {"regular", XLFD_SWIDTH_MEDIUM, &Qnormal}, | |
1907 {"semicondensed", XLFD_SWIDTH_SEMI_CONDENSED, &Qsemi_condensed}, | |
1908 {"semiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded}, | |
1909 {"ultracondensed", XLFD_SWIDTH_ULTRA_CONDENSED, &Qultra_condensed}, | |
1910 {"ultraexpanded", XLFD_SWIDTH_ULTRA_EXPANDED, &Qultra_expanded}, | |
1911 {"wide", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded} | |
1912 }; | |
1913 | |
1914 /* Structure used to hold the result of splitting font names in XLFD | |
1915 format into their fields. */ | |
1916 | |
1917 struct font_name | |
1918 { | |
1919 /* The original name which is modified destructively by | |
1920 split_font_name. The pointer is kept here to be able to free it | |
1921 if it was allocated from the heap. */ | |
1922 char *name; | |
1923 | |
1924 /* Font name fields. Each vector element points into `name' above. | |
1925 Fields are NUL-terminated. */ | |
1926 char *fields[XLFD_LAST]; | |
1927 | |
1928 /* Numeric values for those fields that interest us. See | |
1929 split_font_name for which these are. */ | |
1930 int numeric[XLFD_LAST]; | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1931 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1932 /* 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
|
1933 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
|
1934 value is 1.0. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1935 double rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
1936 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1937 /* Lower value mean higher priority. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
1938 int registry_priority; |
24995 | 1939 }; |
1940 | |
1941 /* The frame in effect when sorting font names. Set temporarily in | |
1942 sort_fonts so that it is available in font comparison functions. */ | |
1943 | |
1944 static struct frame *font_frame; | |
1945 | |
1946 /* Order by which font selection chooses fonts. The default values | |
1947 mean `first, find a best match for the font width, then for the | |
1948 font height, then for weight, then for slant.' This variable can be | |
1949 set via set-face-font-sort-order. */ | |
1950 | |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44705
diff
changeset
|
1951 #ifdef MAC_OS |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1952 static int font_sort_order[4] = { |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1953 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
|
1954 }; |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
1955 #else |
24995 | 1956 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
|
1957 #endif |
24995 | 1958 |
1959 /* Look up FONT.fields[FIELD_INDEX] in TABLE which has DIM entries. | |
1960 TABLE must be sorted by TABLE[i]->name in ascending order. Value | |
1961 is a pointer to the matching table entry or null if no table entry | |
1962 matches. */ | |
1963 | |
1964 static struct table_entry * | |
1965 xlfd_lookup_field_contents (table, dim, font, field_index) | |
1966 struct table_entry *table; | |
1967 int dim; | |
1968 struct font_name *font; | |
1969 int field_index; | |
1970 { | |
1971 /* Function split_font_name converts fields to lower-case, so there | |
1972 is no need to use xstrlwr or xstricmp here. */ | |
1973 char *s = font->fields[field_index]; | |
1974 int low, mid, high, cmp; | |
1975 | |
1976 low = 0; | |
1977 high = dim - 1; | |
1978 | |
1979 while (low <= high) | |
1980 { | |
1981 mid = (low + high) / 2; | |
1982 cmp = strcmp (table[mid].name, s); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1983 |
24995 | 1984 if (cmp < 0) |
1985 low = mid + 1; | |
1986 else if (cmp > 0) | |
1987 high = mid - 1; | |
1988 else | |
1989 return table + mid; | |
1990 } | |
1991 | |
1992 return NULL; | |
1993 } | |
1994 | |
1995 | |
1996 /* Return a numeric representation for font name field | |
1997 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
1998 has DIM entries. Value is the numeric value found or DFLT if no | |
1999 table entry matches. This function is used to translate weight, | |
2000 slant, and swidth names of XLFD font names to numeric values. */ | |
2001 | |
2002 static INLINE int | |
2003 xlfd_numeric_value (table, dim, font, field_index, dflt) | |
2004 struct table_entry *table; | |
2005 int dim; | |
2006 struct font_name *font; | |
2007 int field_index; | |
2008 int dflt; | |
2009 { | |
2010 struct table_entry *p; | |
2011 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
2012 return p ? p->numeric : dflt; | |
2013 } | |
2014 | |
2015 | |
2016 /* Return a symbolic representation for font name field | |
2017 FONT.fields[FIELD_INDEX]. The field is looked up in TABLE which | |
2018 has DIM entries. Value is the symbolic value found or DFLT if no | |
2019 table entry matches. This function is used to translate weight, | |
2020 slant, and swidth names of XLFD font names to symbols. */ | |
2021 | |
2022 static INLINE Lisp_Object | |
2023 xlfd_symbolic_value (table, dim, font, field_index, dflt) | |
2024 struct table_entry *table; | |
2025 int dim; | |
2026 struct font_name *font; | |
2027 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
|
2028 Lisp_Object dflt; |
24995 | 2029 { |
2030 struct table_entry *p; | |
2031 p = xlfd_lookup_field_contents (table, dim, font, field_index); | |
2032 return p ? *p->symbol : dflt; | |
2033 } | |
2034 | |
2035 | |
2036 /* Return a numeric value for the slant of the font given by FONT. */ | |
2037 | |
2038 static INLINE int | |
2039 xlfd_numeric_slant (font) | |
2040 struct font_name *font; | |
2041 { | |
2042 return xlfd_numeric_value (slant_table, DIM (slant_table), | |
2043 font, XLFD_SLANT, XLFD_SLANT_ROMAN); | |
2044 } | |
2045 | |
2046 | |
2047 /* Return a symbol representing the weight of the font given by FONT. */ | |
2048 | |
2049 static INLINE Lisp_Object | |
2050 xlfd_symbolic_slant (font) | |
2051 struct font_name *font; | |
2052 { | |
2053 return xlfd_symbolic_value (slant_table, DIM (slant_table), | |
2054 font, XLFD_SLANT, Qnormal); | |
2055 } | |
2056 | |
2057 | |
2058 /* Return a numeric value for the weight of the font given by FONT. */ | |
2059 | |
2060 static INLINE int | |
2061 xlfd_numeric_weight (font) | |
2062 struct font_name *font; | |
2063 { | |
2064 return xlfd_numeric_value (weight_table, DIM (weight_table), | |
2065 font, XLFD_WEIGHT, XLFD_WEIGHT_MEDIUM); | |
2066 } | |
2067 | |
2068 | |
2069 /* Return a symbol representing the slant of the font given by FONT. */ | |
2070 | |
2071 static INLINE Lisp_Object | |
2072 xlfd_symbolic_weight (font) | |
2073 struct font_name *font; | |
2074 { | |
2075 return xlfd_symbolic_value (weight_table, DIM (weight_table), | |
2076 font, XLFD_WEIGHT, Qnormal); | |
2077 } | |
2078 | |
2079 | |
2080 /* Return a numeric value for the swidth of the font whose XLFD font | |
2081 name fields are found in FONT. */ | |
2082 | |
2083 static INLINE int | |
2084 xlfd_numeric_swidth (font) | |
2085 struct font_name *font; | |
2086 { | |
2087 return xlfd_numeric_value (swidth_table, DIM (swidth_table), | |
2088 font, XLFD_SWIDTH, XLFD_SWIDTH_MEDIUM); | |
2089 } | |
2090 | |
2091 | |
2092 /* Return a symbolic value for the swidth of FONT. */ | |
2093 | |
2094 static INLINE Lisp_Object | |
2095 xlfd_symbolic_swidth (font) | |
2096 struct font_name *font; | |
2097 { | |
2098 return xlfd_symbolic_value (swidth_table, DIM (swidth_table), | |
2099 font, XLFD_SWIDTH, Qnormal); | |
2100 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2101 |
24995 | 2102 |
2103 /* Look up the entry of SYMBOL in the vector TABLE which has DIM | |
2104 entries. Value is a pointer to the matching table entry or null if | |
2105 no element of TABLE contains SYMBOL. */ | |
2106 | |
2107 static struct table_entry * | |
2108 face_value (table, dim, symbol) | |
2109 struct table_entry *table; | |
2110 int dim; | |
2111 Lisp_Object symbol; | |
2112 { | |
2113 int i; | |
2114 | |
2115 xassert (SYMBOLP (symbol)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2116 |
24995 | 2117 for (i = 0; i < dim; ++i) |
2118 if (EQ (*table[i].symbol, symbol)) | |
2119 break; | |
2120 | |
2121 return i < dim ? table + i : NULL; | |
2122 } | |
2123 | |
2124 | |
2125 /* Return a numeric value for SYMBOL in the vector TABLE which has DIM | |
2126 entries. Value is -1 if SYMBOL is not found in TABLE. */ | |
2127 | |
2128 static INLINE int | |
2129 face_numeric_value (table, dim, symbol) | |
2130 struct table_entry *table; | |
2131 int dim; | |
2132 Lisp_Object symbol; | |
2133 { | |
2134 struct table_entry *p = face_value (table, dim, symbol); | |
2135 return p ? p->numeric : -1; | |
2136 } | |
2137 | |
2138 | |
2139 /* Return a numeric value representing the weight specified by Lisp | |
2140 symbol WEIGHT. Value is one of the enumerators of enum | |
2141 xlfd_weight. */ | |
2142 | |
2143 static INLINE int | |
2144 face_numeric_weight (weight) | |
2145 Lisp_Object weight; | |
2146 { | |
2147 return face_numeric_value (weight_table, DIM (weight_table), weight); | |
2148 } | |
2149 | |
2150 | |
2151 /* Return a numeric value representing the slant specified by Lisp | |
2152 symbol SLANT. Value is one of the enumerators of enum xlfd_slant. */ | |
2153 | |
2154 static INLINE int | |
2155 face_numeric_slant (slant) | |
2156 Lisp_Object slant; | |
2157 { | |
2158 return face_numeric_value (slant_table, DIM (slant_table), slant); | |
2159 } | |
2160 | |
2161 | |
2162 /* Return a numeric value representing the swidth specified by Lisp | |
2163 symbol WIDTH. Value is one of the enumerators of enum xlfd_swidth. */ | |
2164 | |
2165 static int | |
2166 face_numeric_swidth (width) | |
2167 Lisp_Object width; | |
2168 { | |
2169 return face_numeric_value (swidth_table, DIM (swidth_table), width); | |
2170 } | |
2171 | |
2172 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2173 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 2174 |
2175 /* Return non-zero if FONT is the name of a fixed-pitch font. */ | |
2176 | |
2177 static INLINE int | |
2178 xlfd_fixed_p (font) | |
2179 struct font_name *font; | |
2180 { | |
2181 /* Function split_font_name converts fields to lower-case, so there | |
2182 is no need to use tolower here. */ | |
2183 return *font->fields[XLFD_SPACING] != 'p'; | |
2184 } | |
2185 | |
2186 | |
2187 /* Return the point size of FONT on frame F, measured in 1/10 pt. | |
2188 | |
2189 The actual height of the font when displayed on F depends on the | |
2190 resolution of both the font and frame. For example, a 10pt font | |
2191 designed for a 100dpi display will display larger than 10pt on a | |
2192 75dpi display. (It's not unusual to use fonts not designed for the | |
2193 display one is using. For example, some intlfonts are available in | |
2194 72dpi versions, only.) | |
2195 | |
2196 Value is the real point size of FONT on frame F, or 0 if it cannot | |
2197 be determined. */ | |
2198 | |
2199 static INLINE int | |
2200 xlfd_point_size (f, font) | |
2201 struct frame *f; | |
2202 struct font_name *font; | |
2203 { | |
2204 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
|
2205 char *pixel_field = font->fields[XLFD_PIXEL_SIZE]; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2206 double pixel; |
24995 | 2207 int real_pt; |
2208 | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2209 if (*pixel_field == '[') |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2210 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2211 /* 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
|
2212 a transformation matrix. |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2213 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2214 A B 0 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2215 C D 0 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2216 0 0 1 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2217 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2218 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
|
2219 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
|
2220 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
|
2221 char *start = pixel_field + 1, *end; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2222 double matrix[4]; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2223 int i; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2224 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2225 for (i = 0; i < 4; ++i) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2226 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2227 matrix[i] = strtod (start, &end); |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2228 start = end; |
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 |
37798
d4b4c850abc0
(xlfd_point_size): Don't divide pixel size from
Gerd Moellmann <gerd@gnu.org>
parents:
37756
diff
changeset
|
2231 pixel = matrix[3]; |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2232 } |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2233 else |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2234 pixel = atoi (pixel_field); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2235 |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2236 if (pixel == 0) |
24995 | 2237 real_pt = 0; |
2238 else | |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2239 real_pt = PT_PER_INCH * 10.0 * pixel / resy + 0.5; |
24995 | 2240 |
2241 return real_pt; | |
2242 } | |
2243 | |
2244 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2245 /* 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
|
2246 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
|
2247 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
|
2248 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2249 static INLINE int |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2250 pixel_point_size (f, pixel) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2251 struct frame *f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2252 int pixel; |
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 double resy = FRAME_X_DISPLAY_INFO (f)->resy; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2255 double real_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2256 int int_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2257 |
34882 | 2258 /* As one inch is PT_PER_INCH points, PT_PER_INCH/RESY gives the |
2259 point size of one dot. */ | |
2260 real_pt = pixel * PT_PER_INCH / resy; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2261 int_pt = real_pt + 0.5; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2262 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2263 return int_pt; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2264 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2265 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2266 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2267 /* 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
|
2268 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2269 static double |
51401
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2270 font_rescale_ratio (name) |
bcf91e20f6a2
(font_rescale_ratio): Fix for K&R.
Dave Love <fx@gnu.org>
parents:
51315
diff
changeset
|
2271 char *name; |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2272 { |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2273 Lisp_Object tail, elt; |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2274 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2275 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
|
2276 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2277 elt = XCAR (tail); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2278 if (STRINGP (XCAR (elt)) && FLOATP (XCDR (elt)) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2279 && 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
|
2280 return XFLOAT_DATA (XCDR (elt)); |
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 return 1.0; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2283 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2284 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2285 |
24995 | 2286 /* Split XLFD font name FONT->name destructively into NUL-terminated, |
2287 lower-case fields in FONT->fields. NUMERIC_P non-zero means | |
2288 compute numeric values for fields XLFD_POINT_SIZE, XLFD_SWIDTH, | |
2289 XLFD_RESY, XLFD_SLANT, and XLFD_WEIGHT in FONT->numeric. Value is | |
2290 zero if the font name doesn't have the format we expect. The | |
2291 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
|
2292 XLFD_LAST fields separated by `-'. */ |
24995 | 2293 |
2294 static int | |
2295 split_font_name (f, font, numeric_p) | |
2296 struct frame *f; | |
2297 struct font_name *font; | |
2298 int numeric_p; | |
2299 { | |
2300 int i = 0; | |
2301 int success_p; | |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2302 double rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2303 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2304 if (numeric_p) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
2305 /* 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
|
2306 rescale_ratio = font_rescale_ratio (font->name); |
24995 | 2307 |
2308 if (*font->name == '-') | |
2309 { | |
2310 char *p = xstrlwr (font->name) + 1; | |
2311 | |
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2312 while (i < XLFD_LAST) |
24995 | 2313 { |
2314 font->fields[i] = p; | |
37716
018b29727e8d
(split_font_name): Make sure to leave the loop
Gerd Moellmann <gerd@gnu.org>
parents:
37714
diff
changeset
|
2315 ++i; |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2316 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2317 /* 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
|
2318 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
|
2319 indicated by tilde characters which we replace with |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2320 `-' characters, here. */ |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2321 if (*p == '[' |
37736
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2322 && (i - 1 == XLFD_PIXEL_SIZE |
d6f944b128c4
(split_font_name): Handle `[...]' for the right
Gerd Moellmann <gerd@gnu.org>
parents:
37724
diff
changeset
|
2323 || i - 1 == XLFD_POINT_SIZE)) |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2324 { |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2325 char *start, *end; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2326 int j; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2327 |
37714
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2328 for (++p; *p && *p != ']'; ++p) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2329 if (*p == '~') |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2330 *p = '-'; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2331 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2332 /* Check that the matrix contains 4 floating point |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2333 numbers. */ |
37756
2cea00ea4d76
(split_font_name): Use the right field when
Gerd Moellmann <gerd@gnu.org>
parents:
37736
diff
changeset
|
2334 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
|
2335 j < 4; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2336 ++j, start = end) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2337 if (strtod (start, &end) == 0 && start == end) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2338 break; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2339 |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2340 if (j < 4) |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2341 break; |
cf79e6de9752
(split_font_name): Handle matrix transformations
Gerd Moellmann <gerd@gnu.org>
parents:
37700
diff
changeset
|
2342 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2343 |
24995 | 2344 while (*p && *p != '-') |
2345 ++p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2346 |
24995 | 2347 if (*p != '-') |
2348 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2349 |
24995 | 2350 *p++ = 0; |
2351 } | |
2352 } | |
2353 | |
2354 success_p = i == XLFD_LAST; | |
2355 | |
2356 /* If requested, and font name was in the expected format, | |
2357 compute numeric values for some fields. */ | |
2358 if (numeric_p && success_p) | |
2359 { | |
2360 font->numeric[XLFD_POINT_SIZE] = xlfd_point_size (f, font); | |
2361 font->numeric[XLFD_RESY] = atoi (font->fields[XLFD_RESY]); | |
2362 font->numeric[XLFD_SLANT] = xlfd_numeric_slant (font); | |
2363 font->numeric[XLFD_WEIGHT] = xlfd_numeric_weight (font); | |
2364 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
|
2365 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
|
2366 font->rescale_ratio = rescale_ratio; |
24995 | 2367 } |
2368 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2369 /* 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
|
2370 trying alternate registries. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2371 font->registry_priority = 0; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2372 |
24995 | 2373 return success_p; |
2374 } | |
2375 | |
2376 | |
2377 /* Build an XLFD font name from font name fields in FONT. Value is a | |
2378 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
|
2379 |
24995 | 2380 static char * |
2381 build_font_name (font) | |
2382 struct font_name *font; | |
2383 { | |
2384 int i; | |
2385 int size = 100; | |
2386 char *font_name = (char *) xmalloc (size); | |
2387 int total_length = 0; | |
2388 | |
2389 for (i = 0; i < XLFD_LAST; ++i) | |
2390 { | |
2391 /* Add 1 because of the leading `-'. */ | |
2392 int len = strlen (font->fields[i]) + 1; | |
2393 | |
2394 /* Reallocate font_name if necessary. Add 1 for the final | |
2395 NUL-byte. */ | |
2396 if (total_length + len + 1 >= size) | |
2397 { | |
2398 int new_size = max (2 * size, size + len + 1); | |
2399 int sz = new_size * sizeof *font_name; | |
2400 font_name = (char *) xrealloc (font_name, sz); | |
2401 size = new_size; | |
2402 } | |
2403 | |
2404 font_name[total_length] = '-'; | |
2405 bcopy (font->fields[i], font_name + total_length + 1, len - 1); | |
2406 total_length += len; | |
2407 } | |
2408 | |
2409 font_name[total_length] = 0; | |
2410 return font_name; | |
2411 } | |
2412 | |
2413 | |
2414 /* Free an array FONTS of N font_name structures. This frees FONTS | |
2415 itself and all `name' fields in its elements. */ | |
2416 | |
2417 static INLINE void | |
2418 free_font_names (fonts, n) | |
2419 struct font_name *fonts; | |
2420 int n; | |
2421 { | |
2422 while (n) | |
2423 xfree (fonts[--n].name); | |
2424 xfree (fonts); | |
2425 } | |
2426 | |
2427 | |
2428 /* Sort vector FONTS of font_name structures which contains NFONTS | |
2429 elements using qsort and comparison function CMPFN. F is the frame | |
2430 on which the fonts will be used. The global variable font_frame | |
2431 is temporarily set to F to make it available in CMPFN. */ | |
2432 | |
2433 static INLINE void | |
2434 sort_fonts (f, fonts, nfonts, cmpfn) | |
2435 struct frame *f; | |
2436 struct font_name *fonts; | |
2437 int nfonts; | |
2438 int (*cmpfn) P_ ((const void *, const void *)); | |
2439 { | |
2440 font_frame = f; | |
2441 qsort (fonts, nfonts, sizeof *fonts, cmpfn); | |
2442 font_frame = NULL; | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2443 } |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
2444 |
24995 | 2445 |
2446 /* Get fonts matching PATTERN on frame F. If F is null, use the first | |
2447 display in x_display_list. FONTS is a pointer to a vector of | |
2448 NFONTS font_name structures. TRY_ALTERNATIVES_P non-zero means try | |
2449 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
|
2450 found matching PATTERN. |
24995 | 2451 |
2452 For all fonts found, set FONTS[i].name to the name of the font, | |
2453 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
|
2454 fonts that we can't parse. Value is the number of fonts found. */ |
24995 | 2455 |
2456 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
|
2457 x_face_list_fonts (f, pattern, pfonts, nfonts, try_alternatives_p) |
24995 | 2458 struct frame *f; |
2459 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
|
2460 struct font_name **pfonts; |
24995 | 2461 int nfonts, try_alternatives_p; |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2462 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2463 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
|
2464 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2465 /* 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
|
2466 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
|
2467 Lisp_Object lfonts; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2468 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
|
2469 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
|
2470 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
|
2471 |
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
|
2472 *pfonts = 0; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2473 lpattern = build_string (pattern); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2474 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2475 /* 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
|
2476 #ifdef WINDOWSNT |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2477 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2478 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
|
2479 UNBLOCK_INPUT; |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2480 #else |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2481 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
|
2482 #endif |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2483 |
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
|
2484 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
|
2485 num_fonts = XFASTINT (Flength (lfonts)); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
2486 |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2487 /* 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
|
2488 split them into fields. */ |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2489 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
|
2490 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
|
2491 { |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2492 Lisp_Object elt, tail; |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
2493 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
|
2494 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2495 /* 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
|
2496 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail)) |
24995 | 2497 { |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2498 elt = XCAR (tail); |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2499 if (STRINGP (elt) |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2500 && 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
|
2501 break; |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2502 } |
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2503 if (!NILP (tail)) |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2504 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2505 ++nignored; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2506 continue; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2507 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2508 |
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
|
2509 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
|
2510 { |
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
|
2511 *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
|
2512 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
|
2513 } |
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 |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2515 /* 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
|
2516 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
|
2517 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2518 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
|
2519 { |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2520 if (font_scalable_p (fonts + n) |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2521 && !may_use_scalable_font_p (name)) |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2522 { |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2523 ++nignored; |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2524 xfree (fonts[n].name); |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2525 } |
24995 | 2526 else |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2527 ++n; |
24995 | 2528 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
2529 else |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2530 xfree (fonts[n].name); |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2531 } |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
2532 |
24995 | 2533 /* If no fonts found, try patterns from Valternate_fontname_alist. */ |
2534 if (n == 0 && try_alternatives_p) | |
2535 { | |
2536 Lisp_Object list = Valternate_fontname_alist; | |
2537 | |
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
|
2538 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
|
2539 { |
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
|
2540 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
|
2541 *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
|
2542 } |
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 |
24995 | 2544 while (CONSP (list)) |
2545 { | |
2546 Lisp_Object entry = XCAR (list); | |
2547 if (CONSP (entry) | |
2548 && 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
|
2549 && strcmp (SDATA (XCAR (entry)), pattern) == 0) |
24995 | 2550 break; |
2551 list = XCDR (list); | |
2552 } | |
2553 | |
2554 if (CONSP (list)) | |
2555 { | |
2556 Lisp_Object patterns = XCAR (list); | |
2557 Lisp_Object name; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2558 |
24995 | 2559 while (CONSP (patterns) |
2560 /* If list is screwed up, give up. */ | |
2561 && (name = XCAR (patterns), | |
2562 STRINGP (name)) | |
2563 /* Ignore patterns equal to PATTERN because we tried that | |
2564 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
|
2565 && (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
|
2566 || (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
|
2567 pfonts, nfonts, 0), |
24995 | 2568 n == 0))) |
2569 patterns = XCDR (patterns); | |
2570 } | |
2571 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2572 |
24995 | 2573 return n; |
2574 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2575 |
24995 | 2576 |
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2577 /* 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
|
2578 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
|
2579 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
|
2580 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2581 int |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2582 face_font_available_p (f, pattern) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2583 struct frame *f; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2584 Lisp_Object pattern; |
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 Lisp_Object fonts; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2587 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2588 if (! STRINGP (pattern)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2589 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2590 Lisp_Object family, registry; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2591 char *family_str, *registry_str, *pattern_str; |
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 CHECK_CONS (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2594 family = XCAR (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2595 if (NILP (family)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2596 family_str = "*"; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2597 else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2598 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2599 CHECK_STRING (family); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2600 family_str = (char *) SDATA (family); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2601 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2602 registry = XCDR (pattern); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2603 if (NILP (registry)) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2604 registry_str = "*"; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2605 else |
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 CHECK_STRING (registry); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2608 registry_str = (char *) SDATA (registry); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2609 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2610 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2611 pattern_str = (char *) alloca (strlen (family_str) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2612 + strlen (registry_str) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2613 + 10); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2614 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2615 strcat (pattern_str, family_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2616 strcat (pattern_str, "-*-"); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2617 strcat (pattern_str, registry_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2618 if (!index (registry_str, '-')) |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2619 { |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2620 if (registry_str[strlen (registry_str) - 1] == '*') |
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 else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2623 strcat (pattern_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 pattern = build_string (pattern_str); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2626 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2627 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2628 /* Get the list of fonts matching PATTERN. */ |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2629 #ifdef WINDOWSNT |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2630 BLOCK_INPUT; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2631 fonts = w32_list_fonts (f, pattern, 0, 1); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2632 UNBLOCK_INPUT; |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2633 #else |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2634 fonts = x_list_fonts (f, pattern, -1, 1); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2635 #endif |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2636 return XINT (Flength (fonts)); |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2637 } |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2638 |
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
2639 |
24995 | 2640 /* Determine fonts matching PATTERN on frame F. Sort resulting fonts |
2641 using comparison function CMPFN. Value is the number of fonts | |
2642 found. If value is non-zero, *FONTS is set to a vector of | |
2643 font_name structures allocated from the heap containing matching | |
2644 fonts. Each element of *FONTS contains a name member that is also | |
2645 allocated from the heap. Font names in these structures are split | |
2646 into fields. Use free_font_names to free such an array. */ | |
2647 | |
2648 static int | |
2649 sorted_font_list (f, pattern, cmpfn, fonts) | |
2650 struct frame *f; | |
2651 char *pattern; | |
2652 int (*cmpfn) P_ ((const void *, const void *)); | |
2653 struct font_name **fonts; | |
2654 { | |
2655 int nfonts; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2656 |
24995 | 2657 /* Get the list of fonts matching pattern. 100 should suffice. */ |
25270 | 2658 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
|
2659 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
|
2660 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
|
2661 |
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
|
2662 *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
|
2663 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
|
2664 |
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2665 /* Sort the resulting array and return it in *FONTS. If no |
24995 | 2666 fonts were found, make sure to set *FONTS to null. */ |
2667 if (nfonts) | |
2668 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
|
2669 else if (*fonts) |
24995 | 2670 { |
2671 xfree (*fonts); | |
2672 *fonts = NULL; | |
2673 } | |
2674 | |
2675 return nfonts; | |
2676 } | |
2677 | |
2678 | |
2679 /* Compare two font_name structures *A and *B. Value is analogous to | |
2680 strcmp. Sort order is given by the global variable | |
2681 font_sort_order. Font names are sorted so that, everything else | |
2682 being equal, fonts with a resolution closer to that of the frame on | |
2683 which they are used are listed first. The global variable | |
2684 font_frame is the frame on which we operate. */ | |
2685 | |
2686 static int | |
2687 cmp_font_names (a, b) | |
2688 const void *a, *b; | |
2689 { | |
2690 struct font_name *x = (struct font_name *) a; | |
2691 struct font_name *y = (struct font_name *) b; | |
2692 int cmp; | |
2693 | |
2694 /* All strings have been converted to lower-case by split_font_name, | |
2695 so we can use strcmp here. */ | |
2696 cmp = strcmp (x->fields[XLFD_FAMILY], y->fields[XLFD_FAMILY]); | |
2697 if (cmp == 0) | |
2698 { | |
2699 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2700 |
24995 | 2701 for (i = 0; i < DIM (font_sort_order) && cmp == 0; ++i) |
2702 { | |
2703 int j = font_sort_order[i]; | |
2704 cmp = x->numeric[j] - y->numeric[j]; | |
2705 } | |
2706 | |
2707 if (cmp == 0) | |
2708 { | |
2709 /* Everything else being equal, we prefer fonts with an | |
2710 y-resolution closer to that of the frame. */ | |
2711 int resy = FRAME_X_DISPLAY_INFO (font_frame)->resy; | |
2712 int x_resy = x->numeric[XLFD_RESY]; | |
2713 int y_resy = y->numeric[XLFD_RESY]; | |
2714 cmp = abs (resy - x_resy) - abs (resy - y_resy); | |
2715 } | |
2716 } | |
2717 | |
2718 return cmp; | |
2719 } | |
2720 | |
2721 | |
2722 /* 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
|
2723 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
|
2724 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
|
2725 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
|
2726 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
|
2727 Value is the number of fonts found. */ |
24995 | 2728 |
2729 static int | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2730 font_list_1 (f, pattern, family, registry, fonts) |
24995 | 2731 struct frame *f; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2732 Lisp_Object pattern, family, registry; |
24995 | 2733 struct font_name **fonts; |
2734 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2735 char *pattern_str, *family_str, *registry_str; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2736 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2737 if (NILP (pattern)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2738 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2739 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
|
2740 registry_str = (NILP (registry) ? "*" : (char *) SDATA (registry)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2741 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2742 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
|
2743 + strlen (registry_str) |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2744 + 10); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2745 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
|
2746 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
|
2747 strcat (pattern_str, "-*-"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2748 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
|
2749 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
|
2750 { |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2751 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
|
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 else |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2754 strcat (pattern_str, "*-*"); |
6f3f0ca4a359
(font_list): Handle the case that REGISTRY doesn't contain information
Kenichi Handa <handa@m17n.org>
parents:
29711
diff
changeset
|
2755 } |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2756 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2757 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2758 pattern_str = (char *) SDATA (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2759 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2760 return sorted_font_list (f, pattern_str, cmp_font_names, fonts); |
24995 | 2761 } |
2762 | |
2763 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2764 /* 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
|
2765 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
|
2766 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
|
2767 freed. */ |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2768 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2769 static struct font_name * |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2770 concat_font_list (fonts1, nfonts1, fonts2, nfonts2) |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2771 struct font_name *fonts1, *fonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2772 int nfonts1, nfonts2; |
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 int new_nfonts = nfonts1 + nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2775 struct font_name *new_fonts; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2776 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2777 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
|
2778 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
|
2779 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
|
2780 xfree (fonts1); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2781 xfree (fonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2782 return new_fonts; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2783 } |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2784 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2785 |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2786 /* 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
|
2787 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2788 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
|
2789 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2790 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
|
2791 alternative registries from Vface_alternative_font_registry_alist. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2792 |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2793 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
|
2794 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2795 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
|
2796 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
|
2797 found. */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2798 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2799 static int |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2800 font_list (f, pattern, family, registry, fonts) |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2801 struct frame *f; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2802 Lisp_Object pattern, family, registry; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2803 struct font_name **fonts; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2804 { |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2805 int nfonts = font_list_1 (f, pattern, family, registry, fonts); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
2806 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2807 if (!NILP (registry) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2808 && CONSP (Vface_alternative_font_registry_alist)) |
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 Lisp_Object alter; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2811 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2812 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
|
2813 if (CONSP (alter)) |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2814 { |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2815 int reg_prio, i; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2816 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2817 for (alter = XCDR (alter), reg_prio = 1; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2818 CONSP (alter); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2819 alter = XCDR (alter), reg_prio++) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2820 if (STRINGP (XCAR (alter))) |
34160
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 int nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2823 struct font_name *fonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2824 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2825 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
|
2826 &fonts2); |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2827 for (i = 0; i < nfonts2; i++) |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2828 fonts2[i].registry_priority = reg_prio; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2829 *fonts = (nfonts > 0 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2830 ? concat_font_list (*fonts, nfonts, fonts2, nfonts2) |
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 nfonts += nfonts2; |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
2833 } |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2834 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2835 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2836 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2837 return nfonts; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
2838 } |
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 |
24995 | 2841 /* 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
|
2842 x-family-fonts and x-font-family-list to remove duplicate font |
24995 | 2843 entries. */ |
2844 | |
2845 static void | |
2846 remove_duplicates (list) | |
2847 Lisp_Object list; | |
2848 { | |
2849 Lisp_Object tail = list; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2850 |
24995 | 2851 while (!NILP (tail) && !NILP (XCDR (tail))) |
2852 { | |
2853 Lisp_Object next = XCDR (tail); | |
2854 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
|
2855 XSETCDR (tail, XCDR (next)); |
24995 | 2856 else |
2857 tail = XCDR (tail); | |
2858 } | |
2859 } | |
2860 | |
2861 | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
2862 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
|
2863 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
|
2864 If FAMILY is omitted or nil, list all families. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2865 Otherwise, FAMILY must be a string, possibly containing wildcards |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2866 `?' and `*'. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2867 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
|
2868 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
|
2869 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2870 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
|
2871 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
|
2872 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
|
2873 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
|
2874 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
|
2875 giving the registry and encoding of the font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2876 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
|
2877 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
|
2878 (family, frame) |
24995 | 2879 Lisp_Object family, frame; |
2880 { | |
2881 struct frame *f = check_x_frame (frame); | |
2882 struct font_name *fonts; | |
2883 int i, nfonts; | |
2884 Lisp_Object result; | |
2885 struct gcpro gcpro1; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2886 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2887 if (!NILP (family)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2888 CHECK_STRING (family); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2889 |
24995 | 2890 result = Qnil; |
2891 GCPRO1 (result); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2892 nfonts = font_list (f, Qnil, family, Qnil, &fonts); |
24995 | 2893 for (i = nfonts - 1; i >= 0; --i) |
2894 { | |
25270 | 2895 Lisp_Object v = Fmake_vector (make_number (8), Qnil); |
2896 char *tem; | |
24995 | 2897 |
2898 ASET (v, 0, build_string (fonts[i].fields[XLFD_FAMILY])); | |
2899 ASET (v, 1, xlfd_symbolic_swidth (fonts + i)); | |
2900 ASET (v, 2, make_number (xlfd_point_size (f, fonts + i))); | |
2901 ASET (v, 3, xlfd_symbolic_weight (fonts + i)); | |
2902 ASET (v, 4, xlfd_symbolic_slant (fonts + i)); | |
2903 ASET (v, 5, xlfd_fixed_p (fonts + i) ? Qt : Qnil); | |
25270 | 2904 tem = build_font_name (fonts + i); |
2905 ASET (v, 6, build_string (tem)); | |
2906 sprintf (tem, "%s-%s", fonts[i].fields[XLFD_REGISTRY], | |
2907 fonts[i].fields[XLFD_ENCODING]); | |
2908 ASET (v, 7, build_string (tem)); | |
2909 xfree (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2910 |
24995 | 2911 result = Fcons (v, result); |
2912 } | |
2913 | |
2914 remove_duplicates (result); | |
2915 free_font_names (fonts, nfonts); | |
2916 UNGCPRO; | |
2917 return result; | |
2918 } | |
2919 | |
2920 | |
2921 DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, | |
2922 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2923 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
|
2924 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
|
2925 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
|
2926 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
|
2927 are fixed-pitch. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2928 (frame) |
24995 | 2929 Lisp_Object frame; |
2930 { | |
2931 struct frame *f = check_x_frame (frame); | |
2932 int nfonts, i; | |
2933 struct font_name *fonts; | |
2934 Lisp_Object result; | |
2935 struct gcpro gcpro1; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
2936 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
|
2937 |
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
|
2938 /* 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
|
2939 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
|
2940 nfonts = font_list (f, Qnil, Qnil, Qnil, &fonts); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2941 |
24995 | 2942 result = Qnil; |
2943 GCPRO1 (result); | |
2944 for (i = nfonts - 1; i >= 0; --i) | |
2945 result = Fcons (Fcons (build_string (fonts[i].fields[XLFD_FAMILY]), | |
2946 xlfd_fixed_p (fonts + i) ? Qt : Qnil), | |
2947 result); | |
2948 | |
2949 remove_duplicates (result); | |
2950 free_font_names (fonts, nfonts); | |
2951 UNGCPRO; | |
25270 | 2952 return unbind_to (count, result); |
24995 | 2953 } |
2954 | |
2955 | |
2956 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
|
2957 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
|
2958 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
|
2959 the same size as FACE on FRAME. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2960 PATTERN is a string, perhaps with wildcard characters; |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2961 the * character matches any substring, and |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2962 the ? character matches any single character. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2963 PATTERN is case-insensitive. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2964 FACE is a face name--a symbol. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2965 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2966 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
|
2967 set-face-font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2968 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2969 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
|
2970 even if they match PATTERN and FACE. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2971 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
|
2972 fonts to match. The first MAXIMUM fonts are reported. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2973 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
|
2974 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
|
2975 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
|
2976 (pattern, face, frame, maximum, width) |
24995 | 2977 Lisp_Object pattern, face, frame, maximum, width; |
2978 { | |
2979 struct frame *f; | |
2980 int size; | |
2981 int maxnames; | |
2982 | |
2983 check_x (); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2984 CHECK_STRING (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2985 |
24995 | 2986 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
|
2987 maxnames = -1; |
24995 | 2988 else |
2989 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2990 CHECK_NATNUM (maximum); |
24995 | 2991 maxnames = XINT (maximum); |
2992 } | |
2993 | |
2994 if (!NILP (width)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2995 CHECK_NUMBER (width); |
24995 | 2996 |
2997 /* We can't simply call check_x_frame because this function may be | |
2998 called before any frame is created. */ | |
2999 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
|
3000 if (!FRAME_WINDOW_P (f)) |
24995 | 3001 { |
3002 /* Perhaps we have not yet created any frame. */ | |
3003 f = NULL; | |
3004 face = Qnil; | |
3005 } | |
3006 | |
3007 /* Determine the width standard for comparison with the fonts we find. */ | |
3008 | |
3009 if (NILP (face)) | |
3010 size = 0; | |
3011 else | |
3012 { | |
3013 /* This is of limited utility since it works with character | |
3014 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
|
3015 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
|
3016 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
|
3017 ? NULL |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3018 : 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
|
3019 |
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3020 #ifdef WINDOWSNT |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3021 /* 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
|
3022 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
|
3023 #undef FONT_WIDTH |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3024 #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
|
3025 #endif |
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3026 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
3027 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
|
3028 size = FONT_WIDTH (face->font); |
24995 | 3029 else |
51210
491ca5acf5b3
[WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
Kim F. Storm <storm@cua.dk>
parents:
51092
diff
changeset
|
3030 size = FONT_WIDTH (FRAME_FONT (f)); /* FRAME_COLUMN_WIDTH (f) */ |
24995 | 3031 |
3032 if (!NILP (width)) | |
3033 size *= XINT (width); | |
3034 } | |
3035 | |
3036 { | |
3037 Lisp_Object args[2]; | |
3038 | |
3039 args[0] = x_list_fonts (f, pattern, size, maxnames); | |
3040 if (f == NULL) | |
3041 /* We don't have to check fontsets. */ | |
3042 return args[0]; | |
3043 args[1] = list_fontsets (f, pattern, size); | |
3044 return Fnconc (2, args); | |
3045 } | |
3046 } | |
3047 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3048 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3049 |
3050 | |
3051 | |
3052 /*********************************************************************** | |
3053 Lisp Faces | |
3054 ***********************************************************************/ | |
3055 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3056 /* 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
|
3057 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3058 #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
|
3059 #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
|
3060 #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
|
3061 #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
|
3062 #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
|
3063 #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
|
3064 #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
|
3065 #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
|
3066 #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
|
3067 #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
|
3068 #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
|
3069 #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
|
3070 #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
|
3071 #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
|
3072 #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
|
3073 #define LFACE_AVGWIDTH(LFACE) AREF ((LFACE), LFACE_AVGWIDTH_INDEX) |
24995 | 3074 |
3075 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
3076 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
3077 | |
3078 #define LFACEP(LFACE) \ | |
3079 (VECTORP (LFACE) \ | |
3080 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3081 && EQ (AREF (LFACE, 0), Qface)) |
24995 | 3082 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3083 |
24995 | 3084 #if GLYPH_DEBUG |
3085 | |
3086 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
3087 | |
3088 static void | |
3089 check_lface_attrs (attrs) | |
3090 Lisp_Object *attrs; | |
3091 { | |
3092 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
3093 || STRINGP (attrs[LFACE_FAMILY_INDEX])); | |
3094 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) | |
3095 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3096 xassert (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3097 || INTEGERP (attrs[LFACE_AVGWIDTH_INDEX])); |
24995 | 3098 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) |
31178 | 3099 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
3100 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
3101 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
24995 | 3102 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
3103 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); | |
3104 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
3105 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); | |
3106 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
3107 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) | |
3108 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
3109 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
3110 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) | |
3111 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
3112 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
3113 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
3114 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
3115 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
3116 || SYMBOLP (attrs[LFACE_BOX_INDEX]) | |
3117 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
3118 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
3119 || CONSP (attrs[LFACE_BOX_INDEX])); | |
3120 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
3121 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); | |
3122 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
3123 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); | |
3124 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
3125 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); | |
31178 | 3126 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
3127 || NILP (attrs[LFACE_INHERIT_INDEX]) | |
3128 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
3129 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
24995 | 3130 #ifdef HAVE_WINDOW_SYSTEM |
3131 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
3132 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3133 || !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
|
3134 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
|
3135 || NILP (attrs[LFACE_FONT_INDEX]) |
2f636fd2f714
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error.
Gerd Moellmann <gerd@gnu.org>
parents:
28230
diff
changeset
|
3136 || STRINGP (attrs[LFACE_FONT_INDEX])); |
24995 | 3137 #endif |
3138 } | |
3139 | |
3140 | |
3141 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
3142 | |
3143 static void | |
3144 check_lface (lface) | |
3145 Lisp_Object lface; | |
3146 { | |
3147 if (!NILP (lface)) | |
3148 { | |
3149 xassert (LFACEP (lface)); | |
3150 check_lface_attrs (XVECTOR (lface)->contents); | |
3151 } | |
3152 } | |
3153 | |
3154 #else /* GLYPH_DEBUG == 0 */ | |
3155 | |
3156 #define check_lface_attrs(attrs) (void) 0 | |
3157 #define check_lface(lface) (void) 0 | |
3158 | |
3159 #endif /* GLYPH_DEBUG == 0 */ | |
3160 | |
3161 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3162 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3163 /* 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
|
3164 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3165 /* 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
|
3166 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
|
3167 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
|
3168 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
|
3169 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
|
3170 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
|
3171 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
|
3172 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3173 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
|
3174 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
|
3175 }; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3176 |
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 /* 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
|
3179 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
|
3180 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
|
3181 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
|
3182 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3183 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
|
3184 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
|
3185 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
|
3186 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
|
3187 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3188 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
|
3189 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3190 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
|
3191 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
|
3192 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
|
3193 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3194 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
|
3195 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
|
3196 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3197 *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
|
3198 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3199 return 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3200 } |
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 |
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 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3205 /* 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
|
3206 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
|
3207 return that face's name. */ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3208 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3209 static Lisp_Object |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3210 resolve_face_name (face_name) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3211 Lisp_Object face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3212 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3213 Lisp_Object aliased; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3214 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3215 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
|
3216 face_name = intern (SDATA (face_name)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3217 |
33070
ca31e3965686
(resolve_face_name): Handle case that FACE_NAME
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
3218 while (SYMBOLP (face_name)) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3219 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3220 aliased = Fget (face_name, Qface_alias); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3221 if (NILP (aliased)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3222 break; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3223 else |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3224 face_name = aliased; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3225 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3226 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3227 return face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3228 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3229 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3230 |
24995 | 3231 /* 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
|
3232 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
|
3233 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
|
3234 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
|
3235 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
|
3236 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
|
3237 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
|
3238 name. */ |
24995 | 3239 |
3240 static INLINE Lisp_Object | |
3241 lface_from_face_name (f, face_name, signal_p) | |
3242 struct frame *f; | |
3243 Lisp_Object face_name; | |
3244 int signal_p; | |
3245 { | |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3246 Lisp_Object lface; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3247 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3248 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
|
3249 |
24995 | 3250 if (f) |
3251 lface = assq_no_quit (face_name, f->face_alist); | |
3252 else | |
3253 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
3254 | |
3255 if (CONSP (lface)) | |
3256 lface = XCDR (lface); | |
3257 else if (signal_p) | |
3258 signal_error ("Invalid face", face_name); | |
3259 | |
3260 check_lface (lface); | |
3261 return lface; | |
3262 } | |
3263 | |
3264 | |
3265 /* Get face attributes of face FACE_NAME from frame-local faces on | |
3266 frame F. Store the resulting attributes in ATTRS which must point | |
3267 to a vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If SIGNAL_P | |
3268 is non-zero, signal an error if FACE_NAME does not name a face. | |
3269 Otherwise, value is zero if FACE_NAME is not a face. */ | |
3270 | |
3271 static INLINE int | |
3272 get_lface_attributes (f, face_name, attrs, signal_p) | |
3273 struct frame *f; | |
3274 Lisp_Object face_name; | |
3275 Lisp_Object *attrs; | |
3276 int signal_p; | |
3277 { | |
3278 Lisp_Object lface; | |
3279 int success_p; | |
3280 | |
3281 lface = lface_from_face_name (f, face_name, signal_p); | |
3282 if (!NILP (lface)) | |
3283 { | |
3284 bcopy (XVECTOR (lface)->contents, attrs, | |
3285 LFACE_VECTOR_SIZE * sizeof *attrs); | |
3286 success_p = 1; | |
3287 } | |
3288 else | |
3289 success_p = 0; | |
3290 | |
3291 return success_p; | |
3292 } | |
3293 | |
3294 | |
3295 /* Non-zero if all attributes in face attribute vector ATTRS are | |
3296 specified, i.e. are non-nil. */ | |
3297 | |
3298 static int | |
3299 lface_fully_specified_p (attrs) | |
3300 Lisp_Object *attrs; | |
3301 { | |
3302 int i; | |
3303 | |
3304 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
|
3305 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
|
3306 && 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
|
3307 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
|
3308 #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
|
3309 /* 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
|
3310 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
|
3311 && 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
|
3312 #endif |
c6ecb6ee69bf
* xfaces.c (lface_fully_specified_p): Take into account that
Jan Djärv <jan.h.d@swipnet.se>
parents:
53267
diff
changeset
|
3313 ) |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3314 break; |
24995 | 3315 |
3316 return i == LFACE_VECTOR_SIZE; | |
3317 } | |
3318 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3319 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 3320 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3321 /* 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
|
3322 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
|
3323 unspecified attributes of LFACE. The exception is `font' |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3324 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
|
3325 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3326 If FONTNAME is not available on frame F, |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3327 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
|
3328 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
|
3329 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
|
3330 in LFACE and return 1. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3331 Otherwise, return 1. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3332 |
24995 | 3333 static int |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3334 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
|
3335 struct frame *f; |
24995 | 3336 Lisp_Object lface; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3337 Lisp_Object fontname; |
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3338 int force_p, may_fail_p; |
24995 | 3339 { |
3340 struct font_name font; | |
3341 char *buffer; | |
3342 int pt; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3343 int have_xlfd_p; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3344 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
|
3345 char *font_name = SDATA (fontname); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3346 struct font_info *font_info; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3347 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3348 /* 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
|
3349 fontset = fs_query_fontset (fontname, 0); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3350 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
|
3351 font_name = SDATA (fontset_ascii (fontset)); |
28230
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 /* 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
|
3354 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
|
3355 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
|
3356 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
|
3357 later. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3358 BLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3359 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
|
3360 UNBLOCK_INPUT; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3361 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3362 if (!font_info) |
26594
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3363 { |
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3364 if (may_fail_p) |
f24bdf26ad39
(set_lface_from_font_name): New parameter may_fail_p.
Gerd Moellmann <gerd@gnu.org>
parents:
26574
diff
changeset
|
3365 return 0; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3366 abort (); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3367 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3368 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3369 font.name = STRDUPA (font_info->full_name); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3370 have_xlfd_p = split_font_name (f, &font, 1); |
24995 | 3371 |
3372 /* 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
|
3373 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
|
3374 name conforming to XLFD, set normal values. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3375 |
24995 | 3376 if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface))) |
3377 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3378 Lisp_Object val; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3379 if (have_xlfd_p) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3380 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3381 buffer = (char *) alloca (strlen (font.fields[XLFD_FAMILY]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3382 + strlen (font.fields[XLFD_FOUNDRY]) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3383 + 2); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3384 sprintf (buffer, "%s-%s", font.fields[XLFD_FOUNDRY], |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3385 font.fields[XLFD_FAMILY]); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3386 val = build_string (buffer); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3387 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3388 else |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3389 val = build_string ("*"); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3390 LFACE_FAMILY (lface) = val; |
24995 | 3391 } |
3392 | |
3393 if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface))) | |
3394 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3395 if (have_xlfd_p) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3396 pt = xlfd_point_size (f, &font); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3397 else |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3398 pt = pixel_point_size (f, font_info->height * 10); |
24995 | 3399 xassert (pt > 0); |
3400 LFACE_HEIGHT (lface) = make_number (pt); | |
3401 } | |
3402 | |
3403 if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface))) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3404 LFACE_SWIDTH (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3405 = have_xlfd_p ? xlfd_symbolic_swidth (&font) : Qnormal; |
24995 | 3406 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3407 if (force_p || UNSPECIFIEDP (LFACE_AVGWIDTH (lface))) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3408 LFACE_AVGWIDTH (lface) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3409 = (have_xlfd_p |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3410 ? make_number (font.numeric[XLFD_AVGWIDTH]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3411 : Qunspecified); |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3412 |
24995 | 3413 if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface))) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3414 LFACE_WEIGHT (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3415 = have_xlfd_p ? xlfd_symbolic_weight (&font) : Qnormal; |
24995 | 3416 |
3417 if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface))) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3418 LFACE_SLANT (lface) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3419 = have_xlfd_p ? xlfd_symbolic_slant (&font) : Qnormal; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3420 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3421 LFACE_FONT (lface) = fontname; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3422 |
24995 | 3423 return 1; |
3424 } | |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3425 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3426 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3427 |
3428 | |
31178 | 3429 /* Merges the face height FROM with the face height TO, and returns the |
3430 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
|
3431 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
|
3432 `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
|
3433 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
|
3434 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
|
3435 call into lisp. */ |
31178 | 3436 |
3437 Lisp_Object | |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3438 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
|
3439 Lisp_Object from, to, invalid; |
31178 | 3440 { |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3441 Lisp_Object result = invalid; |
31178 | 3442 |
3443 if (INTEGERP (from)) | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3444 /* 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
|
3445 result = from; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3446 else if (FLOATP (from)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3447 /* 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
|
3448 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3449 if (INTEGERP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3450 /* relative X absolute => absolute */ |
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
3451 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
|
3452 else if (FLOATP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3453 /* relative X relative => relative */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3454 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
|
3455 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
|
3456 result = from; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3457 } |
31178 | 3458 else if (FUNCTIONP (from)) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3459 /* FROM is a function, which use to adjust TO. */ |
31178 | 3460 { |
3461 /* Call function with current height as argument. | |
3462 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
|
3463 Lisp_Object args[2]; |
31178 | 3464 |
3465 args[0] = from; | |
3466 args[1] = to; | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3467 result = safe_call (2, args); |
31178 | 3468 |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3469 /* 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
|
3470 if (INTEGERP (to) && !INTEGERP (result)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3471 result = invalid; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3472 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3473 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3474 return result; |
31178 | 3475 } |
3476 | |
3477 | |
3478 /* 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
|
3479 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
|
3480 completely specified and contain only absolute attributes. Every |
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3481 specified attribute of FROM overrides the corresponding attribute of |
2be1770112c1
(default_face_vector): New function.
Miles Bader <miles@gnu.org>
parents:
31221
diff
changeset
|
3482 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
|
3483 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
|
3484 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
|
3485 places. */ |
24995 | 3486 |
3487 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
|
3488 merge_face_vectors (f, from, to, named_merge_points) |
31178 | 3489 struct frame *f; |
24995 | 3490 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
|
3491 struct named_merge_point *named_merge_points; |
24995 | 3492 { |
3493 int i; | |
31178 | 3494 |
3495 /* If FROM inherits from some other faces, merge their attributes into | |
3496 TO before merging FROM's direct attributes. Note that an :inherit | |
3497 attribute of `unspecified' is the same as one of nil; we never | |
3498 merge :inherit attributes, so nil is more correct, but lots of | |
3499 other code uses `unspecified' as a generic value for face attributes. */ | |
3500 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
3501 && !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
|
3502 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
31178 | 3503 |
31221 | 3504 /* If TO specifies a :font attribute, and FROM specifies some |
3505 font-related attribute, we need to clear TO's :font attribute | |
3506 (because it will be inconsistent with whatever FROM specifies, and | |
3507 FROM takes precedence). */ | |
3508 if (!NILP (to[LFACE_FONT_INDEX]) | |
3509 && (!UNSPECIFIEDP (from[LFACE_FAMILY_INDEX]) | |
3510 || !UNSPECIFIEDP (from[LFACE_HEIGHT_INDEX]) | |
3511 || !UNSPECIFIEDP (from[LFACE_WEIGHT_INDEX]) | |
3512 || !UNSPECIFIEDP (from[LFACE_SLANT_INDEX]) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3513 || !UNSPECIFIEDP (from[LFACE_SWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3514 || !UNSPECIFIEDP (from[LFACE_AVGWIDTH_INDEX]))) |
31221 | 3515 to[LFACE_FONT_INDEX] = Qnil; |
3516 | |
24995 | 3517 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
3518 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
|
3519 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3520 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
|
3521 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
|
3522 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3523 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
|
3524 } |
31178 | 3525 |
3526 /* TO is always an absolute face, which should inherit from nothing. | |
3527 We blindly copy the :inherit attribute above and fix it up here. */ | |
3528 to[LFACE_INHERIT_INDEX] = Qnil; | |
3529 } | |
3530 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3531 /* 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
|
3532 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
|
3533 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
|
3534 merging succeeded. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3535 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3536 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3537 merge_named_face (f, face_name, to, named_merge_points) |
31178 | 3538 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
|
3539 Lisp_Object face_name; |
31178 | 3540 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
|
3541 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
|
3542 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3543 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
|
3544 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3545 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
|
3546 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
|
3547 { |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3548 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
|
3549 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
|
3550 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
|
3551 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3552 if (ok) |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3553 { |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3554 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
|
3555 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
|
3556 UNGCPRO; |
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
3557 } |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3558 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3559 return ok; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3560 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3561 else |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3562 return 0; |
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 |
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 /* 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
|
3567 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
|
3568 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
|
3569 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
|
3570 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
|
3571 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
|
3572 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3573 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
|
3574 specifications. Each face specification can be: |
24995 | 3575 |
3576 1. A symbol or string naming a Lisp face. | |
3577 | |
3578 2. A property list of the form (KEYWORD VALUE ...) where each | |
3579 KEYWORD is a face attribute name, and value is an appropriate value | |
3580 for that attribute. | |
3581 | |
3582 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
3583 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
3584 for compatibility with 20.2. | |
3585 | |
3586 Face specifications earlier in lists take precedence over later | |
3587 specifications. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3588 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3589 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3590 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
24995 | 3591 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
|
3592 Lisp_Object face_ref; |
24995 | 3593 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
|
3594 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
|
3595 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
|
3596 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3597 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
|
3598 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3599 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
|
3600 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3601 Lisp_Object first = XCAR (face_ref); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3602 |
24995 | 3603 if (EQ (first, Qforeground_color) |
3604 || EQ (first, Qbackground_color)) | |
3605 { | |
3606 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
3607 . 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
|
3608 Lisp_Object color_name = XCDR (face_ref); |
24995 | 3609 Lisp_Object color = first; |
3610 | |
3611 if (STRINGP (color_name)) | |
3612 { | |
3613 if (EQ (color, Qforeground_color)) | |
3614 to[LFACE_FOREGROUND_INDEX] = color_name; | |
3615 else | |
3616 to[LFACE_BACKGROUND_INDEX] = color_name; | |
3617 } | |
3618 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3619 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3620 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
|
3621 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
|
3622 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3623 } |
24995 | 3624 } |
3625 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
|
3626 && *SDATA (SYMBOL_NAME (first)) == ':') |
24995 | 3627 { |
3628 /* 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
|
3629 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
24995 | 3630 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3631 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
|
3632 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
|
3633 int err = 0; |
24995 | 3634 |
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3635 /* 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
|
3636 if (EQ (value, Qunspecified)) |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3637 ; |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
3638 else if (EQ (keyword, QCfamily)) |
24995 | 3639 { |
3640 if (STRINGP (value)) | |
3641 to[LFACE_FAMILY_INDEX] = value; | |
3642 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3643 err = 1; |
24995 | 3644 } |
3645 else if (EQ (keyword, QCheight)) | |
3646 { | |
31178 | 3647 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
|
3648 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
31178 | 3649 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3650 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
|
3651 to[LFACE_HEIGHT_INDEX] = new_height; |
24995 | 3652 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3653 err = 1; |
24995 | 3654 } |
3655 else if (EQ (keyword, QCweight)) | |
3656 { | |
3657 if (SYMBOLP (value) | |
3658 && face_numeric_weight (value) >= 0) | |
3659 to[LFACE_WEIGHT_INDEX] = value; | |
3660 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3661 err = 1; |
24995 | 3662 } |
3663 else if (EQ (keyword, QCslant)) | |
3664 { | |
3665 if (SYMBOLP (value) | |
3666 && face_numeric_slant (value) >= 0) | |
3667 to[LFACE_SLANT_INDEX] = value; | |
3668 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3669 err = 1; |
24995 | 3670 } |
3671 else if (EQ (keyword, QCunderline)) | |
3672 { | |
3673 if (EQ (value, Qt) | |
3674 || NILP (value) | |
3675 || STRINGP (value)) | |
3676 to[LFACE_UNDERLINE_INDEX] = value; | |
3677 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3678 err = 1; |
24995 | 3679 } |
3680 else if (EQ (keyword, QCoverline)) | |
3681 { | |
3682 if (EQ (value, Qt) | |
3683 || NILP (value) | |
3684 || STRINGP (value)) | |
3685 to[LFACE_OVERLINE_INDEX] = value; | |
3686 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3687 err = 1; |
24995 | 3688 } |
3689 else if (EQ (keyword, QCstrike_through)) | |
3690 { | |
3691 if (EQ (value, Qt) | |
3692 || NILP (value) | |
3693 || STRINGP (value)) | |
3694 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
3695 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3696 err = 1; |
24995 | 3697 } |
3698 else if (EQ (keyword, QCbox)) | |
3699 { | |
3700 if (EQ (value, Qt)) | |
3701 value = make_number (1); | |
3702 if (INTEGERP (value) | |
3703 || STRINGP (value) | |
3704 || CONSP (value) | |
3705 || NILP (value)) | |
3706 to[LFACE_BOX_INDEX] = value; | |
3707 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3708 err = 1; |
24995 | 3709 } |
3710 else if (EQ (keyword, QCinverse_video) | |
3711 || EQ (keyword, QCreverse_video)) | |
3712 { | |
3713 if (EQ (value, Qt) || NILP (value)) | |
3714 to[LFACE_INVERSE_INDEX] = value; | |
3715 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3716 err = 1; |
24995 | 3717 } |
3718 else if (EQ (keyword, QCforeground)) | |
3719 { | |
3720 if (STRINGP (value)) | |
3721 to[LFACE_FOREGROUND_INDEX] = value; | |
3722 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3723 err = 1; |
24995 | 3724 } |
3725 else if (EQ (keyword, QCbackground)) | |
3726 { | |
3727 if (STRINGP (value)) | |
3728 to[LFACE_BACKGROUND_INDEX] = value; | |
3729 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3730 err = 1; |
24995 | 3731 } |
3732 else if (EQ (keyword, QCstipple)) | |
3733 { | |
3734 #ifdef HAVE_X_WINDOWS | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3735 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
24995 | 3736 if (!NILP (pixmap_p)) |
3737 to[LFACE_STIPPLE_INDEX] = value; | |
3738 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3739 err = 1; |
24995 | 3740 #endif |
3741 } | |
3742 else if (EQ (keyword, QCwidth)) | |
3743 { | |
3744 if (SYMBOLP (value) | |
3745 && face_numeric_swidth (value) >= 0) | |
3746 to[LFACE_SWIDTH_INDEX] = value; | |
3747 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3748 err = 1; |
24995 | 3749 } |
31178 | 3750 else if (EQ (keyword, QCinherit)) |
3751 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3752 /* 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
|
3753 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
|
3754 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
|
3755 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
|
3756 err = 1; |
31178 | 3757 } |
24995 | 3758 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3759 err = 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3760 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3761 if (err) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3762 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3763 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
|
3764 ok = 0; |
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 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3767 face_ref = XCDR (XCDR (face_ref)); |
24995 | 3768 } |
3769 } | |
3770 else | |
3771 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3772 /* 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
|
3773 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
|
3774 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
|
3775 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
|
3776 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3777 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
|
3778 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
|
3779 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3780 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
|
3781 ok = 0; |
24995 | 3782 } |
3783 } | |
3784 else | |
3785 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3786 /* 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
|
3787 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
|
3788 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
|
3789 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
|
3790 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3791 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
3792 return ok; |
24995 | 3793 } |
3794 | |
3795 | |
3796 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
3797 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
|
3798 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
|
3799 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
|
3800 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
|
3801 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
|
3802 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
|
3803 (face, frame) |
24995 | 3804 Lisp_Object face, frame; |
3805 { | |
3806 Lisp_Object global_lface, lface; | |
3807 struct frame *f; | |
3808 int i; | |
3809 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3810 CHECK_SYMBOL (face); |
24995 | 3811 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
|
3812 |
24995 | 3813 if (!NILP (frame)) |
3814 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3815 CHECK_LIVE_FRAME (frame); |
24995 | 3816 f = XFRAME (frame); |
3817 lface = lface_from_face_name (f, face, 0); | |
3818 } | |
3819 else | |
3820 f = NULL, lface = Qnil; | |
3821 | |
3822 /* Add a global definition if there is none. */ | |
3823 if (NILP (global_lface)) | |
3824 { | |
3825 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
3826 Qunspecified); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3827 AREF (global_lface, 0) = Qface; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3828 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
24995 | 3829 Vface_new_frame_defaults); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3830 |
24995 | 3831 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
3832 face id to Lisp face is given by the vector lface_id_to_name. | |
3833 The mapping from Lisp face to Lisp face id is given by the | |
3834 property `face' of the Lisp face name. */ | |
3835 if (next_lface_id == lface_id_to_name_size) | |
3836 { | |
3837 int new_size = max (50, 2 * lface_id_to_name_size); | |
3838 int sz = new_size * sizeof *lface_id_to_name; | |
3839 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
3840 lface_id_to_name_size = new_size; | |
3841 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3842 |
24995 | 3843 lface_id_to_name[next_lface_id] = face; |
3844 Fput (face, Qface, make_number (next_lface_id)); | |
3845 ++next_lface_id; | |
3846 } | |
3847 else if (f == NULL) | |
3848 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
|
3849 AREF (global_lface, i) = Qunspecified; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3850 |
24995 | 3851 /* Add a frame-local definition. */ |
3852 if (f) | |
3853 { | |
3854 if (NILP (lface)) | |
3855 { | |
3856 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
3857 Qunspecified); | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
3858 AREF (lface, 0) = Qface; |
24995 | 3859 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
3860 } | |
3861 else | |
3862 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
|
3863 AREF (lface, i) = Qunspecified; |
24995 | 3864 } |
3865 else | |
3866 lface = global_lface; | |
3867 | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3868 /* 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
|
3869 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
|
3870 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
|
3871 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
|
3872 init_iterator will then free realized faces. */ |
57107 | 3873 if (NILP (Fget (face, Qface_no_inherit))) |
3874 { | |
3875 ++face_change_count; | |
3876 ++windows_or_buffers_changed; | |
3877 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3878 |
24995 | 3879 xassert (LFACEP (lface)); |
3880 check_lface (lface); | |
3881 return lface; | |
3882 } | |
3883 | |
3884 | |
3885 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
3886 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
|
3887 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
|
3888 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
|
3889 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
|
3890 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
|
3891 (face, frame) |
24995 | 3892 Lisp_Object face, frame; |
3893 { | |
3894 Lisp_Object lface; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3895 |
24995 | 3896 if (!NILP (frame)) |
3897 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3898 CHECK_LIVE_FRAME (frame); |
24995 | 3899 lface = lface_from_face_name (XFRAME (frame), face, 0); |
3900 } | |
3901 else | |
3902 lface = lface_from_face_name (NULL, face, 0); | |
3903 | |
3904 return lface; | |
3905 } | |
3906 | |
3907 | |
3908 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
3909 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
|
3910 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
|
3911 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
|
3912 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
|
3913 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
|
3914 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
|
3915 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
|
3916 |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3917 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
|
3918 (from, to, frame, new_frame) |
24995 | 3919 Lisp_Object from, to, frame, new_frame; |
3920 { | |
3921 Lisp_Object lface, copy; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3922 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3923 CHECK_SYMBOL (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3924 CHECK_SYMBOL (to); |
24995 | 3925 |
3926 if (EQ (frame, Qt)) | |
3927 { | |
3928 /* Copy global definition of FROM. We don't make copies of | |
3929 strings etc. because 20.2 didn't do it either. */ | |
3930 lface = lface_from_face_name (NULL, from, 1); | |
3931 copy = Finternal_make_lisp_face (to, Qnil); | |
3932 } | |
3933 else | |
3934 { | |
3935 /* 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
|
3936 if (NILP (new_frame)) |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
3937 new_frame = frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3938 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3939 CHECK_LIVE_FRAME (new_frame); |
24995 | 3940 lface = lface_from_face_name (XFRAME (frame), from, 1); |
3941 copy = Finternal_make_lisp_face (to, new_frame); | |
3942 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3943 |
24995 | 3944 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
3945 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3946 |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3947 /* 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
|
3948 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
|
3949 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
|
3950 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
|
3951 init_iterator will then free realized faces. */ |
57107 | 3952 if (NILP (Fget (to, Qface_no_inherit))) |
3953 { | |
3954 ++face_change_count; | |
3955 ++windows_or_buffers_changed; | |
3956 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
3957 |
24995 | 3958 return to; |
3959 } | |
3960 | |
3961 | |
3962 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
3963 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
|
3964 doc: /* Set attribute ATTR of FACE to VALUE. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3965 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
|
3966 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
|
3967 FRAME t means change the default for new frames. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3968 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
|
3969 for new frames. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3970 (face, attr, value, frame) |
24995 | 3971 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
|
3972 { |
24995 | 3973 Lisp_Object lface; |
3974 Lisp_Object old_value = Qnil; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3975 /* Set 1 if ATTR is QCfont. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3976 int font_attr_p = 0; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3977 /* Set 1 if ATTR is one of font-related attributes other than QCfont. */ |
24995 | 3978 int font_related_attr_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3979 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3980 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3981 CHECK_SYMBOL (attr); |
24995 | 3982 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3983 face = resolve_face_name (face); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3984 |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3985 /* 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
|
3986 default for new frames. */ |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3987 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
|
3988 { |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3989 Lisp_Object tail; |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3990 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
|
3991 FOR_EACH_FRAME (tail, frame) |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3992 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
|
3993 return face; |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3994 } |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3995 |
24995 | 3996 /* Set lface to the Lisp attribute vector of FACE. */ |
3997 if (EQ (frame, Qt)) | |
3998 lface = lface_from_face_name (NULL, face, 1); | |
3999 else | |
4000 { | |
4001 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4002 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4003 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4004 CHECK_LIVE_FRAME (frame); |
24995 | 4005 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
|
4006 |
24995 | 4007 /* If a frame-local face doesn't exist yet, create one. */ |
4008 if (NILP (lface)) | |
4009 lface = Finternal_make_lisp_face (face, frame); | |
4010 } | |
4011 | |
4012 if (EQ (attr, QCfamily)) | |
4013 { | |
4014 if (!UNSPECIFIEDP (value)) | |
4015 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4016 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
|
4017 if (SCHARS (value) == 0) |
24995 | 4018 signal_error ("Invalid face family", value); |
4019 } | |
4020 old_value = LFACE_FAMILY (lface); | |
4021 LFACE_FAMILY (lface) = value; | |
4022 font_related_attr_p = 1; | |
4023 } | |
4024 else if (EQ (attr, QCheight)) | |
4025 { | |
4026 if (!UNSPECIFIEDP (value)) | |
4027 { | |
40023
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4028 Lisp_Object test; |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4029 |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4030 test = (EQ (face, Qdefault) |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4031 ? value |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4032 /* 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
|
4033 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
|
4034 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
|
4035 : 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
|
4036 |
3914e6d2452f
(Finternal_set_lisp_face_attribute): Follow coding conventions.
Gerd Moellmann <gerd@gnu.org>
parents:
39988
diff
changeset
|
4037 if (!INTEGERP (test) || XINT (test) <= 0) |
24995 | 4038 signal_error ("Invalid face height", value); |
4039 } | |
31178 | 4040 |
24995 | 4041 old_value = LFACE_HEIGHT (lface); |
4042 LFACE_HEIGHT (lface) = value; | |
4043 font_related_attr_p = 1; | |
4044 } | |
4045 else if (EQ (attr, QCweight)) | |
4046 { | |
4047 if (!UNSPECIFIEDP (value)) | |
4048 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4049 CHECK_SYMBOL (value); |
24995 | 4050 if (face_numeric_weight (value) < 0) |
4051 signal_error ("Invalid face weight", value); | |
4052 } | |
4053 old_value = LFACE_WEIGHT (lface); | |
4054 LFACE_WEIGHT (lface) = value; | |
4055 font_related_attr_p = 1; | |
4056 } | |
4057 else if (EQ (attr, QCslant)) | |
4058 { | |
4059 if (!UNSPECIFIEDP (value)) | |
4060 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4061 CHECK_SYMBOL (value); |
24995 | 4062 if (face_numeric_slant (value) < 0) |
4063 signal_error ("Invalid face slant", value); | |
4064 } | |
4065 old_value = LFACE_SLANT (lface); | |
4066 LFACE_SLANT (lface) = value; | |
4067 font_related_attr_p = 1; | |
4068 } | |
4069 else if (EQ (attr, QCunderline)) | |
4070 { | |
4071 if (!UNSPECIFIEDP (value)) | |
4072 if ((SYMBOLP (value) | |
4073 && !EQ (value, Qt) | |
4074 && !EQ (value, Qnil)) | |
4075 /* Underline color. */ | |
4076 || (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
|
4077 && SCHARS (value) == 0)) |
24995 | 4078 signal_error ("Invalid face underline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4079 |
24995 | 4080 old_value = LFACE_UNDERLINE (lface); |
4081 LFACE_UNDERLINE (lface) = value; | |
4082 } | |
4083 else if (EQ (attr, QCoverline)) | |
4084 { | |
4085 if (!UNSPECIFIEDP (value)) | |
4086 if ((SYMBOLP (value) | |
4087 && !EQ (value, Qt) | |
4088 && !EQ (value, Qnil)) | |
4089 /* Overline color. */ | |
4090 || (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
|
4091 && SCHARS (value) == 0)) |
24995 | 4092 signal_error ("Invalid face overline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4093 |
24995 | 4094 old_value = LFACE_OVERLINE (lface); |
4095 LFACE_OVERLINE (lface) = value; | |
4096 } | |
4097 else if (EQ (attr, QCstrike_through)) | |
4098 { | |
4099 if (!UNSPECIFIEDP (value)) | |
4100 if ((SYMBOLP (value) | |
4101 && !EQ (value, Qt) | |
4102 && !EQ (value, Qnil)) | |
4103 /* Strike-through color. */ | |
4104 || (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
|
4105 && SCHARS (value) == 0)) |
24995 | 4106 signal_error ("Invalid face strike-through", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4107 |
24995 | 4108 old_value = LFACE_STRIKE_THROUGH (lface); |
4109 LFACE_STRIKE_THROUGH (lface) = value; | |
4110 } | |
4111 else if (EQ (attr, QCbox)) | |
4112 { | |
4113 int valid_p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4114 |
24995 | 4115 /* Allow t meaning a simple box of width 1 in foreground color |
4116 of the face. */ | |
4117 if (EQ (value, Qt)) | |
4118 value = make_number (1); | |
4119 | |
4120 if (UNSPECIFIEDP (value)) | |
4121 valid_p = 1; | |
4122 else if (NILP (value)) | |
4123 valid_p = 1; | |
4124 else if (INTEGERP (value)) | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4125 valid_p = XINT (value) != 0; |
24995 | 4126 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
|
4127 valid_p = SCHARS (value) > 0; |
24995 | 4128 else if (CONSP (value)) |
4129 { | |
4130 Lisp_Object tem; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4131 |
24995 | 4132 tem = value; |
4133 while (CONSP (tem)) | |
4134 { | |
4135 Lisp_Object k, v; | |
4136 | |
4137 k = XCAR (tem); | |
4138 tem = XCDR (tem); | |
4139 if (!CONSP (tem)) | |
4140 break; | |
4141 v = XCAR (tem); | |
4142 tem = XCDR (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4143 |
24995 | 4144 if (EQ (k, QCline_width)) |
4145 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
4146 if (!INTEGERP (v) || XINT (v) == 0) |
24995 | 4147 break; |
4148 } | |
4149 else if (EQ (k, QCcolor)) | |
4150 { | |
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
4151 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
24995 | 4152 break; |
4153 } | |
4154 else if (EQ (k, QCstyle)) | |
4155 { | |
4156 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
4157 break; | |
4158 } | |
4159 else | |
4160 break; | |
4161 } | |
4162 | |
4163 valid_p = NILP (tem); | |
4164 } | |
4165 else | |
4166 valid_p = 0; | |
4167 | |
4168 if (!valid_p) | |
4169 signal_error ("Invalid face box", value); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4170 |
24995 | 4171 old_value = LFACE_BOX (lface); |
4172 LFACE_BOX (lface) = value; | |
4173 } | |
4174 else if (EQ (attr, QCinverse_video) | |
4175 || EQ (attr, QCreverse_video)) | |
4176 { | |
4177 if (!UNSPECIFIEDP (value)) | |
4178 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4179 CHECK_SYMBOL (value); |
24995 | 4180 if (!EQ (value, Qt) && !NILP (value)) |
4181 signal_error ("Invalid inverse-video face attribute value", value); | |
4182 } | |
4183 old_value = LFACE_INVERSE (lface); | |
4184 LFACE_INVERSE (lface) = value; | |
4185 } | |
4186 else if (EQ (attr, QCforeground)) | |
4187 { | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4188 if (!UNSPECIFIEDP (value)) |
24995 | 4189 { |
4190 /* Don't check for valid color names here because it depends | |
4191 on the frame (display) whether the color will be valid | |
4192 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
|
4193 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
|
4194 if (SCHARS (value) == 0) |
24995 | 4195 signal_error ("Empty foreground color value", value); |
4196 } | |
4197 old_value = LFACE_FOREGROUND (lface); | |
4198 LFACE_FOREGROUND (lface) = value; | |
4199 } | |
4200 else if (EQ (attr, QCbackground)) | |
4201 { | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
4202 if (!UNSPECIFIEDP (value)) |
24995 | 4203 { |
4204 /* Don't check for valid color names here because it depends | |
4205 on the frame (display) whether the color will be valid | |
4206 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
|
4207 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
|
4208 if (SCHARS (value) == 0) |
24995 | 4209 signal_error ("Empty background color value", value); |
4210 } | |
4211 old_value = LFACE_BACKGROUND (lface); | |
4212 LFACE_BACKGROUND (lface) = value; | |
4213 } | |
4214 else if (EQ (attr, QCstipple)) | |
4215 { | |
4216 #ifdef HAVE_X_WINDOWS | |
4217 if (!UNSPECIFIEDP (value) | |
4218 && !NILP (value) | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
4219 && NILP (Fbitmap_spec_p (value))) |
24995 | 4220 signal_error ("Invalid stipple attribute", value); |
4221 old_value = LFACE_STIPPLE (lface); | |
4222 LFACE_STIPPLE (lface) = value; | |
4223 #endif /* HAVE_X_WINDOWS */ | |
4224 } | |
4225 else if (EQ (attr, QCwidth)) | |
4226 { | |
4227 if (!UNSPECIFIEDP (value)) | |
4228 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4229 CHECK_SYMBOL (value); |
24995 | 4230 if (face_numeric_swidth (value) < 0) |
4231 signal_error ("Invalid face width", value); | |
4232 } | |
4233 old_value = LFACE_SWIDTH (lface); | |
4234 LFACE_SWIDTH (lface) = value; | |
4235 font_related_attr_p = 1; | |
4236 } | |
4237 else if (EQ (attr, QCfont)) | |
4238 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4239 #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
|
4240 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
|
4241 { |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4242 /* 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
|
4243 font name. */ |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4244 struct frame *f; |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4245 Lisp_Object tmp; |
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 if (EQ (frame, Qt)) |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4248 f = SELECTED_FRAME (); |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4249 else |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4250 f = check_x_frame (frame); |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4251 |
51092
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4252 if (!UNSPECIFIEDP (value)) |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4253 { |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4254 CHECK_STRING (value); |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4255 |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4256 /* 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
|
4257 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
|
4258 tmp = Fquery_fontset (value, Qnil); |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4259 if (!NILP (tmp)) |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4260 value = tmp; |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4261 |
c559952fe972
(Finternal_set_lisp_face_attribute): Handle Qunspecified
Richard M. Stallman <rms@gnu.org>
parents:
50515
diff
changeset
|
4262 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
|
4263 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
|
4264 } |
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4265 |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4266 font_attr_p = 1; |
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
4267 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4268 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4269 } |
31178 | 4270 else if (EQ (attr, QCinherit)) |
4271 { | |
4272 Lisp_Object tail; | |
4273 if (SYMBOLP (value)) | |
4274 tail = Qnil; | |
4275 else | |
4276 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
4277 if (!SYMBOLP (XCAR (tail))) | |
4278 break; | |
4279 if (NILP (tail)) | |
4280 LFACE_INHERIT (lface) = value; | |
4281 else | |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
4282 signal_error ("Invalid face inheritance", value); |
31178 | 4283 } |
24995 | 4284 else if (EQ (attr, QCbold)) |
4285 { | |
4286 old_value = LFACE_WEIGHT (lface); | |
4287 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; | |
4288 font_related_attr_p = 1; | |
4289 } | |
4290 else if (EQ (attr, QCitalic)) | |
4291 { | |
4292 old_value = LFACE_SLANT (lface); | |
4293 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; | |
4294 font_related_attr_p = 1; | |
4295 } | |
4296 else | |
4297 signal_error ("Invalid face attribute name", attr); | |
4298 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4299 if (font_related_attr_p |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4300 && !UNSPECIFIEDP (value)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4301 /* 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
|
4302 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
|
4303 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
|
4304 selection mechanism doesn't use it. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4305 LFACE_FONT (lface) = Qnil; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4306 |
24995 | 4307 /* Changing a named face means that all realized faces depending on |
4308 that face are invalid. Since we cannot tell which realized faces | |
4309 depend on the face, make sure they are all removed. This is done | |
4310 by incrementing face_change_count. The next call to | |
4311 init_iterator will then free realized faces. */ | |
4312 if (!EQ (frame, Qt) | |
57107 | 4313 && NILP (Fget (face, Qface_no_inherit)) |
24995 | 4314 && (EQ (attr, QCfont) |
4315 || NILP (Fequal (old_value, value)))) | |
4316 { | |
4317 ++face_change_count; | |
4318 ++windows_or_buffers_changed; | |
4319 } | |
4320 | |
34242
dd4e1abada68
(Finternal_set_lisp_face_attribute): If FRAME is `t', update
Miles Bader <miles@gnu.org>
parents:
34160
diff
changeset
|
4321 if (!UNSPECIFIEDP (value) |
24995 | 4322 && NILP (Fequal (old_value, value))) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4323 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4324 Lisp_Object param; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4325 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4326 param = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4327 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4328 if (EQ (face, Qdefault)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4329 { |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4330 #ifdef HAVE_WINDOW_SYSTEM |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4331 /* 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
|
4332 reflected in changed `font' frame parameters. */ |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4333 if (FRAMEP (frame) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4334 && (font_related_attr_p || font_attr_p) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4335 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4336 set_font_frame_param (frame, lface); |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4337 else |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4338 #endif /* HAVE_WINDOW_SYSTEM */ |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4339 |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4340 if (EQ (attr, QCforeground)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4341 param = Qforeground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4342 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4343 param = Qbackground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4344 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4345 #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
|
4346 #ifndef WINDOWSNT |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4347 else if (EQ (face, Qscroll_bar)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4348 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4349 /* 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
|
4350 `scroll-bar-foreground' and `scroll-bar-background'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4351 if (EQ (attr, QCforeground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4352 param = Qscroll_bar_foreground; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4353 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4354 param = Qscroll_bar_background; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4355 } |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
4356 #endif /* not WINDOWSNT */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4357 else if (EQ (face, Qborder)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4358 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4359 /* Changing background color of `border' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4360 `border-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4361 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4362 param = Qborder_color; |
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 else if (EQ (face, Qcursor)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4365 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4366 /* Changing background color of `cursor' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4367 `cursor-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4368 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4369 param = Qcursor_color; |
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 else if (EQ (face, Qmouse)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4372 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4373 /* Changing background color of `mouse' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4374 `mouse-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4375 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4376 param = Qmouse_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4377 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
4378 #endif /* HAVE_WINDOW_SYSTEM */ |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
4379 else if (EQ (face, Qmenu)) |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4380 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4381 /* 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
|
4382 realizing faces on FRAME. FRAME t change the |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4383 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
|
4384 setting the flag in new face caches */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4385 if (FRAMEP (frame)) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4386 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4387 struct frame *f = XFRAME (frame); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4388 if (FRAME_FACE_CACHE (f) == NULL) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4389 FRAME_FACE_CACHE (f) = make_face_cache (f); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4390 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
|
4391 } |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4392 else |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4393 menu_face_changed_default = 1; |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4394 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4395 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4396 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
|
4397 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4398 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
|
4399 /* 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
|
4400 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4401 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
|
4402 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4403 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4404 /* 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
|
4405 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4406 Lisp_Object cons; |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4407 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
|
4408 XSETCAR (cons, param); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4409 XSETCDR (cons, value); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4410 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
|
4411 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
4412 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4413 } |
24995 | 4414 |
4415 return face; | |
4416 } | |
4417 | |
4418 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4419 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4420 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4421 /* 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
|
4422 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
|
4423 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
|
4424 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
|
4425 there's no matching font, signals an error. */ |
24995 | 4426 |
4427 static void | |
4428 set_font_frame_param (frame, lface) | |
4429 Lisp_Object frame, lface; | |
4430 { | |
4431 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
|
4432 |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4433 if (FRAME_WINDOW_P (f)) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4434 { |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4435 Lisp_Object font_name; |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4436 char *font; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4437 |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4438 if (STRINGP (LFACE_FONT (lface))) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4439 font_name = LFACE_FONT (lface); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4440 else |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4441 { |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4442 /* 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
|
4443 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
|
4444 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
|
4445 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
|
4446 if (!font) |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4447 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
|
4448 font_name = build_string (font); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4449 xfree (font); |
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
4450 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4451 |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
4452 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
|
4453 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
|
4454 } |
24995 | 4455 } |
4456 | |
4457 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4458 /* 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
|
4459 has been assigned the value NEW_VALUE. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4460 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4461 void |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4462 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
|
4463 struct frame *f; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4464 Lisp_Object param, new_value; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4465 { |
57107 | 4466 Lisp_Object face = Qnil; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4467 Lisp_Object lface; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4468 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4469 /* 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
|
4470 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
|
4471 face-set-after-frame-defaults. */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4472 if (NILP (f->face_alist)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4473 return; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4474 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4475 if (EQ (param, Qforeground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4476 { |
57107 | 4477 face = Qdefault; |
4478 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
|
4479 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4480 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4481 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4482 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4483 else if (EQ (param, Qbackground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4484 { |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4485 Lisp_Object frame; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4486 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4487 /* 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
|
4488 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
|
4489 frame-update-face-colors to do that. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4490 XSETFRAME (frame, f); |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
4491 call1 (Qframe_update_face_colors, frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4492 |
57107 | 4493 face = Qdefault; |
4494 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
|
4495 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4496 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4497 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4498 } |
57107 | 4499 else if (EQ (param, Qborder_color)) |
4500 { | |
4501 face = Qborder; | |
4502 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
|
4503 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4504 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4505 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4506 else if (EQ (param, Qcursor_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4507 { |
57107 | 4508 face = Qcursor; |
4509 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
|
4510 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4511 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4512 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4513 else if (EQ (param, Qmouse_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4514 { |
57107 | 4515 face = Qmouse; |
4516 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
|
4517 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4518 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4519 } |
57107 | 4520 |
4521 /* Changing a named face means that all realized faces depending on | |
4522 that face are invalid. Since we cannot tell which realized faces | |
4523 depend on the face, make sure they are all removed. This is done | |
4524 by incrementing face_change_count. The next call to | |
4525 init_iterator will then free realized faces. */ | |
4526 if (!NILP (face) | |
4527 && NILP (Fget (face, Qface_no_inherit))) | |
4528 { | |
4529 ++face_change_count; | |
4530 ++windows_or_buffers_changed; | |
4531 } | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4532 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4533 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
4534 |
24995 | 4535 /* Get the value of X resource RESOURCE, class CLASS for the display |
4536 of frame FRAME. This is here because ordinary `x-get-resource' | |
4537 doesn't take a frame argument. */ | |
4538 | |
4539 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
|
4540 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
|
4541 (resource, class, frame) |
24995 | 4542 Lisp_Object resource, class, frame; |
4543 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4544 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
|
4545 CHECK_STRING (resource); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4546 CHECK_STRING (class); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4547 CHECK_LIVE_FRAME (frame); |
24995 | 4548 BLOCK_INPUT; |
4549 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
4550 resource, class, Qnil, Qnil); | |
4551 UNBLOCK_INPUT; | |
4552 return value; | |
4553 } | |
4554 | |
4555 | |
4556 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
4557 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
4558 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
4559 error; if SIGNAL_P is zero, return 0. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4560 |
24995 | 4561 static Lisp_Object |
4562 face_boolean_x_resource_value (value, signal_p) | |
4563 Lisp_Object value; | |
4564 int signal_p; | |
4565 { | |
4566 Lisp_Object result = make_number (0); | |
4567 | |
4568 xassert (STRINGP (value)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4569 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4570 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
|
4571 || xstricmp (SDATA (value), "true") == 0) |
24995 | 4572 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
|
4573 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
|
4574 || xstricmp (SDATA (value), "false") == 0) |
24995 | 4575 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
|
4576 else if (xstricmp (SDATA (value), "unspecified") == 0) |
24995 | 4577 result = Qunspecified; |
4578 else if (signal_p) | |
4579 signal_error ("Invalid face attribute value from X resource", value); | |
4580 | |
4581 return result; | |
4582 } | |
4583 | |
4584 | |
4585 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
4586 Finternal_set_lisp_face_attribute_from_resource, | |
4587 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
|
4588 3, 4, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4589 (face, attr, value, frame) |
24995 | 4590 Lisp_Object face, attr, value, frame; |
4591 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4592 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4593 CHECK_SYMBOL (attr); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4594 CHECK_STRING (value); |
24995 | 4595 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4596 if (xstricmp (SDATA (value), "unspecified") == 0) |
24995 | 4597 value = Qunspecified; |
4598 else if (EQ (attr, QCheight)) | |
4599 { | |
4600 value = Fstring_to_number (value, make_number (10)); | |
4601 if (XINT (value) <= 0) | |
4602 signal_error ("Invalid face height from X resource", value); | |
4603 } | |
4604 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
4605 value = face_boolean_x_resource_value (value, 1); | |
4606 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
|
4607 value = intern (SDATA (value)); |
24995 | 4608 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
4609 value = face_boolean_x_resource_value (value, 1); | |
4610 else if (EQ (attr, QCunderline) | |
4611 || EQ (attr, QCoverline) | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4612 || EQ (attr, QCstrike_through)) |
24995 | 4613 { |
4614 Lisp_Object boolean_value; | |
4615 | |
4616 /* If the result of face_boolean_x_resource_value is t or nil, | |
4617 VALUE does NOT specify a color. */ | |
4618 boolean_value = face_boolean_x_resource_value (value, 0); | |
4619 if (SYMBOLP (boolean_value)) | |
4620 value = boolean_value; | |
4621 } | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4622 else if (EQ (attr, QCbox)) |
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
4623 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
24995 | 4624 |
4625 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
|
4626 } |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4627 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4628 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4629 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4630 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4631 /*********************************************************************** |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4632 Menu face |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4633 ***********************************************************************/ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4634 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4635 #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
|
4636 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4637 /* 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
|
4638 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4639 static void |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4640 x_update_menu_appearance (f) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4641 struct frame *f; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4642 { |
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4643 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
|
4644 XrmDatabase rdb; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4645 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4646 if (dpyinfo |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4647 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4648 rdb != NULL)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4649 { |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4650 char line[512]; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4651 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
|
4652 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
|
4653 const char *myname = SDATA (Vx_resource_name); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4654 int changed_p = 0; |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4655 #ifdef USE_MOTIF |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4656 const char *popup_path = "popup_menu"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4657 #else |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4658 const char *popup_path = "menu.popup"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4659 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4660 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4661 if (STRINGP (LFACE_FOREGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4662 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4663 sprintf (line, "%s.%s*foreground: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4664 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
|
4665 SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4666 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4667 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
|
4668 myname, SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4669 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4670 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4671 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4672 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4673 if (STRINGP (LFACE_BACKGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4674 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4675 sprintf (line, "%s.%s*background: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
4676 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
|
4677 SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4678 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4679 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
|
4680 myname, SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4681 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4682 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4683 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4684 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4685 if (face->font_name |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4686 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4687 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4688 || !UNSPECIFIEDP (LFACE_AVGWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4689 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4690 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4691 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4692 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
4693 #ifdef USE_MOTIF |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4694 const char *suffix = "List"; |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4695 Bool motif = True; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4696 #else |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4697 const char *suffix = ""; |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4698 Bool motif = False; |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4699 #endif |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4700 #if defined HAVE_X_I18N |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4701 extern char *xic_create_fontsetname |
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4702 P_ ((char *base_fontname, Bool motif)); |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4703 char *fontsetname = xic_create_fontsetname (face->font_name, motif); |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4704 #else |
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4705 char *fontsetname = face->font_name; |
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4706 #endif |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4707 sprintf (line, "%s.pane.menubar*font%s: %s", |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4708 myname, suffix, fontsetname); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4709 XrmPutLineResource (&rdb, line); |
36996
46d9cc8def79
(x_update_menu_appearance): Use local variable
Gerd Moellmann <gerd@gnu.org>
parents:
36956
diff
changeset
|
4710 sprintf (line, "%s.%s*font%s: %s", |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
4711 myname, popup_path, suffix, fontsetname); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4712 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4713 changed_p = 1; |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4714 if (fontsetname != face->font_name) |
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
4715 xfree (fontsetname); |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
4716 } |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4717 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4718 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
|
4719 free_frame_menubar (f); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4720 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4721 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4722 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
4723 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
24995 | 4724 |
4725 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
4726 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
|
4727 Sface_attribute_relative_p, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4728 2, 2, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4729 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
|
4730 (attribute, value) |
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
4731 Lisp_Object attribute, value; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4732 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4733 if (EQ (value, Qunspecified)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4734 return Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4735 else if (EQ (attribute, QCheight)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4736 return INTEGERP (value) ? Qnil : Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4737 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4738 return Qnil; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4739 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4740 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4741 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
|
4742 3, 3, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4743 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
|
4744 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
|
4745 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
|
4746 (attribute, value1, value2) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4747 Lisp_Object attribute, value1, value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4748 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4749 if (EQ (value1, Qunspecified)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4750 return value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4751 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
|
4752 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
|
4753 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4754 return value1; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4755 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
4756 |
24995 | 4757 |
4758 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
4759 Sinternal_get_lisp_face_attribute, | |
4760 2, 3, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4761 doc: /* Return face attribute KEYWORD of face SYMBOL. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4762 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
|
4763 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
|
4764 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
|
4765 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
|
4766 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
|
4767 (symbol, keyword, frame) |
24995 | 4768 Lisp_Object symbol, keyword, frame; |
4769 { | |
4770 Lisp_Object lface, value = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4771 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4772 CHECK_SYMBOL (symbol); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4773 CHECK_SYMBOL (keyword); |
24995 | 4774 |
4775 if (EQ (frame, Qt)) | |
4776 lface = lface_from_face_name (NULL, symbol, 1); | |
4777 else | |
4778 { | |
4779 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4780 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4781 CHECK_LIVE_FRAME (frame); |
24995 | 4782 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
4783 } | |
4784 | |
4785 if (EQ (keyword, QCfamily)) | |
4786 value = LFACE_FAMILY (lface); | |
4787 else if (EQ (keyword, QCheight)) | |
4788 value = LFACE_HEIGHT (lface); | |
4789 else if (EQ (keyword, QCweight)) | |
4790 value = LFACE_WEIGHT (lface); | |
4791 else if (EQ (keyword, QCslant)) | |
4792 value = LFACE_SLANT (lface); | |
4793 else if (EQ (keyword, QCunderline)) | |
4794 value = LFACE_UNDERLINE (lface); | |
4795 else if (EQ (keyword, QCoverline)) | |
4796 value = LFACE_OVERLINE (lface); | |
4797 else if (EQ (keyword, QCstrike_through)) | |
4798 value = LFACE_STRIKE_THROUGH (lface); | |
4799 else if (EQ (keyword, QCbox)) | |
4800 value = LFACE_BOX (lface); | |
4801 else if (EQ (keyword, QCinverse_video) | |
4802 || EQ (keyword, QCreverse_video)) | |
4803 value = LFACE_INVERSE (lface); | |
4804 else if (EQ (keyword, QCforeground)) | |
4805 value = LFACE_FOREGROUND (lface); | |
4806 else if (EQ (keyword, QCbackground)) | |
4807 value = LFACE_BACKGROUND (lface); | |
4808 else if (EQ (keyword, QCstipple)) | |
4809 value = LFACE_STIPPLE (lface); | |
4810 else if (EQ (keyword, QCwidth)) | |
4811 value = LFACE_SWIDTH (lface); | |
31178 | 4812 else if (EQ (keyword, QCinherit)) |
4813 value = LFACE_INHERIT (lface); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4814 else if (EQ (keyword, QCfont)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4815 value = LFACE_FONT (lface); |
24995 | 4816 else |
4817 signal_error ("Invalid face attribute name", keyword); | |
4818 | |
4819 return value; | |
4820 } | |
4821 | |
4822 | |
4823 DEFUN ("internal-lisp-face-attribute-values", | |
4824 Finternal_lisp_face_attribute_values, | |
4825 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
|
4826 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
|
4827 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
|
4828 (attr) |
24995 | 4829 Lisp_Object attr; |
4830 { | |
4831 Lisp_Object result = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4832 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4833 CHECK_SYMBOL (attr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4834 |
24995 | 4835 if (EQ (attr, QCweight) |
4836 || EQ (attr, QCslant) | |
4837 || EQ (attr, QCwidth)) | |
4838 { | |
4839 /* Extract permissible symbols from tables. */ | |
4840 struct table_entry *table; | |
4841 int i, dim; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4842 |
24995 | 4843 if (EQ (attr, QCweight)) |
4844 table = weight_table, dim = DIM (weight_table); | |
4845 else if (EQ (attr, QCslant)) | |
4846 table = slant_table, dim = DIM (slant_table); | |
4847 else | |
4848 table = swidth_table, dim = DIM (swidth_table); | |
4849 | |
4850 for (i = 0; i < dim; ++i) | |
4851 { | |
4852 Lisp_Object symbol = *table[i].symbol; | |
4853 Lisp_Object tail = result; | |
4854 | |
4855 while (!NILP (tail) | |
4856 && !EQ (XCAR (tail), symbol)) | |
4857 tail = XCDR (tail); | |
4858 | |
4859 if (NILP (tail)) | |
4860 result = Fcons (symbol, result); | |
4861 } | |
4862 } | |
4863 else if (EQ (attr, QCunderline)) | |
4864 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4865 else if (EQ (attr, QCoverline)) | |
4866 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4867 else if (EQ (attr, QCstrike_through)) | |
4868 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4869 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
4870 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
4871 | |
4872 return result; | |
4873 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4874 |
24995 | 4875 |
4876 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
|
4877 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
|
4878 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
|
4879 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
|
4880 (face, frame) |
24995 | 4881 Lisp_Object face, frame; |
4882 { | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4883 int i; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4884 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4885 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4886 CHECK_LIVE_FRAME (frame); |
24995 | 4887 global_lface = lface_from_face_name (NULL, face, 1); |
4888 local_lface = lface_from_face_name (XFRAME (frame), face, 0); | |
4889 if (NILP (local_lface)) | |
4890 local_lface = Finternal_make_lisp_face (face, frame); | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4891 |
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
4892 /* 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
|
4893 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
|
4894 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
|
4895 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
|
4896 "global before local" priority. */ |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4897 lvec = XVECTOR (local_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4898 gvec = XVECTOR (global_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4899 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4900 if (! UNSPECIFIEDP (gvec[i])) |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
4901 lvec[i] = gvec[i]; |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4902 |
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4903 return Qnil; |
24995 | 4904 } |
4905 | |
4906 | |
4907 /* The following function is implemented for compatibility with 20.2. | |
4908 The function is used in x-resolve-fonts when it is asked to | |
4909 return fonts with the same size as the font of a face. This is | |
4910 done in fontset.el. */ | |
4911 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4912 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
|
4913 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
|
4914 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
|
4915 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
|
4916 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
|
4917 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
|
4918 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
|
4919 (face, frame) |
24995 | 4920 Lisp_Object face, frame; |
4921 { | |
4922 if (EQ (frame, Qt)) | |
4923 { | |
4924 Lisp_Object result = Qnil; | |
4925 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
4926 | |
4927 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
4928 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
4929 result = Fcons (Qbold, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4930 |
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4931 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
24995 | 4932 && !EQ (LFACE_SLANT (lface), Qnormal)) |
4933 result = Fcons (Qitalic, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4934 |
24995 | 4935 return result; |
4936 } | |
4937 else | |
4938 { | |
4939 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
|
4940 int face_id = lookup_named_face (f, face, 0, 1); |
24995 | 4941 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
|
4942 return face ? build_string (face->font_name) : Qnil; |
24995 | 4943 } |
4944 } | |
4945 | |
4946 | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4947 /* 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
|
4948 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
|
4949 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
|
4950 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4951 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
|
4952 face_attr_equal_p (v1, v2) |
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4953 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
|
4954 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4955 /* 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
|
4956 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
|
4957 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
|
4958 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4959 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4960 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
|
4961 return 1; |
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 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
|
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_String: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4966 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
|
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 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
|
4970 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4971 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
|
4972 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
|
4973 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4974 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4975 default: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4976 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
|
4977 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4978 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4979 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4980 |
24995 | 4981 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
4982 all attributes are `equal'. Tries to be fast because this function | |
4983 is called quite often. */ | |
4984 | |
4985 static INLINE int | |
4986 lface_equal_p (v1, v2) | |
4987 Lisp_Object *v1, *v2; | |
4988 { | |
4989 int i, equal_p = 1; | |
4990 | |
4991 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
|
4992 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
|
4993 |
24995 | 4994 return equal_p; |
4995 } | |
4996 | |
4997 | |
4998 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
4999 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
|
5000 doc: /* True if FACE1 and FACE2 are equal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5001 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
|
5002 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
|
5003 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
|
5004 (face1, face2, frame) |
24995 | 5005 Lisp_Object face1, face2, frame; |
5006 { | |
5007 int equal_p; | |
5008 struct frame *f; | |
5009 Lisp_Object lface1, lface2; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5010 |
24995 | 5011 if (EQ (frame, Qt)) |
5012 f = NULL; | |
5013 else | |
5014 /* Don't use check_x_frame here because this function is called | |
5015 before X frames exist. At that time, if FRAME is nil, | |
5016 selected_frame will be used which is the frame dumped with | |
5017 Emacs. That frame is not an X frame. */ | |
5018 f = frame_or_selected_frame (frame, 2); | |
5019 | |
5020 lface1 = lface_from_face_name (NULL, face1, 1); | |
5021 lface2 = lface_from_face_name (NULL, face2, 1); | |
5022 equal_p = lface_equal_p (XVECTOR (lface1)->contents, | |
5023 XVECTOR (lface2)->contents); | |
5024 return equal_p ? Qt : Qnil; | |
5025 } | |
5026 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5027 |
24995 | 5028 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
5029 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
|
5030 doc: /* True if FACE has no attribute specified. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5031 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
|
5032 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
|
5033 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
|
5034 (face, frame) |
24995 | 5035 Lisp_Object face, frame; |
5036 { | |
5037 struct frame *f; | |
5038 Lisp_Object lface; | |
5039 int i; | |
5040 | |
5041 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5042 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5043 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
5044 f = XFRAME (frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5045 |
24995 | 5046 if (EQ (frame, Qt)) |
5047 lface = lface_from_face_name (NULL, face, 1); | |
5048 else | |
5049 lface = lface_from_face_name (f, face, 1); | |
5050 | |
5051 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
|
5052 if (!UNSPECIFIEDP (AREF (lface, i))) |
24995 | 5053 break; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5054 |
24995 | 5055 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
5056 } | |
5057 | |
5058 | |
5059 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
|
5060 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5061 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
|
5062 For internal use only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5063 (frame) |
24995 | 5064 Lisp_Object frame; |
5065 { | |
5066 struct frame *f = frame_or_selected_frame (frame, 0); | |
5067 return f->face_alist; | |
5068 } | |
5069 | |
5070 | |
5071 /* Return a hash code for Lisp string STRING with case ignored. Used | |
5072 below in computing a hash value for a Lisp face. */ | |
5073 | |
5074 static INLINE unsigned | |
5075 hash_string_case_insensitive (string) | |
5076 Lisp_Object string; | |
5077 { | |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
5078 const unsigned char *s; |
24995 | 5079 unsigned hash = 0; |
5080 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
|
5081 for (s = SDATA (string); *s; ++s) |
24995 | 5082 hash = (hash << 1) ^ tolower (*s); |
5083 return hash; | |
5084 } | |
5085 | |
5086 | |
5087 /* Return a hash code for face attribute vector V. */ | |
5088 | |
5089 static INLINE unsigned | |
5090 lface_hash (v) | |
5091 Lisp_Object *v; | |
5092 { | |
5093 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
5094 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) | |
5095 ^ 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
|
5096 ^ 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
|
5097 ^ 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
|
5098 ^ XFASTINT (v[LFACE_SWIDTH_INDEX]) |
24995 | 5099 ^ XFASTINT (v[LFACE_HEIGHT_INDEX])); |
5100 } | |
5101 | |
5102 | |
5103 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
5104 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
|
5105 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
|
5106 and LFACE2 must be fully-specified. */ |
24995 | 5107 |
5108 static INLINE int | |
5109 lface_same_font_attributes_p (lface1, lface2) | |
5110 Lisp_Object *lface1, *lface2; | |
5111 { | |
5112 xassert (lface_fully_specified_p (lface1) | |
5113 && 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
|
5114 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
|
5115 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
31178 | 5116 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
24995 | 5117 && 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
|
5118 && EQ (lface1[LFACE_AVGWIDTH_INDEX], lface2[LFACE_AVGWIDTH_INDEX]) |
24995 | 5119 && 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
|
5120 && 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
|
5121 && (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
|
5122 || (STRINGP (lface1[LFACE_FONT_INDEX]) |
28263
73181b84ea57
(lface_same_font_attributes_p): Compare font attributes
Gerd Moellmann <gerd@gnu.org>
parents:
28237
diff
changeset
|
5123 && 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
|
5124 && 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
|
5125 SDATA (lface2[LFACE_FONT_INDEX]))))); |
24995 | 5126 } |
5127 | |
5128 | |
5129 | |
5130 /*********************************************************************** | |
5131 Realized Faces | |
5132 ***********************************************************************/ | |
5133 | |
5134 /* 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
|
5135 vector ATTR. */ |
24995 | 5136 |
5137 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5138 make_realized_face (attr) |
24995 | 5139 Lisp_Object *attr; |
5140 { | |
5141 struct face *face = (struct face *) xmalloc (sizeof *face); | |
5142 bzero (face, sizeof *face); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5143 face->ascii_face = face; |
24995 | 5144 bcopy (attr, face->lface, sizeof face->lface); |
5145 return face; | |
5146 } | |
5147 | |
5148 | |
5149 /* Free realized face FACE, including its X resources. FACE may | |
5150 be null. */ | |
5151 | |
5152 static void | |
5153 free_realized_face (f, face) | |
5154 struct frame *f; | |
5155 struct face *face; | |
5156 { | |
5157 if (face) | |
5158 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5159 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5160 if (FRAME_WINDOW_P (f)) |
24995 | 5161 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5162 /* 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
|
5163 if (face->fontset >= 0 && face == face->ascii_face) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5164 free_face_fontset (f, face); |
24995 | 5165 if (face->gc) |
5166 { | |
5167 x_free_gc (f, face->gc); | |
5168 face->gc = 0; | |
5169 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5170 |
24995 | 5171 free_face_colors (f, face); |
5172 x_destroy_bitmap (f, face->stipple); | |
5173 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5174 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5175 |
5176 xfree (face); | |
5177 } | |
5178 } | |
5179 | |
5180 | |
5181 /* Prepare face FACE for subsequent display on frame F. This | |
5182 allocated GCs if they haven't been allocated yet or have been freed | |
5183 by clearing the face cache. */ | |
5184 | |
5185 void | |
5186 prepare_face_for_display (f, face) | |
5187 struct frame *f; | |
5188 struct face *face; | |
5189 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5190 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5191 xassert (FRAME_WINDOW_P (f)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5192 |
24995 | 5193 if (face->gc == 0) |
5194 { | |
5195 XGCValues xgcv; | |
5196 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
5197 | |
5198 xgcv.foreground = face->foreground; | |
5199 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
|
5200 #ifdef HAVE_X_WINDOWS |
24995 | 5201 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
|
5202 #endif |
24995 | 5203 /* The font of FACE may be null if we couldn't load it. */ |
5204 if (face->font) | |
5205 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5206 #ifdef HAVE_X_WINDOWS |
24995 | 5207 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
|
5208 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5209 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5210 xgcv.font = face->font; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5211 #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
|
5212 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5213 xgcv.font = face->font; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32176
diff
changeset
|
5214 #endif |
24995 | 5215 mask |= GCFont; |
5216 } | |
5217 | |
5218 BLOCK_INPUT; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5219 #ifdef HAVE_X_WINDOWS |
24995 | 5220 if (face->stipple) |
5221 { | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
5222 xgcv.fill_style = FillOpaqueStippled; |
24995 | 5223 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
5224 mask |= GCFillStyle | GCStipple; | |
5225 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5226 #endif |
24995 | 5227 face->gc = x_create_gc (f, mask, &xgcv); |
5228 UNBLOCK_INPUT; | |
5229 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5230 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5231 } |
5232 | |
5233 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5234 /* 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
|
5235 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5236 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5237 color_distance (x, y) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5238 XColor *x, *y; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5239 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5240 /* 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
|
5241 Quoting from that paper: |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5242 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5243 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
|
5244 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
|
5245 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
|
5246 gives far from optimal results. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5247 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5248 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
|
5249 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5250 long r = (x->red - y->red) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5251 long g = (x->green - y->green) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5252 long b = (x->blue - y->blue) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5253 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
|
5254 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5255 return |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5256 (((512 + r_mean) * r * r) >> 8) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5257 + 4 * g * g |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5258 + (((767 - r_mean) * b * b) >> 8); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5259 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5260 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5261 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5262 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
|
5263 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
|
5264 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
|
5265 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
|
5266 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
|
5267 (color1, color2, frame) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5268 Lisp_Object color1, color2, frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5269 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5270 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5271 XColor cdef1, cdef2; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5272 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5273 if (NILP (frame)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5274 frame = selected_frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5275 CHECK_LIVE_FRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5276 f = XFRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5277 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5278 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
|
5279 || !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
|
5280 || !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
|
5281 signal_error ("Invalid color", color1); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5282 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
|
5283 || !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
|
5284 || !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
|
5285 signal_error ("Invalid color", color2); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5286 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5287 return make_number (color_distance (&cdef1, &cdef2)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5288 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5289 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5290 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
5291 /*********************************************************************** |
24995 | 5292 Face Cache |
5293 ***********************************************************************/ | |
5294 | |
5295 /* Return a new face cache for frame F. */ | |
5296 | |
5297 static struct face_cache * | |
5298 make_face_cache (f) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5299 struct frame *f; |
24995 | 5300 { |
5301 struct face_cache *c; | |
5302 int size; | |
5303 | |
5304 c = (struct face_cache *) xmalloc (sizeof *c); | |
5305 bzero (c, sizeof *c); | |
5306 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
5307 c->buckets = (struct face **) xmalloc (size); | |
5308 bzero (c->buckets, size); | |
5309 c->size = 50; | |
5310 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
5311 c->f = f; | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5312 c->menu_face_changed_p = menu_face_changed_default; |
24995 | 5313 return c; |
5314 } | |
5315 | |
5316 | |
5317 /* Clear out all graphics contexts for all realized faces, except for | |
5318 the basic faces. This should be done from time to time just to avoid | |
5319 keeping too many graphics contexts that are no longer needed. */ | |
5320 | |
5321 static void | |
5322 clear_face_gcs (c) | |
5323 struct face_cache *c; | |
5324 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5325 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
|
5326 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5327 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5328 int i; |
5329 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
5330 { | |
5331 struct face *face = c->faces_by_id[i]; | |
5332 if (face && face->gc) | |
5333 { | |
5334 x_free_gc (c->f, face->gc); | |
5335 face->gc = 0; | |
5336 } | |
5337 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5338 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5339 } |
5340 } | |
5341 | |
5342 | |
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
5343 /* 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
|
5344 C may be null. If faces are freed, make sure the frame's current |
24995 | 5345 matrix is marked invalid, so that a display caused by an expose |
5346 event doesn't try to use faces we destroyed. */ | |
5347 | |
5348 static void | |
5349 free_realized_faces (c) | |
5350 struct face_cache *c; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5351 { |
24995 | 5352 if (c && c->used) |
5353 { | |
5354 int i, size; | |
5355 struct frame *f = c->f; | |
5356 | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5357 /* 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
|
5358 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
|
5359 current matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5360 BLOCK_INPUT; |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5361 |
24995 | 5362 for (i = 0; i < c->used; ++i) |
5363 { | |
5364 free_realized_face (f, c->faces_by_id[i]); | |
5365 c->faces_by_id[i] = NULL; | |
5366 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5367 |
24995 | 5368 c->used = 0; |
5369 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
5370 bzero (c->buckets, size); | |
5371 | |
5372 /* Must do a thorough redisplay the next time. Mark current | |
5373 matrices as invalid because they will reference faces freed | |
5374 above. This function is also called when a frame is | |
5375 destroyed. In this case, the root window of F is nil. */ | |
5376 if (WINDOWP (f->root_window)) | |
5377 { | |
5378 clear_current_matrices (f); | |
5379 ++windows_or_buffers_changed; | |
5380 } | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5381 |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5382 UNBLOCK_INPUT; |
24995 | 5383 } |
5384 } | |
5385 | |
5386 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5387 /* 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
|
5388 has FONTSET. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5389 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5390 void |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5391 free_realized_multibyte_face (f, fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5392 struct frame *f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5393 int fontset; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5394 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5395 struct face_cache *cache = FRAME_FACE_CACHE (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5396 struct face *face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5397 int i; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5398 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5399 /* 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
|
5400 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
|
5401 matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5402 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5403 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5404 for (i = 0; i < cache->used; i++) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5405 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5406 face = cache->faces_by_id[i]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5407 if (face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5408 && face != face->ascii_face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5409 && face->fontset == fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5410 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5411 uncache_face (cache, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5412 free_realized_face (f, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5413 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5414 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5415 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5416 /* 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
|
5417 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
|
5418 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
|
5419 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
|
5420 if (WINDOWP (f->root_window)) |
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 clear_current_matrices (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5423 ++windows_or_buffers_changed; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5424 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5425 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
5426 UNBLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5427 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5428 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5429 |
24995 | 5430 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
5431 This is done after attributes of a named face have been changed, | |
5432 because we can't tell which realized faces depend on that face. */ | |
5433 | |
5434 void | |
5435 free_all_realized_faces (frame) | |
5436 Lisp_Object frame; | |
5437 { | |
5438 if (NILP (frame)) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5439 { |
24995 | 5440 Lisp_Object rest; |
5441 FOR_EACH_FRAME (rest, frame) | |
5442 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
5443 } | |
5444 else | |
5445 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
5446 } | |
5447 | |
5448 | |
5449 /* Free face cache C and faces in it, including their X resources. */ | |
5450 | |
5451 static void | |
5452 free_face_cache (c) | |
5453 struct face_cache *c; | |
5454 { | |
5455 if (c) | |
5456 { | |
5457 free_realized_faces (c); | |
5458 xfree (c->buckets); | |
5459 xfree (c->faces_by_id); | |
5460 xfree (c); | |
5461 } | |
5462 } | |
5463 | |
5464 | |
5465 /* Cache realized face FACE in face cache C. HASH is the hash value | |
5466 of FACE. If FACE->fontset >= 0, add the new face to the end of the | |
5467 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
|
5468 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
|
5469 faces with the same attributes but for specific characters exist. */ |
24995 | 5470 |
5471 static void | |
5472 cache_face (c, face, hash) | |
5473 struct face_cache *c; | |
5474 struct face *face; | |
5475 unsigned hash; | |
5476 { | |
5477 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
5478 | |
5479 face->hash = hash; | |
5480 | |
5481 if (face->fontset >= 0) | |
5482 { | |
5483 struct face *last = c->buckets[i]; | |
5484 if (last) | |
5485 { | |
5486 while (last->next) | |
5487 last = last->next; | |
5488 last->next = face; | |
5489 face->prev = last; | |
5490 face->next = NULL; | |
5491 } | |
5492 else | |
5493 { | |
5494 c->buckets[i] = face; | |
5495 face->prev = face->next = NULL; | |
5496 } | |
5497 } | |
5498 else | |
5499 { | |
5500 face->prev = NULL; | |
5501 face->next = c->buckets[i]; | |
5502 if (face->next) | |
5503 face->next->prev = face; | |
5504 c->buckets[i] = face; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5505 } |
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5506 |
24995 | 5507 /* Find a free slot in C->faces_by_id and use the index of the free |
5508 slot as FACE->id. */ | |
5509 for (i = 0; i < c->used; ++i) | |
5510 if (c->faces_by_id[i] == NULL) | |
5511 break; | |
5512 face->id = i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5513 |
24995 | 5514 /* 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
|
5515 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
|
5516 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5517 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
|
5518 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5519 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
|
5520 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
|
5521 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
|
5522 abort (); /* Alternatives? ++kfs */ |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5523 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
|
5524 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
|
5525 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
|
5526 } |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
5527 c->used++; |
24995 | 5528 } |
5529 | |
5530 #if GLYPH_DEBUG | |
5531 /* Check that FACE got a unique id. */ | |
5532 { | |
5533 int j, n; | |
5534 struct face *face; | |
5535 | |
5536 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
5537 for (face = c->buckets[j]; face; face = face->next) | |
5538 if (face->id == i) | |
5539 ++n; | |
5540 | |
5541 xassert (n == 1); | |
5542 } | |
5543 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5544 |
24995 | 5545 c->faces_by_id[i] = face; |
5546 } | |
5547 | |
5548 | |
5549 /* Remove face FACE from cache C. */ | |
5550 | |
5551 static void | |
5552 uncache_face (c, face) | |
5553 struct face_cache *c; | |
5554 struct face *face; | |
5555 { | |
5556 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5557 |
24995 | 5558 if (face->prev) |
5559 face->prev->next = face->next; | |
5560 else | |
5561 c->buckets[i] = face->next; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5562 |
24995 | 5563 if (face->next) |
5564 face->next->prev = face->prev; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5565 |
24995 | 5566 c->faces_by_id[face->id] = NULL; |
5567 if (face->id == c->used) | |
5568 --c->used; | |
5569 } | |
5570 | |
5571 | |
5572 /* 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
|
5573 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
|
5574 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
|
5575 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
|
5576 is a face that has the same attributes. */ |
24995 | 5577 |
5578 INLINE int | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5579 lookup_face (f, attr, c, base_face) |
24995 | 5580 struct frame *f; |
5581 Lisp_Object *attr; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5582 int c; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5583 struct face *base_face; |
24995 | 5584 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5585 struct face_cache *cache = FRAME_FACE_CACHE (f); |
24995 | 5586 unsigned hash; |
5587 int i; | |
5588 struct face *face; | |
5589 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5590 xassert (cache != NULL); |
24995 | 5591 check_lface_attrs (attr); |
5592 | |
5593 /* Look up ATTR in the face cache. */ | |
5594 hash = lface_hash (attr); | |
5595 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5596 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5597 for (face = cache->buckets[i]; face; face = face->next) |
24995 | 5598 if (face->hash == hash |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5599 && (!FRAME_WINDOW_P (f) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5600 || FACE_SUITABLE_FOR_CHAR_P (face, c)) |
24995 | 5601 && lface_equal_p (face->lface, attr)) |
5602 break; | |
5603 | |
5604 /* If not found, realize a new face. */ | |
5605 if (face == NULL) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5606 face = realize_face (cache, attr, c, base_face, -1); |
24995 | 5607 |
5608 #if GLYPH_DEBUG | |
5609 xassert (face == FACE_FROM_ID (f, face->id)); | |
28409 | 5610 |
5611 /* When this function is called from face_for_char (in this case, C is | |
5612 a multibyte character), a fontset of a face returned by | |
5613 realize_face is not yet set, i.e. FACE_SUITABLE_FOR_CHAR_P (FACE, | |
5614 C) is not sutisfied. The fontset is set for this face by | |
5615 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
|
5616 #if 0 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5617 if (FRAME_WINDOW_P (f)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5618 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
|
5619 #endif |
24995 | 5620 #endif /* GLYPH_DEBUG */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5621 |
24995 | 5622 return face->id; |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
5623 } |
24995 | 5624 |
5625 | |
5626 /* 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
|
5627 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
|
5628 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
|
5629 isn't realized and cannot be realized. */ |
24995 | 5630 |
5631 int | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5632 lookup_named_face (f, symbol, c, signal_p) |
24995 | 5633 struct frame *f; |
5634 Lisp_Object symbol; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5635 int c; |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5636 int signal_p; |
24995 | 5637 { |
5638 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5639 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
5640 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
5641 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5642 if (default_face == NULL) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5643 { |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5644 if (!realize_basic_faces (f)) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5645 return -1; |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5646 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
|
5647 } |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5648 |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5649 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
|
5650 return -1; |
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
5651 |
24995 | 5652 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
|
5653 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
|
5654 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5655 return lookup_face (f, attrs, c, NULL); |
24995 | 5656 } |
5657 | |
5658 | |
5659 /* Return the ID of the realized ASCII face of Lisp face with ID | |
5660 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
5661 | |
5662 int | |
5663 ascii_face_of_lisp_face (f, lface_id) | |
5664 struct frame *f; | |
5665 int lface_id; | |
5666 { | |
5667 int face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5668 |
24995 | 5669 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
5670 { | |
5671 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
|
5672 face_id = lookup_named_face (f, face_name, 0, 1); |
24995 | 5673 } |
5674 else | |
5675 face_id = -1; | |
5676 | |
5677 return face_id; | |
5678 } | |
5679 | |
5680 | |
5681 /* Return a face for charset ASCII that is like the face with id | |
5682 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
5683 STEPS < 0 means larger. Value is the id of the face. */ | |
5684 | |
5685 int | |
5686 smaller_face (f, face_id, steps) | |
5687 struct frame *f; | |
5688 int face_id, steps; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5689 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5690 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5691 struct face *face; |
5692 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5693 int pt, last_pt, last_height; | |
5694 int delta; | |
5695 int new_face_id; | |
5696 struct face *new_face; | |
5697 | |
5698 /* If not called for an X frame, just return the original face. */ | |
5699 if (FRAME_TERMCAP_P (f)) | |
5700 return face_id; | |
5701 | |
5702 /* Try in increments of 1/2 pt. */ | |
5703 delta = steps < 0 ? 5 : -5; | |
5704 steps = abs (steps); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5705 |
24995 | 5706 face = FACE_FROM_ID (f, face_id); |
5707 bcopy (face->lface, attrs, sizeof attrs); | |
5708 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
5709 new_face_id = face_id; | |
5710 last_height = FONT_HEIGHT (face->font); | |
5711 | |
5712 while (steps | |
5713 && pt + delta > 0 | |
5714 /* Give up if we cannot find a font within 10pt. */ | |
5715 && abs (last_pt - pt) < 100) | |
5716 { | |
5717 /* Look up a face for a slightly smaller/larger font. */ | |
5718 pt += delta; | |
5719 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5720 new_face_id = lookup_face (f, attrs, 0, NULL); |
24995 | 5721 new_face = FACE_FROM_ID (f, new_face_id); |
5722 | |
5723 /* 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
|
5724 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
|
5725 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
24995 | 5726 { |
5727 --steps; | |
5728 last_height = FONT_HEIGHT (new_face->font); | |
5729 last_pt = pt; | |
5730 } | |
5731 } | |
5732 | |
5733 return new_face_id; | |
5734 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5735 #else /* not HAVE_WINDOW_SYSTEM */ |
24995 | 5736 |
5737 return face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5738 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5739 #endif /* not HAVE_WINDOW_SYSTEM */ |
24995 | 5740 } |
5741 | |
5742 | |
5743 /* Return a face for charset ASCII that is like the face with id | |
5744 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
|
5745 |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
5746 int |
24995 | 5747 face_with_height (f, face_id, height) |
5748 struct frame *f; | |
5749 int face_id; | |
5750 int height; | |
5751 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5752 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5753 struct face *face; |
5754 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5755 | |
5756 if (FRAME_TERMCAP_P (f) | |
5757 || height <= 0) | |
5758 return face_id; | |
5759 | |
5760 face = FACE_FROM_ID (f, face_id); | |
5761 bcopy (face->lface, attrs, sizeof attrs); | |
5762 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5763 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
|
5764 #endif /* HAVE_WINDOW_SYSTEM */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5765 |
24995 | 5766 return face_id; |
5767 } | |
5768 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5769 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5770 /* 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
|
5771 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
|
5772 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
|
5773 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
|
5774 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
|
5775 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
|
5776 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5777 int |
60837
18fb43577f76
(lookup_derived_face): Add arg SIGNAL_P.
Kim F. Storm <storm@cua.dk>
parents:
60699
diff
changeset
|
5778 lookup_derived_face (f, symbol, c, face_id, signal_p) |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5779 struct frame *f; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5780 Lisp_Object symbol; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5781 int c; |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5782 int face_id; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5783 { |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5784 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5785 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
|
5786 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
|
5787 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5788 if (!default_face) |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5789 abort (); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5790 |
60837
18fb43577f76
(lookup_derived_face): Add arg SIGNAL_P.
Kim F. Storm <storm@cua.dk>
parents:
60699
diff
changeset
|
5791 get_lface_attributes (f, symbol, symbol_attrs, signal_p); |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5792 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
|
5793 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
|
5794 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
|
5795 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5796 |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5797 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
|
5798 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
|
5799 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
|
5800 (plist) |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5801 Lisp_Object plist; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5802 { |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5803 Lisp_Object lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5804 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
|
5805 Qunspecified); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5806 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
|
5807 1, 0); |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5808 return lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5809 } |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5810 |
24995 | 5811 |
5812 | |
5813 /*********************************************************************** | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5814 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
|
5815 ***********************************************************************/ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5816 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5817 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5818 /* 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
|
5819 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
|
5820 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
|
5821 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5822 #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
|
5823 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5824 #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
|
5825 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5826 /* 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
|
5827 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
|
5828 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5829 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
|
5830 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
|
5831 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
|
5832 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5833 \(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
|
5834 \(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
|
5835 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5836 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
|
5837 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
|
5838 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
|
5839 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
|
5840 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
|
5841 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5842 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
|
5843 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5844 /* 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
|
5845 face. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5846 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
|
5847 && 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
|
5848 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
|
5849 || (!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
|
5850 && 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
|
5851 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
|
5852 || (!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
|
5853 && 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
|
5854 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
|
5855 || (!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
|
5856 && 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
|
5857 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
|
5858 || (!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
|
5859 && 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
|
5860 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
|
5861 || (!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
|
5862 && 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
|
5863 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
|
5864 || (!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
|
5865 && 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
|
5866 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
|
5867 || (!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
|
5868 && 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
|
5869 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
|
5870 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5871 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5872 /* 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
|
5873 "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
|
5874 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
|
5875 || !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
|
5876 || !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
|
5877 || !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
|
5878 || !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
|
5879 || !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
|
5880 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5881 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
|
5882 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
|
5883 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5884 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
|
5885 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5886 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
|
5887 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5888 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
|
5889 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5890 if (! face) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5891 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
|
5892 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5893 /* 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
|
5894 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
|
5895 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5896 } |
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 /* 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
|
5899 return 1; |
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 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5902 #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
|
5903 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5904 /* 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
|
5905 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
|
5906 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5907 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
|
5908 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
|
5909 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
|
5910 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5911 \(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
|
5912 \(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
|
5913 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5914 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
|
5915 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
|
5916 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
|
5917 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
|
5918 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
|
5919 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5920 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
|
5921 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
|
5922 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
|
5923 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
|
5924 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
|
5925 { |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5926 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
|
5927 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
|
5928 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
|
5929 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
|
5930 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
|
5931 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
|
5932 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5933 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5934 /* 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
|
5935 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
|
5936 (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
|
5937 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
|
5938 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
|
5939 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
|
5940 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
|
5941 specifies. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5942 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
|
5943 || !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
|
5944 || !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
|
5945 || !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
|
5946 || !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
|
5947 || !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
|
5948 || !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
|
5949 || !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
|
5950 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5951 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5952 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5953 /* 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
|
5954 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5955 /* 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
|
5956 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
|
5957 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
|
5958 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5959 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
|
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 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_BOLD; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5966 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5967 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
|
5968 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5969 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
|
5970 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
|
5971 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
|
5972 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5973 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
|
5974 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
|
5975 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5976 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5977 /* underlining */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5978 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
|
5979 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
|
5980 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5981 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
|
5982 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
|
5983 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
|
5984 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
|
5985 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5986 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
|
5987 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5988 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5989 /* inverse video */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5990 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
|
5991 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
|
5992 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5993 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
|
5994 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
|
5995 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5996 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
|
5997 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5998 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5999 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6000 /* Color testing. */ |
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 /* 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
|
6003 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
|
6004 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
|
6005 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
|
6006 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
|
6007 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6008 /* 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
|
6009 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
|
6010 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
|
6011 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6012 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
|
6013 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6014 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
|
6015 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
|
6016 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
|
6017 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
|
6018 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
|
6019 > 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
|
6020 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
|
6021 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6022 /* 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
|
6023 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6024 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
|
6025 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
|
6026 && (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
|
6027 <= 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
|
6028 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6029 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6030 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6031 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6032 /* 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
|
6033 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
|
6034 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
|
6035 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6036 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
|
6037 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6038 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
|
6039 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
|
6040 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
|
6041 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
|
6042 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
|
6043 > 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
|
6044 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
|
6045 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6046 /* 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
|
6047 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6048 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
|
6049 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
|
6050 && (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
|
6051 <= 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
|
6052 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6053 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6054 } |
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 /* 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
|
6057 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
|
6058 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
|
6059 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
|
6060 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
|
6061 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6062 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
|
6063 = (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
|
6064 - 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
|
6065 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
|
6066 || 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
|
6067 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6068 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6069 |
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 /* 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
|
6072 given colors. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6073 if (test_caps != 0 && |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6074 ! tty_capable_p (f, test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6075 return 0; |
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 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6078 /* 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
|
6079 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6080 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6081 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6082 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6083 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
|
6084 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
|
6085 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
|
6086 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
|
6087 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
|
6088 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
|
6089 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6090 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
|
6091 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
|
6092 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
|
6093 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6094 \(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
|
6095 \(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
|
6096 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6097 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
|
6098 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
|
6099 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
|
6100 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
|
6101 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
|
6102 (attributes, display) |
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 attributes, display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6104 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6105 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
|
6106 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
|
6107 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
|
6108 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
|
6109 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
|
6110 |
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6111 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
|
6112 /* 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
|
6113 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
|
6114 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
|
6115 return Qnil; |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
6116 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6117 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
|
6118 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
|
6119 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
|
6120 frame = display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6121 else |
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 /* 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
|
6124 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
|
6125 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6126 frame = Qnil; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6127 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
|
6128 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6129 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
|
6130 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
|
6131 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
|
6132 display))) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6133 break; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6134 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6135 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6136 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6137 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
|
6138 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
|
6139 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6140 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
|
6141 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
|
6142 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
|
6143 |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6144 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
|
6145 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
|
6146 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6147 if (! realize_basic_faces (f)) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
6148 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
|
6149 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
|
6150 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6151 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6152 /* 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
|
6153 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
|
6154 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
|
6155 #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
|
6156 else |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
6157 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
|
6158 #endif |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6159 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6160 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
|
6161 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6162 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6163 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
6164 /*********************************************************************** |
24995 | 6165 Font selection |
6166 ***********************************************************************/ | |
6167 | |
6168 DEFUN ("internal-set-font-selection-order", | |
6169 Finternal_set_font_selection_order, | |
6170 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
|
6171 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
|
6172 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
|
6173 `:height', `:weight', and `:slant'. Face attributes appearing |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6174 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
|
6175 `: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
|
6176 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
|
6177 Value is ORDER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6178 (order) |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6179 Lisp_Object order; |
24995 | 6180 { |
6181 Lisp_Object list; | |
6182 int i; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6183 int indices[DIM (font_sort_order)]; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6184 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6185 CHECK_LIST (order); |
24995 | 6186 bzero (indices, sizeof indices); |
6187 i = 0; | |
6188 | |
6189 for (list = order; | |
6190 CONSP (list) && i < DIM (indices); | |
6191 list = XCDR (list), ++i) | |
6192 { | |
6193 Lisp_Object attr = XCAR (list); | |
6194 int xlfd; | |
6195 | |
6196 if (EQ (attr, QCwidth)) | |
6197 xlfd = XLFD_SWIDTH; | |
6198 else if (EQ (attr, QCheight)) | |
6199 xlfd = XLFD_POINT_SIZE; | |
6200 else if (EQ (attr, QCweight)) | |
6201 xlfd = XLFD_WEIGHT; | |
6202 else if (EQ (attr, QCslant)) | |
6203 xlfd = XLFD_SLANT; | |
6204 else | |
6205 break; | |
6206 | |
6207 if (indices[i] != 0) | |
6208 break; | |
6209 indices[i] = xlfd; | |
6210 } | |
6211 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6212 if (!NILP (list) || i != DIM (indices)) |
24995 | 6213 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
|
6214 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
|
6215 if (indices[i] == 0) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6216 signal_error ("Invalid font sort order", order); |
24995 | 6217 |
6218 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
6219 { | |
6220 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
6221 free_all_realized_faces (Qnil); | |
6222 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6223 |
24995 | 6224 return Qnil; |
6225 } | |
6226 | |
6227 | |
6228 DEFUN ("internal-set-alternative-font-family-alist", | |
6229 Finternal_set_alternative_font_family_alist, | |
6230 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
|
6231 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
|
6232 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6233 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
|
6234 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
|
6235 (alist) |
24995 | 6236 Lisp_Object alist; |
6237 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6238 CHECK_LIST (alist); |
24995 | 6239 Vface_alternative_font_family_alist = alist; |
6240 free_all_realized_faces (Qnil); | |
6241 return alist; | |
6242 } | |
6243 | |
6244 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6245 DEFUN ("internal-set-alternative-font-registry-alist", |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6246 Finternal_set_alternative_font_registry_alist, |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6247 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
|
6248 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
|
6249 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6250 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
|
6251 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
|
6252 (alist) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6253 Lisp_Object alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6254 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6255 CHECK_LIST (alist); |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6256 Vface_alternative_font_registry_alist = alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6257 free_all_realized_faces (Qnil); |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6258 return alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6259 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6260 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6261 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6262 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 6263 |
6264 /* Value is non-zero if FONT is the name of a scalable font. The | |
6265 X11R6 XLFD spec says that point size, pixel size, and average width | |
6266 are zero for scalable fonts. Intlfonts contain at least one | |
6267 scalable font ("*-muleindian-1") for which this isn't true, so we | |
6268 just test average width. */ | |
6269 | |
6270 static int | |
6271 font_scalable_p (font) | |
6272 struct font_name *font; | |
6273 { | |
6274 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
|
6275 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
|
6276 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6277 /* 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
|
6278 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
|
6279 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
|
6280 || *s == '*' |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6281 #endif |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6282 ; |
24995 | 6283 } |
6284 | |
6285 | |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6286 /* 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
|
6287 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6288 #define FONT_POINT_SIZE_QUANTUM 5 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
6289 |
24995 | 6290 /* Value is non-zero if FONT1 is a better match for font attributes |
6291 VALUES than FONT2. VALUES is an array of face attribute values in | |
6292 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
|
6293 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
|
6294 to compare with. */ |
24995 | 6295 |
6296 static int | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6297 better_font_p (values, font1, font2, compare_pt_p, avgwidth) |
24995 | 6298 int *values; |
6299 struct font_name *font1, *font2; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6300 int compare_pt_p, avgwidth; |
24995 | 6301 { |
6302 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6303 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6304 for (i = 0; i < DIM (font_sort_order); ++i) |
24995 | 6305 { |
6306 int xlfd_idx = font_sort_order[i]; | |
6307 | |
6308 if (compare_pt_p || xlfd_idx != XLFD_POINT_SIZE) | |
6309 { | |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6310 int delta1, delta2; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6311 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6312 if (xlfd_idx == XLFD_POINT_SIZE) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6313 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6314 delta1 = abs (values[i] - (font1->numeric[xlfd_idx] |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6315 / font1->rescale_ratio)); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6316 delta2 = abs (values[i] - (font2->numeric[xlfd_idx] |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6317 / font2->rescale_ratio)); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6318 if (abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM) |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6319 continue; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6320 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6321 else |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6322 { |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6323 delta1 = abs (values[i] - font1->numeric[xlfd_idx]); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6324 delta2 = abs (values[i] - font2->numeric[xlfd_idx]); |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6325 } |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6326 |
24995 | 6327 if (delta1 > delta2) |
6328 return 0; | |
6329 else if (delta1 < delta2) | |
6330 return 1; | |
6331 else | |
6332 { | |
6333 /* The difference may be equal because, e.g., the face | |
6334 specifies `italic' but we have only `regular' and | |
6335 `oblique'. Prefer `oblique' in this case. */ | |
6336 if ((xlfd_idx == XLFD_WEIGHT || xlfd_idx == XLFD_SLANT) | |
6337 && font1->numeric[xlfd_idx] > values[i] | |
6338 && font2->numeric[xlfd_idx] < values[i]) | |
6339 return 1; | |
6340 } | |
6341 } | |
6342 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6343 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6344 if (avgwidth) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6345 { |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6346 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
|
6347 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
|
6348 if (delta1 > delta2) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6349 return 0; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6350 else if (delta1 < delta2) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6351 return 1; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6352 } |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6353 |
52200
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6354 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
|
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 /* 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
|
6357 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
|
6358 && 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
|
6359 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
|
6360 && 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
|
6361 |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6362 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
|
6363 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
|
6364 } |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6365 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6366 return font1->registry_priority < font2->registry_priority; |
24995 | 6367 } |
6368 | |
6369 | |
6370 /* Value is non-zero if FONT is an exact match for face attributes in | |
6371 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
|
6372 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
|
6373 with. */ |
24995 | 6374 |
6375 static int | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6376 exact_face_match_p (specified, font, avgwidth) |
24995 | 6377 int *specified; |
6378 struct font_name *font; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6379 int avgwidth; |
24995 | 6380 { |
6381 int i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6382 |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6383 for (i = 0; i < DIM (font_sort_order); ++i) |
24995 | 6384 if (specified[i] != font->numeric[font_sort_order[i]]) |
6385 break; | |
6386 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6387 return (i == DIM (font_sort_order) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6388 && (avgwidth <= 0 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6389 || avgwidth == font->numeric[XLFD_AVGWIDTH])); |
24995 | 6390 } |
6391 | |
6392 | |
6393 /* Value is the name of a scaled font, generated from scalable font | |
6394 FONT on frame F. SPECIFIED_PT is the point-size to scale FONT to. | |
6395 Value is allocated from heap. */ | |
6396 | |
6397 static char * | |
6398 build_scalable_font_name (f, font, specified_pt) | |
6399 struct frame *f; | |
6400 struct font_name *font; | |
6401 int specified_pt; | |
6402 { | |
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6403 char pixel_size[20]; |
24995 | 6404 int pixel_value; |
6405 double resy = FRAME_X_DISPLAY_INFO (f)->resy; | |
6406 double pt; | |
6407 | |
6408 /* If scalable font is for a specific resolution, compute | |
6409 the point size we must specify from the resolution of | |
6410 the display and the specified resolution of the font. */ | |
6411 if (font->numeric[XLFD_RESY] != 0) | |
6412 { | |
6413 pt = resy / font->numeric[XLFD_RESY] * specified_pt + 0.5; | |
34882 | 6414 pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt; |
24995 | 6415 } |
6416 else | |
6417 { | |
6418 pt = specified_pt; | |
34882 | 6419 pixel_value = resy / (PT_PER_INCH * 10.0) * pt; |
24995 | 6420 } |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6421 /* 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
|
6422 pixel_value *= font->rescale_ratio; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6423 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6424 /* 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
|
6425 font of the specified PIXEL_SIZE. */ |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6426 #if 0 |
51237
ed40623b1ca6
(build_scalable_font_name): Remove `unused var pixel_size' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51210
diff
changeset
|
6427 { /* 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
|
6428 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
|
6429 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
|
6430 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
|
6431 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
|
6432 } |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6433 #endif |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6434 |
24995 | 6435 /* Set pixel size. */ |
6436 sprintf (pixel_size, "%d", pixel_value); | |
6437 font->fields[XLFD_PIXEL_SIZE] = pixel_size; | |
6438 font->numeric[XLFD_PIXEL_SIZE] = pixel_value; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6439 |
24995 | 6440 /* If font doesn't specify its resolution, use the |
6441 resolution of the display. */ | |
6442 if (font->numeric[XLFD_RESY] == 0) | |
6443 { | |
6444 char buffer[20]; | |
6445 sprintf (buffer, "%d", (int) resy); | |
6446 font->fields[XLFD_RESY] = buffer; | |
6447 font->numeric[XLFD_RESY] = resy; | |
6448 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6449 |
24995 | 6450 if (strcmp (font->fields[XLFD_RESX], "0") == 0) |
6451 { | |
6452 char buffer[20]; | |
6453 int resx = FRAME_X_DISPLAY_INFO (f)->resx; | |
6454 sprintf (buffer, "%d", resx); | |
6455 font->fields[XLFD_RESX] = buffer; | |
6456 font->numeric[XLFD_RESX] = resx; | |
6457 } | |
6458 | |
6459 return build_font_name (font); | |
6460 } | |
6461 | |
6462 | |
6463 /* Value is non-zero if we are allowed to use scalable font FONT. We | |
6464 can't run a Lisp function here since this function may be called | |
6465 with input blocked. */ | |
6466 | |
6467 static int | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6468 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
|
6469 const char *font; |
24995 | 6470 { |
6471 if (EQ (Vscalable_fonts_allowed, Qt)) | |
6472 return 1; | |
6473 else if (CONSP (Vscalable_fonts_allowed)) | |
6474 { | |
6475 Lisp_Object tail, regexp; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6476 |
24995 | 6477 for (tail = Vscalable_fonts_allowed; CONSP (tail); tail = XCDR (tail)) |
6478 { | |
6479 regexp = XCAR (tail); | |
6480 if (STRINGP (regexp) | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6481 && fast_c_string_match_ignore_case (regexp, font) >= 0) |
24995 | 6482 return 1; |
6483 } | |
6484 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6485 |
24995 | 6486 return 0; |
6487 } | |
6488 | |
6489 | |
6490 | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6491 /* 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
|
6492 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
|
6493 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
|
6494 widths if ATTRS specifies such a width. |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6495 |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6496 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
|
6497 freed by this function. |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6498 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6499 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
|
6500 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
|
6501 to simulate bold-face. */ |
24995 | 6502 |
6503 static char * | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6504 best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) |
24995 | 6505 struct frame *f; |
6506 Lisp_Object *attrs; | |
6507 struct font_name *fonts; | |
6508 int nfonts; | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6509 int width_ratio; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6510 int *needs_overstrike; |
24995 | 6511 { |
6512 char *font_name; | |
6513 struct font_name *best; | |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
6514 int i, pt = 0; |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6515 int specified[5]; |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6516 int exact_p, avgwidth; |
24995 | 6517 |
6518 if (nfonts == 0) | |
6519 return NULL; | |
6520 | |
6521 /* Make specified font attributes available in `specified', | |
6522 indexed by sort order. */ | |
6523 for (i = 0; i < DIM (font_sort_order); ++i) | |
6524 { | |
6525 int xlfd_idx = font_sort_order[i]; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6526 |
24995 | 6527 if (xlfd_idx == XLFD_SWIDTH) |
6528 specified[i] = face_numeric_swidth (attrs[LFACE_SWIDTH_INDEX]); | |
6529 else if (xlfd_idx == XLFD_POINT_SIZE) | |
6530 specified[i] = pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
6531 else if (xlfd_idx == XLFD_WEIGHT) | |
6532 specified[i] = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]); | |
6533 else if (xlfd_idx == XLFD_SLANT) | |
6534 specified[i] = face_numeric_slant (attrs[LFACE_SLANT_INDEX]); | |
6535 else | |
6536 abort (); | |
6537 } | |
6538 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6539 avgwidth = (UNSPECIFIEDP (attrs[LFACE_AVGWIDTH_INDEX]) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6540 ? 0 |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6541 : 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
|
6542 |
24995 | 6543 exact_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6544 |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6545 if (needs_overstrike) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6546 *needs_overstrike = 0; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6547 |
24995 | 6548 /* Start with the first non-scalable font in the list. */ |
6549 for (i = 0; i < nfonts; ++i) | |
6550 if (!font_scalable_p (fonts + i)) | |
6551 break; | |
6552 | |
6553 /* Find the best match among the non-scalable fonts. */ | |
6554 if (i < nfonts) | |
6555 { | |
6556 best = fonts + i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6557 |
24995 | 6558 for (i = 1; i < nfonts; ++i) |
6559 if (!font_scalable_p (fonts + i) | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6560 && better_font_p (specified, fonts + i, best, 1, avgwidth)) |
24995 | 6561 { |
6562 best = fonts + i; | |
6563 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6564 exact_p = exact_face_match_p (specified, best, avgwidth); |
24995 | 6565 if (exact_p) |
6566 break; | |
6567 } | |
6568 } | |
6569 else | |
6570 best = NULL; | |
6571 | |
6572 /* Unless we found an exact match among non-scalable fonts, see if | |
6573 we can find a better match among scalable fonts. */ | |
6574 if (!exact_p) | |
6575 { | |
6576 /* A scalable font is better if | |
6577 | |
6578 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
|
6579 |
24995 | 6580 2. the best non-scalable font doesn't have the required |
6581 point size, and the scalable fonts weight, slant, swidth | |
6582 isn't worse. */ | |
6583 | |
6584 int non_scalable_has_exact_height_p; | |
6585 | |
6586 if (best && best->numeric[XLFD_POINT_SIZE] == pt) | |
6587 non_scalable_has_exact_height_p = 1; | |
6588 else | |
6589 non_scalable_has_exact_height_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6590 |
24995 | 6591 for (i = 0; i < nfonts; ++i) |
6592 if (font_scalable_p (fonts + i)) | |
6593 { | |
6594 if (best == NULL | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6595 || better_font_p (specified, fonts + i, best, 0, 0) |
24995 | 6596 || (!non_scalable_has_exact_height_p |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6597 && !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
|
6598 { |
b154b2a09262
* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
Kenichi Handa <handa@m17n.org>
parents:
51665
diff
changeset
|
6599 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
|
6600 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
|
6601 } |
24995 | 6602 } |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6603 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6604 if (needs_overstrike) |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6605 { |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6606 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
|
6607 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
|
6608 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6609 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
|
6610 { |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6611 /* 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
|
6612 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
|
6613 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
|
6614 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
|
6615 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
|
6616 *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
|
6617 else |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6618 *needs_overstrike = 1; |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6619 } |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6620 } |
24995 | 6621 } |
6622 | |
6623 if (font_scalable_p (best)) | |
6624 font_name = build_scalable_font_name (f, best, pt); | |
6625 else | |
6626 font_name = build_font_name (best); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6627 |
24995 | 6628 /* Free font_name structures. */ |
6629 free_font_names (fonts, nfonts); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6630 |
24995 | 6631 return font_name; |
6632 } | |
6633 | |
6634 | |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6635 /* 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
|
6636 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
|
6637 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6638 FAMILY is the font family whose alternatives are considered. |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6639 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6640 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
|
6641 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
|
6642 encoding. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6643 |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6644 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
|
6645 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
|
6646 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6647 static int |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6648 try_alternative_families (f, family, registry, fonts) |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6649 struct frame *f; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6650 Lisp_Object family, registry; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6651 struct font_name **fonts; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6652 { |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6653 Lisp_Object alter; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6654 int nfonts = 0; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6655 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6656 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
|
6657 if (nfonts == 0) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6658 { |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6659 /* Try alternative font families. */ |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6660 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
|
6661 if (CONSP (alter)) |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6662 { |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6663 for (alter = XCDR (alter); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6664 CONSP (alter) && nfonts == 0; |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6665 alter = XCDR (alter)) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6666 { |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6667 if (STRINGP (XCAR (alter))) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6668 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
|
6669 } |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6670 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6671 |
49864
a2add8cdc33a
(try_alternative_families): Try all scalable fonts if
Kenichi Handa <handa@m17n.org>
parents:
49863
diff
changeset
|
6672 /* 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
|
6673 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
|
6674 { |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6675 int count = SPECPDL_INDEX (); |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6676 specbind (Qscalable_fonts_allowed, Qt); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6677 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
|
6678 unbind_to (count, Qnil); |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6679 } |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6680 } |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6681 return nfonts; |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6682 } |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6683 |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6684 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6685 /* 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
|
6686 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6687 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
|
6688 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
|
6689 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
|
6690 |
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6691 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
|
6692 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
|
6693 encoding. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6694 |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6695 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
|
6696 Otherwise, prefer FAMILY. |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6697 |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6698 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
|
6699 the fonts matched. Value is the number of fonts found. */ |
24995 | 6700 |
6701 static int | |
47618
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6702 try_font_list (f, attrs, family, registry, fonts, prefer_face_family) |
24995 | 6703 struct frame *f; |
6704 Lisp_Object *attrs; | |
37186
e47810283f6b
(best_matching_font): Remove unused parameter PATTERN.
Gerd Moellmann <gerd@gnu.org>
parents:
37036
diff
changeset
|
6705 Lisp_Object family, registry; |
24995 | 6706 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
|
6707 int prefer_face_family; |
24995 | 6708 { |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6709 int nfonts = 0; |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6710 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
|
6711 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
|
6712 |
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6713 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
|
6714 |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6715 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
|
6716 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
|
6717 |
45848 | 6718 #ifdef MAC_OS |
6719 /* When realizing the default face and a font spec does not matched | |
6720 exactly, Emacs looks for ones with the same registry as the | |
6721 default font. On the Mac, this is mac-roman, which does not work | |
6722 if the family is -etl-fixed, e.g. The following widens the | |
6723 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
|
6724 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
|
6725 && 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
|
6726 nfonts = try_alternative_families (f, try_family, Qnil, fonts); |
45848 | 6727 #endif |
6728 | |
47639
a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
Kenichi Handa <handa@m17n.org>
parents:
47618
diff
changeset
|
6729 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
|
6730 family = face_family; |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6731 |
e620377a0596
(try_font_list): New arg PREFER_FACE_FAMILY. If it is
Kenichi Handa <handa@m17n.org>
parents:
47471
diff
changeset
|
6732 if (nfonts == 0 && STRINGP (family)) |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6733 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
|
6734 |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6735 /* 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
|
6736 if (nfonts == 0) |
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6737 { |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6738 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
|
6739 if (default_face) |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6740 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
|
6741 else |
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6742 family = build_string ("fixed"); |
37679
13efa6105da9
(try_alternative_families): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37433
diff
changeset
|
6743 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
|
6744 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6745 |
37724
3a5a6cd7ee9a
(try_alternative_families): First try the FAMILY.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37716
diff
changeset
|
6746 /* 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
|
6747 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
|
6748 nfonts = try_alternative_families (f, Qnil, registry, fonts); |
24995 | 6749 |
6750 return nfonts; | |
6751 } | |
6752 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6753 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6754 /* 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
|
6755 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
|
6756 attribute of ATTRS doesn't name a fontset. */ |
24995 | 6757 |
6758 static int | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6759 face_fontset (attrs) |
24995 | 6760 Lisp_Object *attrs; |
6761 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6762 Lisp_Object name; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6763 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6764 name = attrs[LFACE_FONT_INDEX]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6765 if (!STRINGP (name)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6766 return -1; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6767 return fs_query_fontset (name, 0); |
24995 | 6768 } |
6769 | |
6770 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6771 /* 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
|
6772 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
|
6773 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
|
6774 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
|
6775 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
|
6776 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
|
6777 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
|
6778 character. |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6779 |
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6780 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
|
6781 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
|
6782 to simulate bold-face. */ |
24995 | 6783 |
6784 static char * | |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6785 choose_face_font (f, attrs, fontset, c, needs_overstrike) |
24995 | 6786 struct frame *f; |
6787 Lisp_Object *attrs; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6788 int fontset, c; |
48384
acfaa904eb56
(load_face_font): Set `face->overstrike' based on result from
Miles Bader <miles@gnu.org>
parents:
47983
diff
changeset
|
6789 int *needs_overstrike; |
24995 | 6790 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6791 Lisp_Object pattern; |
24995 | 6792 char *font_name = NULL; |
6793 struct font_name *fonts; | |
36066
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6794 int nfonts, width_ratio; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6795 |
50412
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6796 if (needs_overstrike) |
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6797 *needs_overstrike = 0; |
49cba7ce673a
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Miles Bader <miles@gnu.org>
parents:
50369
diff
changeset
|
6798 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6799 /* 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
|
6800 a font for C. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6801 pattern = fontset_font_pattern (f, fontset, c); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6802 if (NILP (pattern)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6803 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6804 xassert (!SINGLE_BYTE_CHAR_P (c)); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6805 return NULL; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6806 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6807 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6808 /* 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
|
6809 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
|
6810 return xstrdup (SDATA (pattern)); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6811 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6812 /* Get a list of fonts matching that pattern and choose the |
24995 | 6813 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
|
6814 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
|
6815 (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
|
6816 || 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
|
6817 width_ratio = (SINGLE_BYTE_CHAR_P (c) |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6818 ? 1 |
ea51e9f7266e
(best_matching_font): New parameter width_ratio.
Gerd Moellmann <gerd@gnu.org>
parents:
36006
diff
changeset
|
6819 : 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
|
6820 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
|
6821 needs_overstrike); |
24995 | 6822 return font_name; |
6823 } | |
6824 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6825 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 6826 |
6827 | |
6828 | |
6829 /*********************************************************************** | |
6830 Face Realization | |
6831 ***********************************************************************/ | |
6832 | |
6833 /* Realize basic faces on frame F. Value is zero if frame parameters | |
6834 of F don't contain enough information needed to realize the default | |
6835 face. */ | |
6836 | |
6837 static int | |
6838 realize_basic_faces (f) | |
2342 | 6839 struct frame *f; |
24995 | 6840 { |
6841 int success_p = 0; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
6842 int count = SPECPDL_INDEX (); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6843 |
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
6844 /* 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
|
6845 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
|
6846 BLOCK_INPUT; |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6847 specbind (Qscalable_fonts_allowed, Qt); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6848 |
24995 | 6849 if (realize_default_face (f)) |
6850 { | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6851 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
|
6852 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
|
6853 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
41129 | 6854 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
25546 | 6855 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
|
6856 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
|
6857 realize_named_face (f, Qborder, BORDER_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6858 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6859 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
|
6860 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
|
6861 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
6862 /* 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
|
6863 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
|
6864 { |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
6865 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
|
6866 #ifdef USE_X_TOOLKIT |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
6867 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
|
6868 #endif |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
6869 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6870 |
24995 | 6871 success_p = 1; |
6872 } | |
6873 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6874 unbind_to (count, Qnil); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
6875 UNBLOCK_INPUT; |
24995 | 6876 return success_p; |
6877 } | |
6878 | |
6879 | |
6880 /* Realize the default face on frame F. If the face is not fully | |
6881 specified, make it fully-specified. Attributes of the default face | |
6882 that are not explicitly specified are taken from frame parameters. */ | |
6883 | |
6884 static int | |
6885 realize_default_face (f) | |
6886 struct frame *f; | |
6887 { | |
6888 struct face_cache *c = FRAME_FACE_CACHE (f); | |
6889 Lisp_Object lface; | |
6890 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6891 Lisp_Object frame_font; | |
6892 struct face *face; | |
6893 | |
6894 /* If the `default' face is not yet known, create it. */ | |
6895 lface = lface_from_face_name (f, Qdefault, 0); | |
6896 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
|
6897 { |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6898 Lisp_Object frame; |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6899 XSETFRAME (frame, f); |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6900 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
|
6901 } |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
6902 |
24995 | 6903 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6904 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6905 if (FRAME_WINDOW_P (f)) |
24995 | 6906 { |
6907 /* Set frame_font to the value of the `font' frame parameter. */ | |
6908 frame_font = Fassq (Qfont, f->param_alist); | |
6909 xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font))); | |
6910 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
|
6911 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
|
6912 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
|
6913 f->default_face_done_p = 1; |
24995 | 6914 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6915 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 6916 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6917 if (!FRAME_WINDOW_P (f)) |
24995 | 6918 { |
6919 LFACE_FAMILY (lface) = build_string ("default"); | |
6920 LFACE_SWIDTH (lface) = Qnormal; | |
6921 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
|
6922 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
|
6923 LFACE_WEIGHT (lface) = Qnormal; |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
6924 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
|
6925 LFACE_SLANT (lface) = Qnormal; |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
6926 LFACE_AVGWIDTH (lface) = Qunspecified; |
24995 | 6927 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6928 |
24995 | 6929 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
6930 LFACE_UNDERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6931 |
24995 | 6932 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
6933 LFACE_OVERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6934 |
24995 | 6935 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
6936 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6937 |
24995 | 6938 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
6939 LFACE_BOX (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6940 |
24995 | 6941 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
6942 LFACE_INVERSE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6943 |
24995 | 6944 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
6945 { | |
6946 /* This function is called so early that colors are not yet | |
6947 set in the frame parameter list. */ | |
6948 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
|
6949 |
24995 | 6950 if (CONSP (color) && STRINGP (XCDR (color))) |
6951 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
|
6952 else if (FRAME_WINDOW_P (f)) |
24995 | 6953 return 0; |
35443 | 6954 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6955 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
|
6956 else |
24995 | 6957 abort (); |
6958 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6959 |
24995 | 6960 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
6961 { | |
6962 /* This function is called so early that colors are not yet | |
6963 set in the frame parameter list. */ | |
6964 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
6965 if (CONSP (color) && STRINGP (XCDR (color))) | |
6966 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
|
6967 else if (FRAME_WINDOW_P (f)) |
24995 | 6968 return 0; |
35443 | 6969 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
6970 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
|
6971 else |
24995 | 6972 abort (); |
6973 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6974 |
24995 | 6975 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
6976 LFACE_STIPPLE (lface) = Qnil; | |
6977 | |
6978 /* Realize the face; it must be fully-specified now. */ | |
6979 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
6980 check_lface (lface); | |
6981 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6982 face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); |
24995 | 6983 return 1; |
6984 } | |
6985 | |
6986 | |
6987 /* Realize basic faces other than the default face in face cache C. | |
6988 SYMBOL is the face name, ID is the face id the realized face must | |
6989 have. The default face must have been realized already. */ | |
6990 | |
6991 static void | |
6992 realize_named_face (f, symbol, id) | |
6993 struct frame *f; | |
6994 Lisp_Object symbol; | |
6995 int id; | |
6996 { | |
6997 struct face_cache *c = FRAME_FACE_CACHE (f); | |
6998 Lisp_Object lface = lface_from_face_name (f, symbol, 0); | |
6999 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
7000 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; | |
7001 struct face *new_face; | |
7002 | |
7003 /* The default face must exist and be fully specified. */ | |
7004 get_lface_attributes (f, Qdefault, attrs, 1); | |
7005 check_lface_attrs (attrs); | |
7006 xassert (lface_fully_specified_p (attrs)); | |
7007 | |
7008 /* If SYMBOL isn't know as a face, create it. */ | |
7009 if (NILP (lface)) | |
7010 { | |
7011 Lisp_Object frame; | |
7012 XSETFRAME (frame, f); | |
7013 lface = Finternal_make_lisp_face (symbol, frame); | |
7014 } | |
7015 | |
7016 /* Merge SYMBOL's face with the default face. */ | |
7017 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
|
7018 merge_face_vectors (f, symbol_attrs, attrs, 0); |
24995 | 7019 |
7020 /* Realize the face. */ | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7021 new_face = realize_face (c, attrs, 0, NULL, id); |
24995 | 7022 } |
7023 | |
7024 | |
7025 /* 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
|
7026 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
|
7027 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
|
7028 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
|
7029 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
|
7030 pointer to the newly created realized face. */ |
24995 | 7031 |
7032 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7033 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
|
7034 struct face_cache *cache; |
24995 | 7035 Lisp_Object *attrs; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7036 int c; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7037 struct face *base_face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7038 int former_face_id; |
24995 | 7039 { |
7040 struct face *face; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
7041 |
24995 | 7042 /* LFACE must be fully specified. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7043 xassert (cache != NULL); |
24995 | 7044 check_lface_attrs (attrs); |
7045 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7046 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
|
7047 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7048 /* Remove the former face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7049 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
|
7050 uncache_face (cache, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7051 free_realized_face (cache->f, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7052 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7053 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7054 if (FRAME_WINDOW_P (cache->f)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
7055 face = realize_x_face (cache, attrs, c, base_face); |
35443 | 7056 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
|
7057 face = realize_tty_face (cache, attrs, c); |
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]; |
60837
18fb43577f76
(lookup_derived_face): Add arg SIGNAL_P.
Kim F. Storm <storm@cua.dk>
parents:
60699
diff
changeset
|
7734 face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1); |
59458
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 | |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
7779 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
24995 | 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) */ |