Mercurial > emacs
annotate src/xfaces.c @ 112047:03c1dc6b7801
Fix bug #7617 with documentation of expand-file-name.
fileio.c (Fexpand_file_name): One more doc fix.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 13 Dec 2010 18:13:29 +0200 |
parents | d7201a19a376 |
children | 60516122d066 376148b31b5e |
rev | line source |
---|---|
24995 | 1 /* xfaces.c -- "Face" primitives. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64578
diff
changeset
|
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
2342 | 4 |
2336 | 5 This file is part of GNU Emacs. |
6 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94938
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
2336 | 8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94938
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94938
diff
changeset
|
10 (at your option) any later version. |
2336 | 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 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94938
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
2336 | 19 |
24995 | 20 /* New face implementation by Gerd Moellmann <gerd@gnu.org>. */ |
21 | |
22 /* Faces. | |
23 | |
24 When using Emacs with X, the display style of characters can be | |
25 changed by defining `faces'. Each face can specify the following | |
26 display attributes: | |
27 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
28 1. Font family name. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
29 |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
30 2. Font foundary name. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
31 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
32 3. Relative proportionate width, aka character set width or set |
24995 | 33 width (swidth), e.g. `semi-compressed'. |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
34 |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
35 4. Font height in 1/10pt. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
36 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
37 5. Font weight, e.g. `bold'. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
38 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
39 6. Font slant, e.g. `italic'. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
40 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
41 7. Foreground color. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
42 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
43 8. Background color. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
44 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
45 9. Whether or not characters should be underlined, and in what color. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
46 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
47 10. Whether or not characters should be displayed in inverse video. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
48 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
49 11. A background stipple, a bitmap. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
50 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
51 12. Whether or not characters should be overlined, and in what color. |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
52 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
53 13. Whether or not characters should be strike-through, and in what |
24995 | 54 color. |
55 | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
56 14. Whether or not a box should be drawn around characters, the box |
24995 | 57 type, and, for simple boxes, in what color. |
58 | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
59 15. Font-spec, or nil. This is a special attribute. |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
60 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
61 A font-spec is a collection of font attributes (specs). |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
62 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
63 When this attribute is specified, the face uses a font matching |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
64 with the specs as is except for what overwritten by the specs in |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
65 the fontset (see below). In addition, the other font-related |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
66 attributes (1st thru 5th) are updated from the spec. |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
67 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
68 On the other hand, if one of the other font-related attributes are |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
69 specified, the correspoinding specs in this attribute is set to nil. |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
70 |
31178 | 71 15. A face name or list of face names from which to inherit attributes. |
72 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
73 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
|
74 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
|
75 for example, can be matched exactly. |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
76 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
77 17. A fontset name. This is another special attribute. |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
78 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
79 A fontset is a mappings from characters to font-specs, and the |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
80 specs overwrite the font-spec in the 14th attribute. |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
81 |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
82 |
24995 | 83 Faces are frame-local by nature because Emacs allows to define the |
84 same named face (face names are symbols) differently for different | |
85 frames. Each frame has an alist of face definitions for all named | |
86 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
|
87 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
|
88 attributes mentioned above. |
24995 | 89 |
90 There is also a global face alist `Vface_new_frame_defaults'. Face | |
91 definitions from this list are used to initialize faces of newly | |
92 created frames. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
93 |
24995 | 94 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
|
95 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
|
96 the 14th are called `fully-specified'. |
24995 | 97 |
98 | |
99 Face merging. | |
100 | |
101 The display style of a given character in the text is determined by | |
102 combining several faces. This process is called `face merging'. | |
103 Any aspect of the display style that isn't specified by overlays or | |
104 text properties is taken from the `default' face. Since it is made | |
105 sure that the default face is always fully-specified, face merging | |
106 always results in a fully-specified face. | |
107 | |
108 | |
109 Face realization. | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
110 |
24995 | 111 After all face attributes for a character have been determined by |
112 merging faces of that character, that face is `realized'. The | |
113 realization process maps face attributes to what is physically | |
114 available on the system where Emacs runs. The result is a | |
115 `realized face' in form of a struct face which is stored in the | |
116 face cache of the frame on which it was realized. | |
117 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
118 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
|
119 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
|
120 other words, for characters that have different font |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
121 specifications, different realized faces are needed to display |
24995 | 122 them. |
123 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
124 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
|
125 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
|
126 characters share the same font in a fontset. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
127 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
128 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
|
129 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
|
130 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
|
131 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
|
132 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
|
133 |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
134 Thus, all realized faces have a realized fontset. |
24995 | 135 |
136 | |
137 Unibyte text. | |
138 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
139 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
|
140 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
|
141 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
|
142 and raw 8-bit characters. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
143 |
24995 | 144 |
145 Font selection. | |
146 | |
147 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
|
148 given (character, face) combination. |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
149 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 default fontset determines a pattern for multibyte characters. |
24995 | 156 |
157 Available fonts on the system on which Emacs runs are then matched | |
158 against the font pattern. The result of font selection is the best | |
159 match for the given face attributes in this font list. | |
160 | |
161 Font selection can be influenced by the user. | |
162 | |
163 1. The user can specify the relative importance he gives the face | |
164 attributes width, height, weight, and slant by setting | |
165 face-font-selection-order (faces.el) to a list of face attribute | |
166 names. The default is '(:width :height :weight :slant), and means | |
167 that font selection first tries to find a good match for the font | |
168 width specified by a face, then---within fonts with that | |
169 width---tries to find a best match for the specified font height, | |
170 etc. | |
171 | |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
172 2. Setting face-font-family-alternatives allows the user to |
24995 | 173 specify alternative font families to try if a family specified by a |
174 face doesn't exist. | |
175 | |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
176 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
|
177 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
|
178 specifying a registry. |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
179 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
180 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
|
181 fonts. |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
182 |
24995 | 183 |
36946 | 184 Character composition. |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
185 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
186 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
|
187 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
|
188 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
|
189 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
|
190 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
|
191 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
|
192 the same. |
24995 | 193 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
194 |
24995 | 195 Initialization of basic faces. |
196 | |
197 The faces `default', `modeline' are considered `basic faces'. | |
198 When redisplay happens the first time for a newly created frame, | |
199 basic faces are realized for CHARSET_ASCII. Frame parameters are | |
200 used to fill in unspecified attributes of the default face. */ | |
201 | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25890
diff
changeset
|
202 #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
|
203 #include <stdio.h> |
2336 | 204 #include <sys/types.h> |
205 #include <sys/stat.h> | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
206 #include <stdio.h> /* This needs to be before termchar.h */ |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104079
diff
changeset
|
207 #include <setjmp.h> |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
208 |
2336 | 209 #include "lisp.h" |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
210 #include "character.h" |
17047 | 211 #include "charset.h" |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
212 #include "keyboard.h" |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
213 #include "frame.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
214 #include "termhooks.h" |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
215 |
9572 | 216 #ifdef HAVE_X_WINDOWS |
2336 | 217 #include "xterm.h" |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
218 #ifdef USE_MOTIF |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
219 #include <Xm/Xm.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
220 #include <Xm/XmStrDefs.h> |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
221 #endif /* USE_MOTIF */ |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
222 #endif /* HAVE_X_WINDOWS */ |
24995 | 223 |
9572 | 224 #ifdef MSDOS |
225 #include "dosfns.h" | |
226 #endif | |
24995 | 227 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
228 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
229 #include "w32term.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
230 #include "fontset.h" |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
231 /* 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
|
232 code with #ifdef blocks. */ |
37700
0e6b93106f2a
Include keyboard.h before frame.h, not after it.
Eli Zaretskii <eliz@gnu.org>
parents:
37679
diff
changeset
|
233 #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
|
234 #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
|
235 #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
|
236 #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
|
237 #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
|
238 #define GCGraphicsExposures 0 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
239 #endif /* WINDOWSNT */ |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
240 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
241 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
242 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
243 #undef FRAME_X_DISPLAY_INFO |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
244 #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
245 #define x_display_info ns_display_info |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
246 #define FRAME_X_FONT_TABLE FRAME_NS_FONT_TABLE |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
247 #define check_x check_ns |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
248 #define GCGraphicsExposures 0 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
249 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
250 |
2336 | 251 #include "buffer.h" |
2391 | 252 #include "dispextern.h" |
2438 | 253 #include "blockinput.h" |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
254 #include "window.h" |
8848 | 255 #include "intervals.h" |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
256 #include "termchar.h" |
2336 | 257 |
95128
9c4d21df23ff
Include font.h unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
95044
diff
changeset
|
258 #include "font.h" |
90414 | 259 #ifdef HAVE_WINDOW_SYSTEM |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
260 #include "fontset.h" |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
261 #endif /* HAVE_WINDOW_SYSTEM */ |
90414 | 262 |
9572 | 263 #ifdef HAVE_X_WINDOWS |
24995 | 264 |
265 /* 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
|
266 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
|
267 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
|
268 #included. */ |
24995 | 269 |
3436
291f28da7ea1
Test XOS_NEEDS_TIME_H, not HPUX, for including time.hj.
Richard M. Stallman <rms@gnu.org>
parents:
3401
diff
changeset
|
270 #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
|
271 #include <time.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
272 #undef USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
273 #include <X11/Xos.h> |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
274 #define USG |
d968bcba16af
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
Jim Blandy <jimb@redhat.com>
parents:
3882
diff
changeset
|
275 #define __TIMEVAL__ |
24995 | 276 #else /* not XOS_NEEDS_TIME_H */ |
2336 | 277 #include <X11/Xos.h> |
24995 | 278 #endif /* not XOS_NEEDS_TIME_H */ |
279 | |
9572 | 280 #endif /* HAVE_X_WINDOWS */ |
24995 | 281 |
282 #include <ctype.h> | |
283 | |
34882 | 284 /* Number of pt per inch (from the TeXbook). */ |
285 | |
286 #define PT_PER_INCH 72.27 | |
287 | |
24995 | 288 /* Non-zero if face attribute ATTR is unspecified. */ |
289 | |
290 #define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified) | |
291 | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
292 /* Non-zero if face attribute ATTR is `ignore-defface'. */ |
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
293 |
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
294 #define IGNORE_DEFFACE_P(ATTR) EQ ((ATTR), Qignore_defface) |
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
295 |
24995 | 296 /* Value is the number of elements of VECTOR. */ |
297 | |
298 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) | |
299 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
300 /* Make a copy of string S on the stack using alloca. Value is a pointer |
24995 | 301 to the copy. */ |
302 | |
303 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S)) | |
304 | |
305 /* Make a copy of the contents of Lisp string S on the stack using | |
306 alloca. Value is a pointer to the copy. */ | |
307 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
308 #define LSTRDUPA(S) STRDUPA (SDATA ((S))) |
24995 | 309 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
310 /* Size of hash table of realized faces in face caches (should be a |
24995 | 311 prime number). */ |
312 | |
313 #define FACE_CACHE_BUCKETS_SIZE 1001 | |
314 | |
315 /* Keyword symbols used for face attribute names. */ | |
316 | |
317 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; | |
318 Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; | |
319 Lisp_Object QCwidth, QCfont, QCbold, QCitalic; | |
320 Lisp_Object QCreverse_video; | |
31178 | 321 Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
322 Lisp_Object QCfontset; |
24995 | 323 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
324 /* Keywords symbols used for font properties. */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
325 extern Lisp_Object QCfoundry, QCadstyle, QCregistry; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
326 extern Lisp_Object QCspacing, QCsize, QCavgwidth; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
327 extern Lisp_Object Qp; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
328 |
24995 | 329 /* Symbols used for attribute values. */ |
330 | |
331 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
332 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
333 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
334 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
335 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
336 Lisp_Object Qultra_expanded; | |
337 Lisp_Object Qreleased_button, Qpressed_button; | |
338 Lisp_Object QCstyle, QCcolor, QCline_width; | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
339 Lisp_Object Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
340 Lisp_Object Qignore_defface; |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
341 |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
342 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
24995 | 343 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
344 /* The name of the function to call when the background of the frame |
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
345 has changed, frame_set_background_mode. */ |
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
346 |
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
347 Lisp_Object Qframe_set_background_mode; |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
348 |
24995 | 349 /* Names of basic faces. */ |
350 | |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
351 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
|
352 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; |
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63642
diff
changeset
|
353 Lisp_Object Qmode_line_inactive, Qvertical_border; |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
354 extern Lisp_Object Qmode_line; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
355 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
356 /* 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
|
357 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
|
358 the aliased face. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
359 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
360 Lisp_Object Qface_alias; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
361 |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
362 extern Lisp_Object Qcircular_list; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
363 |
24995 | 364 /* Default stipple pattern used on monochrome displays. This stipple |
365 pattern is used on monochrome displays instead of shades of gray | |
366 for a face background color. See `set-face-stipple' for possible | |
367 values for this variable. */ | |
368 | |
369 Lisp_Object Vface_default_stipple; | |
370 | |
371 /* Alist of alternative font families. Each element is of the form | |
372 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
373 try FAMILY1, then FAMILY2, ... */ | |
374 | |
375 Lisp_Object Vface_alternative_font_family_alist; | |
376 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
377 /* 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
|
378 (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
|
379 loaded, try REGISTRY1, then REGISTRY2, ... */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
380 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
381 Lisp_Object Vface_alternative_font_registry_alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
382 |
24995 | 383 /* Allowed scalable fonts. A value of nil means don't allow any |
384 scalable fonts. A value of t means allow the use of any scalable | |
385 font. Otherwise, value must be a list of regular expressions. A | |
386 font may be scaled if its name matches a regular expression in the | |
387 list. */ | |
388 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
389 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
24995 | 390 |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
391 /* 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
|
392 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
393 Lisp_Object Vface_ignored_fonts; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
394 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
395 /* 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
|
396 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
397 Lisp_Object Vface_font_rescale_alist; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
398 |
25270 | 399 /* Maximum number of fonts to consider in font_list. If not an |
400 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
401 | |
402 Lisp_Object Vfont_list_limit; | |
403 #define DEFAULT_FONT_LIST_LIMIT 100 | |
404 | |
24995 | 405 /* The symbols `foreground-color' and `background-color' which can be |
406 used as part of a `face' property. This is for compatibility with | |
407 Emacs 20.2. */ | |
408 | |
409 Lisp_Object Qforeground_color, Qbackground_color; | |
410 | |
411 /* The symbols `face' and `mouse-face' used as text properties. */ | |
2342 | 412 |
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
413 Lisp_Object Qface; |
24995 | 414 extern Lisp_Object Qmouse_face; |
415 | |
57107 | 416 /* Property for basic faces which other faces cannot inherit. */ |
417 | |
418 Lisp_Object Qface_no_inherit; | |
419 | |
24995 | 420 /* Error symbol for wrong_type_argument in load_pixmap. */ |
421 | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
422 Lisp_Object Qbitmap_spec_p; |
2391 | 423 |
24995 | 424 /* Alist of global face definitions. Each element is of the form |
425 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
426 is a Lisp vector of face attributes. These faces are used | |
427 to initialize faces for new frames. */ | |
428 | |
429 Lisp_Object Vface_new_frame_defaults; | |
430 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
431 /* Alist of face remappings. Each element is of the form: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
432 (FACE REPLACEMENT...) which causes display of the face FACE to use |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
433 REPLACEMENT... instead. REPLACEMENT... is interpreted the same way |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
434 the value of a `face' text property is: it may be (1) A face name, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
435 (2) A list of face names, (3) A property-list of face attribute/value |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
436 pairs, or (4) A list of face names intermixed with lists containing |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
437 face attribute/value pairs. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
438 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
439 Multiple entries in REPLACEMENT... are merged together to form the final |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
440 result, with faces or attributes earlier in the list taking precedence |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
441 over those that are later. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
442 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
443 Face-name remapping cycles are suppressed; recursive references use |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
444 the underlying face instead of the remapped face. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
445 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
446 Lisp_Object Vface_remapping_alist; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
447 |
24995 | 448 /* The next ID to assign to Lisp faces. */ |
449 | |
450 static int next_lface_id; | |
451 | |
452 /* A vector mapping Lisp face Id's to face names. */ | |
453 | |
454 static Lisp_Object *lface_id_to_name; | |
455 static int lface_id_to_name_size; | |
456 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
457 /* 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
|
458 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
459 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
24995 | 460 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
461 /* 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
|
462 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
463 Lisp_Object Qtty_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
464 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
465 /* 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
|
466 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
467 Lisp_Object Vtty_defined_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
468 |
24995 | 469 /* Counter for calls to clear_face_cache. If this counter reaches |
470 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
471 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
472 | |
473 static int clear_font_table_count; | |
474 #define CLEAR_FONT_TABLE_COUNT 100 | |
475 #define CLEAR_FONT_TABLE_NFONTS 10 | |
476 | |
477 /* Non-zero means face attributes have been changed since the last | |
478 redisplay. Used in redisplay_internal. */ | |
479 | |
480 int face_change_count; | |
481 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
482 /* 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
|
483 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
|
484 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
|
485 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
|
486 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
487 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
|
488 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
489 /* 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
|
490 Finternal_set_lisp_face_attribute. */ |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
491 |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
492 static Lisp_Object Vparam_value_alist; |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
493 |
24995 | 494 /* The total number of colors currently allocated. */ |
495 | |
496 #if GLYPH_DEBUG | |
497 static int ncolors_allocated; | |
498 static int npixmaps_allocated; | |
499 static int ngcs; | |
500 #endif | |
501 | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
502 /* 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
|
503 been changed. */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
504 |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
505 int menu_face_changed_default; |
24995 | 506 |
2336 | 507 |
24995 | 508 /* Function prototypes. */ |
509 | |
510 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
|
511 struct named_merge_point; |
24995 | 512 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
513 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
|
514 enum lface_attribute_index, int *)); |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
515 static Lisp_Object resolve_face_name P_ ((Lisp_Object, int)); |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
516 static int may_use_scalable_font_p P_ ((const char *)); |
24995 | 517 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
518 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
519 int, struct named_merge_point *)); |
24995 | 520 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); |
521 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); | |
522 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); | |
523 static void free_face_colors P_ ((struct frame *, struct face *)); | |
524 static int face_color_gray_p P_ ((struct frame *, char *)); | |
88907 | 525 static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, |
526 int)); | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
527 static struct face *realize_non_ascii_face P_ ((struct frame *, Lisp_Object, |
88907 | 528 struct face *)); |
529 static struct face *realize_x_face P_ ((struct face_cache *, Lisp_Object *)); | |
530 static struct face *realize_tty_face P_ ((struct face_cache *, Lisp_Object *)); | |
24995 | 531 static int realize_basic_faces P_ ((struct frame *)); |
532 static int realize_default_face P_ ((struct frame *)); | |
533 static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); | |
534 static int lface_fully_specified_p P_ ((Lisp_Object *)); | |
535 static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); | |
536 static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); | |
537 static unsigned lface_hash P_ ((Lisp_Object *)); | |
538 static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); | |
539 static struct face_cache *make_face_cache P_ ((struct frame *)); | |
540 static void clear_face_gcs P_ ((struct face_cache *)); | |
541 static void free_face_cache P_ ((struct face_cache *)); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
542 static int face_fontset P_ ((Lisp_Object *)); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
543 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
|
544 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
|
545 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
|
546 int, struct named_merge_point *)); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
547 static int set_lface_from_font P_ ((struct frame *, Lisp_Object, Lisp_Object, |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
548 int)); |
24995 | 549 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
|
550 static struct face *make_realized_face P_ ((Lisp_Object *)); |
24995 | 551 static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); |
552 static void uncache_face P_ ((struct face_cache *, struct face *)); | |
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 GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); | |
557 static void x_free_gc P_ ((struct frame *, GC)); | |
558 | |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
559 #ifdef USE_X_TOOLKIT |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
560 static void x_update_menu_appearance P_ ((struct frame *)); |
39675 | 561 |
562 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
|
563 #endif /* USE_X_TOOLKIT */ |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
564 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
565 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 566 |
567 | |
568 /*********************************************************************** | |
569 Utilities | |
570 ***********************************************************************/ | |
571 | |
572 #ifdef HAVE_X_WINDOWS | |
573 | |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
574 #ifdef DEBUG_X_COLORS |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
575 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
576 /* 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
|
577 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
|
578 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
|
579 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
|
580 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
|
581 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
|
582 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
|
583 single display/screen. --gerd. */ |
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 /* Reference counts for pixel colors. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
586 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
587 int color_count[256]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
588 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
589 /* Register color PIXEL as allocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
590 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
591 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
592 register_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 ++color_count[pixel]; |
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 |
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 /* Register color PIXEL as deallocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
601 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
602 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 unregister_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
605 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
606 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 if (color_count[pixel] > 0) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 --color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 else |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 abort (); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
614 /* Register N colors from PIXELS as deallocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
615 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
616 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
617 unregister_colors (pixels, n) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
618 unsigned long *pixels; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
619 int n; |
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 int i; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
622 for (i = 0; i < n; ++i) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
623 unregister_color (pixels[i]); |
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 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
626 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
627 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
|
628 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
|
629 () |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
630 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
631 int i, n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
632 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
633 fputc ('\n', stderr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
634 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
635 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
|
636 if (color_count[i]) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
637 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
638 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
|
639 ++n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 if (n % 5 == 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
641 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
642 else |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
643 fputc ('\t', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
644 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
645 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
646 if (n % 5 != 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
647 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
648 return Qnil; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
649 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
650 |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
651 #endif /* DEBUG_X_COLORS */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
652 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
653 |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
654 /* 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
|
655 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
|
656 is called. */ |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
657 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
658 void |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
659 x_free_colors (f, pixels, npixels) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
660 struct frame *f; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
661 unsigned long *pixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
662 int npixels; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
663 { |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
664 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
665 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
666 /* 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
|
667 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
|
668 if (class != StaticColor && class != StaticGray && class != TrueColor) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
669 { |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
670 #ifdef DEBUG_X_COLORS |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
671 unregister_colors (pixels, npixels); |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
672 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
673 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
|
674 pixels, npixels, 0); |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
675 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
676 } |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
677 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
678 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
679 /* 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
|
680 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
|
681 is called. */ |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
682 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
683 void |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
684 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
|
685 Display *dpy; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
686 Screen *screen; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 Colormap cmap; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
688 unsigned long *pixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
689 int npixels; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
690 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
691 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
|
692 int class = dpyinfo->visual->class; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
693 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
694 /* 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
|
695 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
|
696 if (class != StaticColor && class != StaticGray && class != TrueColor) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
697 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
698 #ifdef DEBUG_X_COLORS |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
699 unregister_colors (pixels, npixels); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
700 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
701 XFreeColors (dpy, cmap, pixels, npixels, 0); |
29599
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 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
704 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
705 |
24995 | 706 /* Create and return a GC for use on frame F. GC values and mask |
707 are given by XGCV and MASK. */ | |
708 | |
709 static INLINE GC | |
710 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
|
711 struct frame *f; |
24995 | 712 unsigned long mask; |
713 XGCValues *xgcv; | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
714 { |
2336 | 715 GC gc; |
24995 | 716 BLOCK_INPUT; |
717 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
718 UNBLOCK_INPUT; | |
719 IF_DEBUG (++ngcs); | |
720 return gc; | |
721 } | |
722 | |
723 | |
724 /* Free GC which was used on frame F. */ | |
725 | |
726 static INLINE void | |
727 x_free_gc (f, gc) | |
728 struct frame *f; | |
729 GC gc; | |
730 { | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
731 eassert (interrupt_input_blocked); |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
732 IF_DEBUG (xassert (--ngcs >= 0)); |
24995 | 733 XFreeGC (FRAME_X_DISPLAY (f), gc); |
734 } | |
735 | |
736 #endif /* HAVE_X_WINDOWS */ | |
737 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
738 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
739 /* W32 emulation of GCs */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
740 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
741 static INLINE GC |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
742 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
|
743 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
744 unsigned long mask; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
745 XGCValues *xgcv; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
746 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
747 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
748 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
749 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
|
750 UNBLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
751 IF_DEBUG (++ngcs); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
752 return gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
753 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
754 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
755 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
756 /* 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
|
757 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
758 static INLINE void |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
759 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
|
760 struct frame *f; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
761 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
762 { |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
763 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
|
764 xfree (gc); |
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 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
767 #endif /* WINDOWSNT */ |
24995 | 768 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
769 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
770 /* NS emulation of GCs */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
771 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
772 static INLINE GC |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
773 x_create_gc (f, mask, xgcv) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
774 struct frame *f; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
775 unsigned long mask; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
776 XGCValues *xgcv; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
777 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
778 GC gc = xmalloc (sizeof (*gc)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
779 if (gc) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
780 bcopy(xgcv, gc, sizeof(XGCValues)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
781 return gc; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
782 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
783 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
784 static INLINE void |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
785 x_free_gc (f, gc) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
786 struct frame *f; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
787 GC gc; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
788 { |
103624
3e06f0e66062
Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents:
103359
diff
changeset
|
789 xfree (gc); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
790 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
791 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
792 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
793 /* Like strcasecmp/stricmp. Used to compare parts of font names which |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
794 are in ISO8859-1. */ |
24995 | 795 |
796 int | |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
797 xstrcasecmp (s1, s2) |
46478
d6b51ec01987
(xstricmp): String pointer args now point to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
798 const unsigned char *s1, *s2; |
24995 | 799 { |
800 while (*s1 && *s2) | |
801 { | |
802 unsigned char c1 = tolower (*s1); | |
803 unsigned char c2 = tolower (*s2); | |
804 if (c1 != c2) | |
805 return c1 < c2 ? -1 : 1; | |
806 ++s1, ++s2; | |
807 } | |
808 | |
809 if (*s1 == 0) | |
810 return *s2 == 0 ? 0 : -1; | |
811 return 1; | |
812 } | |
813 | |
814 | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
815 /* 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
|
816 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
|
817 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
|
818 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
|
819 Lisp function definitions. */ |
24995 | 820 |
821 static INLINE struct frame * | |
822 frame_or_selected_frame (frame, nparam) | |
823 Lisp_Object frame; | |
824 int nparam; | |
825 { | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
826 if (NILP (frame)) |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
827 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
828 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
829 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
830 return XFRAME (frame); |
24995 | 831 } |
832 | |
833 | |
834 /*********************************************************************** | |
835 Frames and faces | |
836 ***********************************************************************/ | |
837 | |
838 /* 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
|
839 |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
840 void |
24995 | 841 init_frame_faces (f) |
842 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
|
843 { |
24995 | 844 /* Make a face cache, if F doesn't have one. */ |
845 if (FRAME_FACE_CACHE (f) == NULL) | |
846 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
847 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
848 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 849 /* 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
|
850 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
|
851 { |
100398 | 852 /* We initialize the image cache when creating the first frame |
853 on a terminal, and not during terminal creation. This way, | |
854 `x-open-connection' on a tty won't create an image cache. */ | |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
855 if (FRAME_IMAGE_CACHE (f) == NULL) |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
856 FRAME_IMAGE_CACHE (f) = make_image_cache (); |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
857 ++FRAME_IMAGE_CACHE (f)->refcount; |
24995 | 858 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
859 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 860 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
861 /* Realize basic faces. Must have enough information in frame |
24995 | 862 parameters to realize basic faces at this point. */ |
863 #ifdef HAVE_X_WINDOWS | |
864 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
865 #endif | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
866 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
867 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
|
868 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
869 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
870 if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f)) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
871 #endif |
24995 | 872 if (!realize_basic_faces (f)) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
873 abort (); |
24995 | 874 } |
875 | |
876 | |
100666
dab9cf44bf3f
In comments, write delete_frame instead of Fdelete_frame.
Martin Rudalics <rudalics@gmx.at>
parents:
100398
diff
changeset
|
877 /* Free face cache of frame F. Called from delete_frame. */ |
24995 | 878 |
879 void | |
880 free_frame_faces (f) | |
881 struct frame *f; | |
882 { | |
883 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
|
884 |
24995 | 885 if (face_cache) |
886 { | |
887 free_face_cache (face_cache); | |
888 FRAME_FACE_CACHE (f) = NULL; | |
889 } | |
890 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
891 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
892 if (FRAME_WINDOW_P (f)) |
24995 | 893 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
894 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f); |
24995 | 895 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
|
896 { |
24995 | 897 --image_cache->refcount; |
898 if (image_cache->refcount == 0) | |
899 free_image_cache (f); | |
900 } | |
901 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
902 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 903 } |
904 | |
905 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
906 /* 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
|
907 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
|
908 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
|
909 of named faces. */ |
24995 | 910 |
911 void | |
912 recompute_basic_faces (f) | |
913 struct frame *f; | |
914 { | |
915 if (FRAME_FACE_CACHE (f)) | |
916 { | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
917 clear_face_cache (0); |
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
918 if (!realize_basic_faces (f)) |
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
919 abort (); |
24995 | 920 } |
921 } | |
922 | |
923 | |
924 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
925 try to free unused fonts, too. */ | |
926 | |
927 void | |
928 clear_face_cache (clear_fonts_p) | |
929 int clear_fonts_p; | |
930 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
931 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 932 Lisp_Object tail, frame; |
933 struct frame *f; | |
934 | |
935 if (clear_fonts_p | |
936 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
937 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
938 #if 0 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
939 /* Not yet implemented. */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
940 clear_font_cache (frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
941 #endif |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
942 |
24995 | 943 /* From time to time see if we can unload some fonts. This also |
944 frees all realized faces on all frames. Fonts needed by | |
945 faces will be loaded again when faces are realized again. */ | |
946 clear_font_table_count = 0; | |
947 | |
948 FOR_EACH_FRAME (tail, frame) | |
949 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
950 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
|
951 if (FRAME_WINDOW_P (f) |
24995 | 952 && 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
|
953 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
|
954 } |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
955 } |
24995 | 956 else |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
957 { |
24995 | 958 /* Clear GCs of realized faces. */ |
959 FOR_EACH_FRAME (tail, frame) | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
960 { |
24995 | 961 f = XFRAME (frame); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
962 if (FRAME_WINDOW_P (f)) |
24995 | 963 clear_face_gcs (FRAME_FACE_CACHE (f)); |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
964 } |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
965 clear_image_caches (Qnil); |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
966 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
967 #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
|
968 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
969 |
24995 | 970 |
971 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
|
972 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
|
973 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
|
974 (thoroughly) |
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
975 Lisp_Object thoroughly; |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
976 { |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
977 clear_face_cache (!NILP (thoroughly)); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
978 ++face_change_count; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
979 ++windows_or_buffers_changed; |
24995 | 980 return Qnil; |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
981 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
982 |
24995 | 983 |
984 /*********************************************************************** | |
985 X Pixmaps | |
986 ***********************************************************************/ | |
987 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
988 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 989 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
990 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
|
991 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
|
992 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
|
993 \(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
|
994 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
|
995 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
|
996 \(WIDTH + 7)/8 bytes. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
997 (object) |
14090
24b93860d392
(Fpixmap_spec_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
998 Lisp_Object object; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
999 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1000 int pixmap_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1001 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1002 if (STRINGP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1003 /* 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
|
1004 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1005 else if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1006 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1007 /* 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
|
1008 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
|
1009 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
|
1010 Lisp_Object width, height, data; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1011 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1012 height = width = data = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1013 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1014 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1015 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1016 width = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1017 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1018 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1019 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1020 height = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1021 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1022 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1023 data = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1024 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1025 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1026 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1027 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1028 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1029 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
|
1030 / 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
|
1031 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
|
1032 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1033 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1034 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1035 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
1036 return pixmap_p ? Qt : Qnil; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1037 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1038 |
24995 | 1039 |
1040 /* Load a bitmap according to NAME (which is either a file name or a | |
1041 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
1042 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
1043 bitmap cannot be loaded, display a message saying so, and return | |
1044 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
1045 if these pointers are not null. */ | |
1046 | |
1047 static int | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1048 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
|
1049 FRAME_PTR f; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1050 Lisp_Object name; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1051 unsigned int *w_ptr, *h_ptr; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1052 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1053 int bitmap_id; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1054 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1055 if (NILP (name)) |
24995 | 1056 return 0; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1057 |
71845
085d9056841a
(load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71576
diff
changeset
|
1058 CHECK_TYPE (!NILP (Fbitmap_spec_p (name)), Qbitmap_spec_p, name); |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1059 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1060 BLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1061 if (CONSP (name)) |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1062 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1063 /* Decode a bitmap spec into a bitmap. */ |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1064 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1065 int h, w; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1066 Lisp_Object bits; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1067 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1068 w = XINT (Fcar (name)); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1069 h = XINT (Fcar (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1070 bits = Fcar (Fcdr (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1071 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1072 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
|
1073 w, h); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1074 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1075 else |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1076 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1077 /* 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
|
1078 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
|
1079 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1080 UNBLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1081 |
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1082 if (bitmap_id < 0) |
24995 | 1083 { |
72446
44f03dd44abf
(load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents:
72170
diff
changeset
|
1084 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil); |
24995 | 1085 bitmap_id = 0; |
1086 | |
1087 if (w_ptr) | |
1088 *w_ptr = 0; | |
1089 if (h_ptr) | |
1090 *h_ptr = 0; | |
1091 } | |
1092 else | |
1093 { | |
1094 #if GLYPH_DEBUG | |
1095 ++npixmaps_allocated; | |
1096 #endif | |
1097 if (w_ptr) | |
1098 *w_ptr = x_bitmap_width (f, bitmap_id); | |
1099 | |
1100 if (h_ptr) | |
1101 *h_ptr = x_bitmap_height (f, bitmap_id); | |
1102 } | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1103 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1104 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
|
1105 } |
9572 | 1106 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1107 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1108 |
9572 | 1109 |
2336 | 1110 |
24995 | 1111 /*********************************************************************** |
1112 X Colors | |
1113 ***********************************************************************/ | |
1114 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1115 /* 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
|
1116 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
|
1117 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
|
1118 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1119 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1120 parse_rgb_list (rgb_list, color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1121 Lisp_Object rgb_list; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1122 XColor *color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1123 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1124 #define PARSE_RGB_LIST_FIELD(field) \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1125 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
|
1126 { \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1127 color->field = XINT (XCAR (rgb_list)); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1128 rgb_list = XCDR (rgb_list); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1129 } \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1130 else \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1131 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1132 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1133 PARSE_RGB_LIST_FIELD (red); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1134 PARSE_RGB_LIST_FIELD (green); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1135 PARSE_RGB_LIST_FIELD (blue); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1136 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1137 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1138 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1139 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1140 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1141 /* 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
|
1142 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
|
1143 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
|
1144 returned in it. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1145 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1146 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1147 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
|
1148 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1149 Lisp_Object color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1150 XColor *tty_color, *std_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1151 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1152 Lisp_Object frame, color_desc; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1153 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1154 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
|
1155 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1156 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1157 XSETFRAME (frame, f); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1158 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1159 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
|
1160 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
|
1161 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1162 Lisp_Object rgb; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1163 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1164 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1165 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1166 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1167 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
|
1168 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1169 rgb = XCDR (XCDR (color_desc)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1170 if (! parse_rgb_list (rgb, tty_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1171 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1172 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1173 /* Should we fill in STD_COLOR too? */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1174 if (std_color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1175 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1176 /* 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
|
1177 *std_color = *tty_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1178 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1179 /* 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
|
1180 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
|
1181 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
|
1182 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
|
1183 if ((!STRINGP (XCAR (color_desc)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1184 || 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
|
1185 && !NILP (Ffboundp (Qtty_color_standard_values))) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1186 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1187 /* Look up STD_COLOR separately. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1188 rgb = call1 (Qtty_color_standard_values, color); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1189 if (! parse_rgb_list (rgb, std_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1190 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1191 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1192 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1193 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1194 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1195 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1196 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
|
1197 /* 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
|
1198 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
|
1199 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
|
1200 load color" messages in the *Messages* buffer. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1201 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1202 else |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1203 /* 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
|
1204 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1205 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1206 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1207 /* 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
|
1208 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1209 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1210 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
|
1211 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1212 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1213 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1214 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1215 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1216 int status = 1; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1217 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1218 /* Defaults. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1219 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
|
1220 color_def->red = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1221 color_def->blue = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1222 color_def->green = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1223 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1224 if (*color_name) |
89554
15da46f6f0ac
(face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1225 status = tty_lookup_color (f, build_string (color_name), color_def, NULL); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1226 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1227 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
|
1228 { |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1229 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
|
1230 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
|
1231 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
|
1232 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
|
1233 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1234 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1235 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
|
1236 status = 1; |
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1237 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1238 return status; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1239 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1240 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1241 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1242 /* 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
|
1243 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
|
1244 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
|
1245 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1246 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
|
1247 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1248 int |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1249 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
|
1250 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1251 char *color_name; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1252 XColor *color_def; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1253 int alloc; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1254 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1255 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
|
1256 return tty_defined_color (f, color_name, color_def, alloc); |
24995 | 1257 #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
|
1258 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
|
1259 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
|
1260 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1261 #ifdef WINDOWSNT |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1262 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
|
1263 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
|
1264 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1265 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1266 else if (FRAME_NS_P (f)) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1267 return ns_defined_color (f, color_name, color_def, alloc, 1); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1268 #endif |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1269 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1270 abort (); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1271 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1272 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1273 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1274 /* 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
|
1275 Lisp string. */ |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1276 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1277 Lisp_Object |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1278 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
|
1279 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1280 int idx; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1281 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1282 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
|
1283 { |
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1284 Lisp_Object frame; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1285 Lisp_Object coldesc; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1286 |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1287 XSETFRAME (frame, f); |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1288 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
|
1289 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1290 if (!NILP (coldesc)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1291 return XCAR (coldesc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1292 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1293 #ifdef MSDOS |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1294 /* 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
|
1295 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
|
1296 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
|
1297 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
|
1298 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1299 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1300 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1301 return build_string (unspecified_fg); |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1302 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1303 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
|
1304 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1305 return Qunspecified; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1306 } |
24995 | 1307 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1308 |
24995 | 1309 /* Return non-zero if COLOR_NAME is a shade of gray (or white or |
65781
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1310 black) on frame F. |
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1311 |
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1312 The criterion implemented here is not a terribly sophisticated one. */ |
24995 | 1313 |
1314 static int | |
1315 face_color_gray_p (f, color_name) | |
1316 struct frame *f; | |
1317 char *color_name; | |
1318 { | |
1319 XColor color; | |
1320 int gray_p; | |
1321 | |
1322 if (defined_color (f, color_name, &color, 0)) | |
65781
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1323 gray_p = (/* Any color sufficiently close to black counts as grey. */ |
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1324 (color.red < 5000 && color.green < 5000 && color.blue < 5000) |
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1325 || |
85262 | 1326 ((eabs (color.red - color.green) |
65781
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1327 < max (color.red, color.green) / 20) |
85262 | 1328 && (eabs (color.green - color.blue) |
65781
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1329 < max (color.green, color.blue) / 20) |
85262 | 1330 && (eabs (color.blue - color.red) |
65781
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1331 < max (color.blue, color.red) / 20))); |
24995 | 1332 else |
1333 gray_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1334 |
24995 | 1335 return gray_p; |
1336 } | |
1337 | |
1338 | |
1339 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
1340 BACKGROUND_P non-zero means the color will be used as background | |
1341 color. */ | |
1342 | |
1343 static int | |
1344 face_color_supported_p (f, color_name, background_p) | |
1345 struct frame *f; | |
1346 char *color_name; | |
1347 int background_p; | |
1348 { | |
1349 Lisp_Object frame; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1350 XColor not_used; |
24995 | 1351 |
1352 XSETFRAME (frame, f); | |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1353 return |
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1354 #ifdef HAVE_WINDOW_SYSTEM |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1355 FRAME_WINDOW_P (f) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1356 ? (!NILP (Fxw_display_color_p (frame)) |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
1357 || xstrcasecmp (color_name, "black") == 0 |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
1358 || xstrcasecmp (color_name, "white") == 0 |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1359 || (background_p |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1360 && 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
|
1361 || (!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
|
1362 && 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
|
1363 : |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1364 #endif |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1365 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
|
1366 } |
24995 | 1367 |
1368 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1369 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
|
1370 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
|
1371 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
|
1372 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
|
1373 (color, frame) |
24995 | 1374 Lisp_Object color, frame; |
1375 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1376 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1377 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1378 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1379 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1380 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1381 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1382 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1383 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
|
1384 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
24995 | 1385 } |
1386 | |
1387 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1388 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
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 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
|
1394 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
|
1395 (color, frame, background_p) |
24995 | 1396 Lisp_Object frame, color, background_p; |
1397 { | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1398 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1399 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1400 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1401 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1402 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1403 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1404 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1405 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
|
1406 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
24995 | 1407 return Qt; |
1408 return Qnil; | |
1409 } | |
1410 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1411 |
24995 | 1412 /* Load color with name NAME for use by face FACE on frame F. |
1413 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
1414 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
1415 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
1416 pixel color. If color cannot be loaded, display a message, and | |
1417 return the foreground, background or underline color of F, but | |
1418 record that fact in flags of the face so that we don't try to free | |
1419 these colors. */ | |
1420 | |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1421 unsigned long |
24995 | 1422 load_color (f, face, name, target_index) |
1423 struct frame *f; | |
1424 struct face *face; | |
1425 Lisp_Object name; | |
1426 enum lface_attribute_index target_index; | |
1427 { | |
1428 XColor color; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1429 |
24995 | 1430 xassert (STRINGP (name)); |
1431 xassert (target_index == LFACE_FOREGROUND_INDEX | |
1432 || target_index == LFACE_BACKGROUND_INDEX | |
1433 || target_index == LFACE_UNDERLINE_INDEX | |
1434 || target_index == LFACE_OVERLINE_INDEX | |
1435 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
1436 || target_index == LFACE_BOX_INDEX); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1437 |
24995 | 1438 /* if the color map is full, defined_color will return a best match |
1439 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
|
1440 if (!defined_color (f, SDATA (name), &color, 1)) |
24995 | 1441 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1442 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
|
1443 |
24995 | 1444 switch (target_index) |
1445 { | |
1446 case LFACE_FOREGROUND_INDEX: | |
1447 face->foreground_defaulted_p = 1; | |
1448 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1449 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1450 |
24995 | 1451 case LFACE_BACKGROUND_INDEX: |
1452 face->background_defaulted_p = 1; | |
1453 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
1454 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1455 |
24995 | 1456 case LFACE_UNDERLINE_INDEX: |
1457 face->underline_defaulted_p = 1; | |
1458 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1459 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1460 |
24995 | 1461 case LFACE_OVERLINE_INDEX: |
1462 face->overline_color_defaulted_p = 1; | |
1463 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1464 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1465 |
24995 | 1466 case LFACE_STRIKE_THROUGH_INDEX: |
1467 face->strike_through_color_defaulted_p = 1; | |
1468 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1469 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1470 |
24995 | 1471 case LFACE_BOX_INDEX: |
1472 face->box_color_defaulted_p = 1; | |
1473 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1474 break; | |
1475 | |
1476 default: | |
1477 abort (); | |
1478 } | |
1479 } | |
1480 #if GLYPH_DEBUG | |
1481 else | |
1482 ++ncolors_allocated; | |
1483 #endif | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1484 |
24995 | 1485 return color.pixel; |
1486 } | |
1487 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1488 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1489 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1490 |
1491 /* Load colors for face FACE which is used on frame F. Colors are | |
1492 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
1493 of ATTRS. If the background color specified is not supported on F, | |
1494 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
1495 | |
1496 static void | |
1497 load_face_colors (f, face, attrs) | |
1498 struct frame *f; | |
1499 struct face *face; | |
1500 Lisp_Object *attrs; | |
1501 { | |
1502 Lisp_Object fg, bg; | |
1503 | |
1504 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
1505 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
1506 | |
1507 /* Swap colors if face is inverse-video. */ | |
1508 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
1509 { | |
1510 Lisp_Object tmp; | |
1511 tmp = fg; | |
1512 fg = bg; | |
1513 bg = tmp; | |
1514 } | |
1515 | |
1516 /* Check for support for foreground, not for background because | |
1517 face_color_supported_p is smart enough to know that grays are | |
1518 "supported" as background because we are supposed to use stipple | |
1519 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
|
1520 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
|
1521 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
24995 | 1522 { |
1523 x_destroy_bitmap (f, face->stipple); | |
1524 face->stipple = load_pixmap (f, Vface_default_stipple, | |
1525 &face->pixmap_w, &face->pixmap_h); | |
1526 } | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1527 |
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1528 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
24995 | 1529 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
1530 } | |
1531 | |
1532 | |
1533 /* Free color PIXEL on frame F. */ | |
1534 | |
1535 void | |
1536 unload_color (f, pixel) | |
1537 struct frame *f; | |
1538 unsigned long pixel; | |
1539 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1540 #ifdef HAVE_X_WINDOWS |
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1541 if (pixel != -1) |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1542 { |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1543 BLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1544 x_free_colors (f, &pixel, 1); |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1545 UNBLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1546 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1547 #endif |
24995 | 1548 } |
1549 | |
1550 | |
1551 /* Free colors allocated for FACE. */ | |
1552 | |
1553 static void | |
1554 free_face_colors (f, face) | |
1555 struct frame *f; | |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1556 struct face *face; |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1557 { |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1558 /* PENDING(NS): need to do something here? */ |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1559 #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
|
1560 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
|
1561 return; |
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1562 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1563 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1564 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1565 if (!face->foreground_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1566 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1567 x_free_colors (f, &face->foreground, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1568 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1569 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1570 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1571 if (!face->background_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1572 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1573 x_free_colors (f, &face->background, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1574 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1575 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1576 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1577 if (face->underline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1578 && !face->underline_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1579 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1580 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
|
1581 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1582 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1583 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1584 if (face->overline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1585 && !face->overline_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1586 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1587 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
|
1588 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1589 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1590 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1591 if (face->strike_through_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1592 && !face->strike_through_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1593 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1594 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
|
1595 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1596 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1597 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1598 if (face->box != FACE_NO_BOX |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1599 && !face->box_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1600 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1601 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
|
1602 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1603 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1604 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1605 UNBLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1606 #endif /* HAVE_X_WINDOWS */ |
24995 | 1607 } |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1608 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1609 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1610 |
1611 | |
1612 | |
1613 /*********************************************************************** | |
1614 XLFD Font Names | |
1615 ***********************************************************************/ | |
1616 | |
1617 /* An enumerator for each field of an XLFD font name. */ | |
1618 | |
1619 enum xlfd_field | |
1620 { | |
1621 XLFD_FOUNDRY, | |
1622 XLFD_FAMILY, | |
1623 XLFD_WEIGHT, | |
1624 XLFD_SLANT, | |
1625 XLFD_SWIDTH, | |
1626 XLFD_ADSTYLE, | |
1627 XLFD_PIXEL_SIZE, | |
1628 XLFD_POINT_SIZE, | |
1629 XLFD_RESX, | |
1630 XLFD_RESY, | |
1631 XLFD_SPACING, | |
1632 XLFD_AVGWIDTH, | |
1633 XLFD_REGISTRY, | |
1634 XLFD_ENCODING, | |
1635 XLFD_LAST | |
1636 }; | |
1637 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1638 /* An enumerator for each possible slant value of a font. Taken from |
24995 | 1639 the XLFD specification. */ |
1640 | |
1641 enum xlfd_slant | |
1642 { | |
1643 XLFD_SLANT_UNKNOWN, | |
1644 XLFD_SLANT_ROMAN, | |
1645 XLFD_SLANT_ITALIC, | |
1646 XLFD_SLANT_OBLIQUE, | |
1647 XLFD_SLANT_REVERSE_ITALIC, | |
1648 XLFD_SLANT_REVERSE_OBLIQUE, | |
1649 XLFD_SLANT_OTHER | |
1650 }; | |
1651 | |
1652 /* Relative font weight according to XLFD documentation. */ | |
1653 | |
1654 enum xlfd_weight | |
1655 { | |
1656 XLFD_WEIGHT_UNKNOWN, | |
1657 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
1658 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
1659 XLFD_WEIGHT_LIGHT, /* 30 */ | |
1660 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
1661 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1662 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
1663 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
1664 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
1665 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
1666 }; | |
1667 | |
1668 /* Relative proportionate width. */ | |
1669 | |
1670 enum xlfd_swidth | |
1671 { | |
1672 XLFD_SWIDTH_UNKNOWN, | |
1673 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
1674 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
1675 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
1676 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
1677 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1678 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
1679 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
1680 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
1681 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
1682 }; | |
1683 | |
1684 /* Order by which font selection chooses fonts. The default values | |
1685 mean `first, find a best match for the font width, then for the | |
1686 font height, then for weight, then for slant.' This variable can be | |
1687 set via set-face-font-sort-order. */ | |
1688 | |
1689 static int font_sort_order[4]; | |
1690 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1691 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1692 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1693 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; |
24995 | 1694 |
1695 static int | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1696 compare_fonts_by_sort_order (v1, v2) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1697 const void *v1, *v2; |
24995 | 1698 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1699 Lisp_Object font1 = *(Lisp_Object *) v1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1700 Lisp_Object font2 = *(Lisp_Object *) v2; |
24995 | 1701 int i; |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
1702 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1703 for (i = 0; i < FONT_SIZE_INDEX; i++) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1704 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1705 enum font_property_index idx = font_props_for_sorting[i]; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1706 Lisp_Object val1 = AREF (font1, idx), val2 = AREF (font2, idx); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1707 int result; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1708 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1709 if (idx <= FONT_REGISTRY_INDEX) |
24995 | 1710 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1711 if (STRINGP (val1)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1712 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; |
24995 | 1713 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1714 result = STRINGP (val2) ? 1 : 0; |
24995 | 1715 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
1716 else |
24995 | 1717 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1718 if (INTEGERP (val1)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1719 result = INTEGERP (val2) ? XINT (val1) - XINT (val2) : -1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1720 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1721 result = INTEGERP (val2) ? 1 : 0; |
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
1722 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1723 if (result) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1724 return result; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1725 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1726 return 0; |
24995 | 1727 } |
1728 | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
1729 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
|
1730 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
|
1731 If FAMILY is omitted or nil, list all families. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1732 Otherwise, FAMILY must be a string, possibly containing wildcards |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1733 `?' and `*'. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1734 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
|
1735 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
|
1736 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1737 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
|
1738 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
|
1739 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
|
1740 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
|
1741 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
|
1742 giving the registry and encoding of the font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1743 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
|
1744 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
|
1745 (family, frame) |
24995 | 1746 Lisp_Object family, frame; |
1747 { | |
106434
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1748 Lisp_Object font_spec, list, *drivers, vec; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1749 int i, nfonts, ndrivers; |
24995 | 1750 Lisp_Object result; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1751 |
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1752 if (NILP (frame)) |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1753 frame = selected_frame; |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1754 CHECK_LIVE_FRAME (frame); |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1755 |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1756 font_spec = Ffont_spec (0, NULL); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1757 if (!NILP (family)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1758 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1759 CHECK_STRING (family); |
95574
fa7d768bdd0b
(Fx_family_fonts): Use font_parse_family_registry instead of
Kenichi Handa <handa@m17n.org>
parents:
95567
diff
changeset
|
1760 font_parse_family_registry (family, Qnil, font_spec); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1761 } |
106434
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1762 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1763 list = font_list_entities (frame, font_spec); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1764 if (NILP (list)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1765 return Qnil; |
106434
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1766 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1767 /* Sort the font entities. */ |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1768 for (i = 0; i < 4; i++) |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1769 switch (font_sort_order[i]) |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1770 { |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1771 case XLFD_SWIDTH: |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1772 font_props_for_sorting[i] = FONT_WIDTH_INDEX; break; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1773 case XLFD_POINT_SIZE: |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1774 font_props_for_sorting[i] = FONT_SIZE_INDEX; break; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1775 case XLFD_WEIGHT: |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1776 font_props_for_sorting[i] = FONT_WEIGHT_INDEX; break; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1777 default: |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1778 font_props_for_sorting[i] = FONT_SLANT_INDEX; break; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1779 } |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1780 font_props_for_sorting[i++] = FONT_FAMILY_INDEX; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1781 font_props_for_sorting[i++] = FONT_FOUNDRY_INDEX; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1782 font_props_for_sorting[i++] = FONT_ADSTYLE_INDEX; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1783 font_props_for_sorting[i++] = FONT_REGISTRY_INDEX; |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1784 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1785 ndrivers = XINT (Flength (list)); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1786 drivers = alloca (sizeof (Lisp_Object) * ndrivers); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1787 for (i = 0; i < ndrivers; i++, list = XCDR (list)) |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1788 drivers[i] = XCAR (list); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1789 vec = Fvconcat (ndrivers, drivers); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1790 nfonts = ASIZE (vec); |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1791 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1792 qsort (XVECTOR (vec)->contents, nfonts, sizeof (Lisp_Object), |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1793 compare_fonts_by_sort_order); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1794 |
24995 | 1795 result = Qnil; |
1796 for (i = nfonts - 1; i >= 0; --i) | |
1797 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1798 Lisp_Object font = AREF (vec, i); |
25270 | 1799 Lisp_Object v = Fmake_vector (make_number (8), Qnil); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1800 int point; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1801 Lisp_Object spacing; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1802 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1803 ASET (v, 0, AREF (font, FONT_FAMILY_INDEX)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1804 ASET (v, 1, FONT_WIDTH_SYMBOLIC (font)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1805 point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10, |
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1806 XFRAME (frame)->resy); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1807 ASET (v, 2, make_number (point)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1808 ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1809 ASET (v, 4, FONT_SLANT_SYMBOLIC (font)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1810 spacing = Ffont_get (font, QCspacing); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1811 ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt); |
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1812 ASET (v, 6, Ffont_xlfd_name (font, Qnil)); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1813 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1814 |
24995 | 1815 result = Fcons (v, result); |
1816 } | |
1817 | |
1818 return result; | |
1819 } | |
1820 | |
1821 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
|
1822 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
|
1823 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
|
1824 the same size as FACE on FRAME. |
101292
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1825 |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1826 PATTERN should be a string containing a font name in the XLFD, |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1827 Fontconfig, or GTK format. A font name given in the XLFD format may |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1828 contain wildcard characters: |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1829 the * character matches any substring, and |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1830 the ? character matches any single character. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1831 PATTERN is case-insensitive. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1832 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1833 The return value is a list of strings, suitable as arguments to |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
1834 `set-face-font'. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1835 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1836 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
|
1837 even if they match PATTERN and FACE. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1838 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
|
1839 fonts to match. The first MAXIMUM fonts are reported. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1840 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
|
1841 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
|
1842 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
|
1843 (pattern, face, frame, maximum, width) |
24995 | 1844 Lisp_Object pattern, face, frame, maximum, width; |
1845 { | |
1846 struct frame *f; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1847 int size, avgwidth; |
24995 | 1848 |
1849 check_x (); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1850 CHECK_STRING (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1851 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1852 if (! NILP (maximum)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1853 CHECK_NATNUM (maximum); |
24995 | 1854 |
1855 if (!NILP (width)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1856 CHECK_NUMBER (width); |
24995 | 1857 |
1858 /* We can't simply call check_x_frame because this function may be | |
1859 called before any frame is created. */ | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1860 if (NILP (frame)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1861 frame = selected_frame; |
24995 | 1862 f = frame_or_selected_frame (frame, 2); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1863 if (! FRAME_WINDOW_P (f)) |
24995 | 1864 { |
1865 /* Perhaps we have not yet created any frame. */ | |
1866 f = NULL; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1867 frame = Qnil; |
24995 | 1868 face = Qnil; |
1869 } | |
1870 | |
1871 /* Determine the width standard for comparison with the fonts we find. */ | |
1872 | |
1873 if (NILP (face)) | |
1874 size = 0; | |
1875 else | |
1876 { | |
1877 /* This is of limited utility since it works with character | |
1878 widths. Keep it for compatibility. --gerd. */ | |
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
1879 int face_id = lookup_named_face (f, face, 0); |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1880 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
|
1881 ? NULL |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1882 : 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
|
1883 |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1884 if (face && face->font) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1885 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1886 size = face->font->pixel_size; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1887 avgwidth = face->font->average_width; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1888 } |
24995 | 1889 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1890 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1891 size = FRAME_FONT (f)->pixel_size; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1892 avgwidth = FRAME_FONT (f)->average_width; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1893 } |
24995 | 1894 if (!NILP (width)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1895 avgwidth *= XINT (width); |
24995 | 1896 } |
1897 | |
1898 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1899 Lisp_Object font_spec; |
95373
4ab9c6d31251
(Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents:
95294
diff
changeset
|
1900 Lisp_Object args[2], tail; |
24995 | 1901 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1902 font_spec = font_spec_from_name (pattern); |
101292
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1903 if (!FONTP (font_spec)) |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1904 signal_error ("Invalid font name", pattern); |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
1905 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1906 if (size) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1907 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1908 Ffont_put (font_spec, QCsize, make_number (size)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1909 Ffont_put (font_spec, QCavgwidth, make_number (avgwidth)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1910 } |
96263
9775da34ea47
(Fx_list_fonts): Call Flist_fonts with the arg PREFER.
Kenichi Handa <handa@m17n.org>
parents:
96027
diff
changeset
|
1911 args[0] = Flist_fonts (font_spec, frame, maximum, font_spec); |
95373
4ab9c6d31251
(Fx_list_fonts): Make it return a list of font names.
Kenichi Handa <handa@m17n.org>
parents:
95294
diff
changeset
|
1912 for (tail = args[0]; CONSP (tail); tail = XCDR (tail)) |
103054
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1913 { |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1914 Lisp_Object font_entity; |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1915 |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1916 font_entity = XCAR (tail); |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1917 if ((NILP (AREF (font_entity, FONT_SIZE_INDEX)) |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1918 || XINT (AREF (font_entity, FONT_SIZE_INDEX)) == 0) |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1919 && ! NILP (AREF (font_spec, FONT_SIZE_INDEX))) |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1920 { |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1921 /* This is a scalable font. For backward compatibility, |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1922 we set the specified size. */ |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1923 font_entity = Fcopy_font_spec (font_entity); |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1924 ASET (font_entity, FONT_SIZE_INDEX, |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1925 AREF (font_spec, FONT_SIZE_INDEX)); |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1926 } |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1927 XSETCAR (tail, Ffont_xlfd_name (font_entity, Qnil)); |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1928 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1929 if (NILP (frame)) |
24995 | 1930 /* We don't have to check fontsets. */ |
1931 return args[0]; | |
1932 args[1] = list_fontsets (f, pattern, size); | |
1933 return Fnconc (2, args); | |
1934 } | |
1935 } | |
1936 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1937 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1938 |
1939 | |
1940 /*********************************************************************** | |
1941 Lisp Faces | |
1942 ***********************************************************************/ | |
1943 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1944 /* 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
|
1945 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1946 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1947 #define LFACE_FOUNDRY(LFACE) AREF ((LFACE), LFACE_FOUNDRY_INDEX) |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1948 #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
|
1949 #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
|
1950 #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
|
1951 #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
|
1952 #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
|
1953 #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
|
1954 #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
|
1955 #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
|
1956 #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
|
1957 #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
|
1958 #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
|
1959 #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
|
1960 #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
|
1961 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1962 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) |
24995 | 1963 |
1964 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
1965 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
1966 | |
1967 #define LFACEP(LFACE) \ | |
1968 (VECTORP (LFACE) \ | |
1969 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1970 && EQ (AREF (LFACE, 0), Qface)) |
24995 | 1971 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1972 |
24995 | 1973 #if GLYPH_DEBUG |
1974 | |
1975 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
1976 | |
1977 static void | |
1978 check_lface_attrs (attrs) | |
1979 Lisp_Object *attrs; | |
1980 { | |
1981 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1982 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX]) |
24995 | 1983 || STRINGP (attrs[LFACE_FAMILY_INDEX])); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1984 xassert (UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1985 || IGNORE_DEFFACE_P (attrs[LFACE_FOUNDRY_INDEX]) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1986 || STRINGP (attrs[LFACE_FOUNDRY_INDEX])); |
24995 | 1987 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1988 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX]) |
24995 | 1989 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); |
1990 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1991 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) |
31178 | 1992 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
1993 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
1994 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
24995 | 1995 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1996 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |
24995 | 1997 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); |
1998 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1999 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX]) |
24995 | 2000 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); |
2001 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2002 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX]) |
24995 | 2003 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) |
2004 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
2005 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2006 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX]) |
24995 | 2007 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) |
2008 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
2009 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2010 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
24995 | 2011 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
2012 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
2013 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2014 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX]) |
24995 | 2015 || SYMBOLP (attrs[LFACE_BOX_INDEX]) |
2016 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
2017 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
2018 || CONSP (attrs[LFACE_BOX_INDEX])); | |
2019 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2020 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX]) |
24995 | 2021 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); |
2022 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2023 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) |
24995 | 2024 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); |
2025 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2026 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) |
24995 | 2027 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); |
31178 | 2028 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2029 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX]) |
31178 | 2030 || NILP (attrs[LFACE_INHERIT_INDEX]) |
2031 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
2032 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
24995 | 2033 #ifdef HAVE_WINDOW_SYSTEM |
2034 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2035 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX]) |
24995 | 2036 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2037 || !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
|
2038 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2039 || IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX]) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2040 || FONTP (attrs[LFACE_FONT_INDEX])); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2041 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
2042 || STRINGP (attrs[LFACE_FONTSET_INDEX])); |
24995 | 2043 #endif |
2044 } | |
2045 | |
2046 | |
2047 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
2048 | |
2049 static void | |
2050 check_lface (lface) | |
2051 Lisp_Object lface; | |
2052 { | |
2053 if (!NILP (lface)) | |
2054 { | |
2055 xassert (LFACEP (lface)); | |
2056 check_lface_attrs (XVECTOR (lface)->contents); | |
2057 } | |
2058 } | |
2059 | |
2060 #else /* GLYPH_DEBUG == 0 */ | |
2061 | |
2062 #define check_lface_attrs(attrs) (void) 0 | |
2063 #define check_lface(lface) (void) 0 | |
2064 | |
2065 #endif /* GLYPH_DEBUG == 0 */ | |
2066 | |
2067 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2068 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2069 /* 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
|
2070 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2071 enum named_merge_point_kind |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2072 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2073 NAMED_MERGE_POINT_NORMAL, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2074 NAMED_MERGE_POINT_REMAP |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2075 }; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2076 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2077 /* 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
|
2078 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
|
2079 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
|
2080 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
|
2081 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
|
2082 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
|
2083 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
|
2084 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2085 Lisp_Object face_name; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2086 enum named_merge_point_kind named_merge_point_kind; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2087 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
|
2088 }; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2089 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2090 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2091 /* 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
|
2092 otherwise add NEW_NAMED_MERGE_POINT, which is initialized using |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2093 FACE_NAME and NAMED_MERGE_POINT_KIND, as the head of the linked list |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2094 pointed to by 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
|
2095 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2096 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
|
2097 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
|
2098 Lisp_Object face_name, |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2099 enum named_merge_point_kind named_merge_point_kind, |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2100 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
|
2101 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2102 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
|
2103 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2104 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
|
2105 if (EQ (face_name, prev->face_name)) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2106 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2107 if (prev->named_merge_point_kind == named_merge_point_kind) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2108 /* A cycle, so fail. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2109 return 0; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2110 else if (prev->named_merge_point_kind == NAMED_MERGE_POINT_REMAP) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2111 /* A remap `hides ' any previous normal merge points |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2112 (because the remap means that it's actually different face), |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2113 so as we know the current merge point must be normal, we |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2114 can just assume it's OK. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2115 break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2116 } |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2117 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2118 new_named_merge_point->face_name = face_name; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2119 new_named_merge_point->named_merge_point_kind = named_merge_point_kind; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2120 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
|
2121 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2122 *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
|
2123 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2124 return 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2125 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2126 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2127 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2128 |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2129 #if 0 /* Seems to be unused. */ |
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2130 static Lisp_Object |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2131 internal_resolve_face_name (nargs, args) |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2132 int nargs; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2133 Lisp_Object *args; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2134 { |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2135 return Fget (args[0], args[1]); |
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2136 } |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2137 |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2138 static Lisp_Object |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2139 resolve_face_name_error (ignore) |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2140 Lisp_Object ignore; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2141 { |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2142 return Qnil; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2143 } |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2144 #endif |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2145 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2146 /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2147 to make it a symbol. If FACE_NAME is an alias for another face, |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2148 return that face's name. |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2149 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2150 Return default face in case of errors. */ |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2151 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2152 static Lisp_Object |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2153 resolve_face_name (face_name, signal_p) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2154 Lisp_Object face_name; |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2155 int signal_p; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2156 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2157 Lisp_Object orig_face; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2158 Lisp_Object tortoise, hare; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2159 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2160 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
|
2161 face_name = intern (SDATA (face_name)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2162 |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2163 if (NILP (face_name) || !SYMBOLP (face_name)) |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2164 return face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2165 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2166 orig_face = face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2167 tortoise = hare = face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2168 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2169 while (1) |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2170 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2171 face_name = hare; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2172 hare = Fget (hare, Qface_alias); |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2173 if (NILP (hare) || !SYMBOLP (hare)) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2174 break; |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2175 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2176 face_name = hare; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2177 hare = Fget (hare, Qface_alias); |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2178 if (NILP (hare) || !SYMBOLP (hare)) |
61647
a39c60b30e5a
(resolve_face_name): Use Fsafe_get to avoid redisplay
Kim F. Storm <storm@cua.dk>
parents:
61628
diff
changeset
|
2179 break; |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2180 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2181 tortoise = Fget (tortoise, Qface_alias); |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2182 if (EQ (hare, tortoise)) |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2183 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2184 if (signal_p) |
71992
760807463226
* xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents:
71845
diff
changeset
|
2185 xsignal1 (Qcircular_list, orig_face); |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2186 return Qdefault; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2187 } |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2188 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2189 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2190 return face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2191 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2192 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2193 |
24995 | 2194 /* 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
|
2195 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
|
2196 a symbol (apparently Emacs 20.2 allowed strings as face names in |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2197 face text properties; Ediff uses that). If SIGNAL_P is non-zero, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2198 signal an error if FACE_NAME is not a valid face name. If SIGNAL_P |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2199 is zero, value is nil if FACE_NAME is not a valid face name. */ |
24995 | 2200 static INLINE Lisp_Object |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2201 lface_from_face_name_no_resolve (f, face_name, signal_p) |
24995 | 2202 struct frame *f; |
2203 Lisp_Object face_name; | |
2204 int signal_p; | |
2205 { | |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2206 Lisp_Object lface; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2207 |
24995 | 2208 if (f) |
2209 lface = assq_no_quit (face_name, f->face_alist); | |
2210 else | |
2211 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
2212 | |
2213 if (CONSP (lface)) | |
2214 lface = XCDR (lface); | |
2215 else if (signal_p) | |
2216 signal_error ("Invalid face", face_name); | |
2217 | |
2218 check_lface (lface); | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2219 |
24995 | 2220 return lface; |
2221 } | |
2222 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2223 /* Return the face definition of FACE_NAME on frame F. F null means |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2224 return the definition for new frames. FACE_NAME may be a string or |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2225 a symbol (apparently Emacs 20.2 allowed strings as face names in |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2226 face text properties; Ediff uses that). If FACE_NAME is an alias |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2227 for another face, return that face's definition. If SIGNAL_P is |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2228 non-zero, signal an error if FACE_NAME is not a valid face name. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2229 If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2230 name. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2231 static INLINE Lisp_Object |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2232 lface_from_face_name (f, face_name, signal_p) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2233 struct frame *f; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2234 Lisp_Object face_name; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2235 int signal_p; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2236 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2237 face_name = resolve_face_name (face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2238 return lface_from_face_name_no_resolve (f, face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2239 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2240 |
24995 | 2241 |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2242 /* Get face attributes of face FACE_NAME from frame-local faces on |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2243 frame F. Store the resulting attributes in ATTRS which must point |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2244 to a vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If SIGNAL_P |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2245 is non-zero, signal an error if FACE_NAME does not name a face. |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2246 Otherwise, value is zero if FACE_NAME is not a face. */ |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2247 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2248 static INLINE int |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2249 get_lface_attributes_no_remap (f, face_name, attrs, signal_p) |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2250 struct frame *f; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2251 Lisp_Object face_name; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2252 Lisp_Object *attrs; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2253 int signal_p; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2254 { |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2255 Lisp_Object lface; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2256 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2257 lface = lface_from_face_name_no_resolve (f, face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2258 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2259 if (! NILP (lface)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2260 bcopy (XVECTOR (lface)->contents, attrs, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2261 LFACE_VECTOR_SIZE * sizeof *attrs); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2262 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2263 return !NILP (lface); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2264 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2265 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2266 /* Get face attributes of face FACE_NAME from frame-local faces on frame |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2267 F. Store the resulting attributes in ATTRS which must point to a |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2268 vector of Lisp_Objects of size LFACE_VECTOR_SIZE. If FACE_NAME is an |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2269 alias for another face, use that face's definition. If SIGNAL_P is |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2270 non-zero, signal an error if FACE_NAME does not name a face. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2271 Otherwise, value is zero if FACE_NAME is not a face. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2272 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2273 static INLINE int |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2274 get_lface_attributes (f, face_name, attrs, signal_p, named_merge_points) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2275 struct frame *f; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2276 Lisp_Object face_name; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2277 Lisp_Object *attrs; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2278 int signal_p; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2279 struct named_merge_point *named_merge_points; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2280 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2281 Lisp_Object face_remapping; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2282 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2283 face_name = resolve_face_name (face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2284 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2285 /* See if SYMBOL has been remapped to some other face (usually this |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2286 is done buffer-locally). */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2287 face_remapping = assq_no_quit (face_name, Vface_remapping_alist); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2288 if (CONSP (face_remapping)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2289 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2290 struct named_merge_point named_merge_point; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2291 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2292 if (push_named_merge_point (&named_merge_point, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2293 face_name, NAMED_MERGE_POINT_REMAP, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2294 &named_merge_points)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2295 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2296 int i; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2297 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2298 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2299 attrs[i] = Qunspecified; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2300 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2301 return merge_face_ref (f, XCDR (face_remapping), attrs, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2302 signal_p, named_merge_points); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2303 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2304 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2305 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2306 /* Default case, no remapping. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2307 return get_lface_attributes_no_remap (f, face_name, attrs, signal_p); |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2308 } |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2309 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2310 |
24995 | 2311 /* Non-zero if all attributes in face attribute vector ATTRS are |
2312 specified, i.e. are non-nil. */ | |
2313 | |
2314 static int | |
2315 lface_fully_specified_p (attrs) | |
2316 Lisp_Object *attrs; | |
2317 { | |
2318 int i; | |
2319 | |
2320 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2321 if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
2322 if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i]))) |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
2323 break; |
24995 | 2324 |
2325 return i == LFACE_VECTOR_SIZE; | |
2326 } | |
2327 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2328 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 2329 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2330 /* Set font-related attributes of Lisp face LFACE from FONT-OBJECT. |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2331 If FORCE_P is zero, set only unspecified attributes of LFACE. The |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2332 exception is `font' attribute. It is set to FONT_OBJECT regardless |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2333 of FORCE_P. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2334 |
24995 | 2335 static int |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2336 set_lface_from_font (f, lface, font_object, force_p) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2337 struct frame *f; |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2338 Lisp_Object lface, font_object; |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2339 int force_p; |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2340 { |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2341 Lisp_Object val; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2342 struct font *font = XFONT_OBJECT (font_object); |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2343 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2344 /* Set attributes only if unspecified, otherwise face defaults for |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2345 new frames would never take effect. If the font doesn't have a |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2346 specific property, set a normal value for that. */ |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2347 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2348 if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface))) |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2349 { |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2350 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2351 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2352 LFACE_FAMILY (lface) = SYMBOL_NAME (family); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2353 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2354 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2355 if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface))) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2356 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2357 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2358 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2359 LFACE_FOUNDRY (lface) = SYMBOL_NAME (foundry); |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2360 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2361 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2362 if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface))) |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2363 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2364 int pt = PIXEL_TO_POINT (font->pixel_size * 10, f->resy); |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2365 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2366 xassert (pt > 0); |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2367 LFACE_HEIGHT (lface) = make_number (pt); |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2368 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2369 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2370 if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface))) |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2371 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2372 val = FONT_WEIGHT_FOR_FACE (font_object); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2373 LFACE_WEIGHT (lface) = ! NILP (val) ? val :Qnormal; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2374 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2375 if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface))) |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2376 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2377 val = FONT_SLANT_FOR_FACE (font_object); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2378 LFACE_SLANT (lface) = ! NILP (val) ? val : Qnormal; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2379 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2380 if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface))) |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2381 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2382 val = FONT_WIDTH_FOR_FACE (font_object); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2383 LFACE_SWIDTH (lface) = ! NILP (val) ? val : Qnormal; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2384 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2385 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2386 LFACE_FONT (lface) = font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2387 return 1; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2388 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2389 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2390 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 2391 |
2392 | |
31178 | 2393 /* Merges the face height FROM with the face height TO, and returns the |
2394 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
|
2395 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
|
2396 `relative' heights; the returned value is always an absolute height |
100817
9ea6227529f4
Remove obsolete comment.
Chong Yidong <cyd@stupidchicken.com>
parents:
100816
diff
changeset
|
2397 unless both FROM and TO are relative. */ |
31178 | 2398 |
2399 Lisp_Object | |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2400 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
|
2401 Lisp_Object from, to, invalid; |
31178 | 2402 { |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2403 Lisp_Object result = invalid; |
31178 | 2404 |
2405 if (INTEGERP (from)) | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2406 /* 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
|
2407 result = from; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2408 else if (FLOATP (from)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2409 /* 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
|
2410 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2411 if (INTEGERP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2412 /* relative X absolute => absolute */ |
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
2413 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
|
2414 else if (FLOATP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2415 /* relative X relative => relative */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2416 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
|
2417 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
|
2418 result = from; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2419 } |
31178 | 2420 else if (FUNCTIONP (from)) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2421 /* FROM is a function, which use to adjust TO. */ |
31178 | 2422 { |
2423 /* Call function with current height as argument. | |
2424 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
|
2425 Lisp_Object args[2]; |
31178 | 2426 |
2427 args[0] = from; | |
2428 args[1] = to; | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2429 result = safe_call (2, args); |
31178 | 2430 |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2431 /* 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
|
2432 if (INTEGERP (to) && !INTEGERP (result)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2433 result = invalid; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2434 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2435 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2436 return result; |
31178 | 2437 } |
2438 | |
2439 | |
2440 /* 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
|
2441 store the resulting attributes in TO, which must be already be |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2442 completely specified and contain only absolute attributes. Every |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2443 specified attribute of FROM overrides the corresponding attribute of |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2444 TO; relative attributes in FROM are merged with the absolute value in |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2445 TO and replace it. NAMED_MERGE_POINTS is used internally to detect |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2446 loops in face inheritance/remapping; it should be 0 when called from |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2447 other places. */ |
24995 | 2448 |
2449 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
|
2450 merge_face_vectors (f, from, to, named_merge_points) |
31178 | 2451 struct frame *f; |
24995 | 2452 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
|
2453 struct named_merge_point *named_merge_points; |
24995 | 2454 { |
2455 int i; | |
31178 | 2456 |
2457 /* If FROM inherits from some other faces, merge their attributes into | |
2458 TO before merging FROM's direct attributes. Note that an :inherit | |
2459 attribute of `unspecified' is the same as one of nil; we never | |
2460 merge :inherit attributes, so nil is more correct, but lots of | |
2461 other code uses `unspecified' as a generic value for face attributes. */ | |
2462 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
2463 && !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
|
2464 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
31178 | 2465 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2466 i = LFACE_FONT_INDEX; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2467 if (!UNSPECIFIEDP (from[i])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2468 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2469 if (!UNSPECIFIEDP (to[i])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2470 to[i] = Fmerge_font_spec (from[i], to[i]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2471 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2472 to[i] = Fcopy_font_spec (from[i]); |
102989
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2473 if (! NILP (AREF (to[i], FONT_FOUNDRY_INDEX))) |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2474 to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FOUNDRY_INDEX)); |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2475 if (! NILP (AREF (to[i], FONT_FAMILY_INDEX))) |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2476 to[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FAMILY_INDEX)); |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2477 if (! NILP (AREF (to[i], FONT_WEIGHT_INDEX))) |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2478 to[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (to[i]); |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2479 if (! NILP (AREF (to[i], FONT_SLANT_INDEX))) |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2480 to[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (to[i]); |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2481 if (! NILP (AREF (to[i], FONT_WIDTH_INDEX))) |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2482 to[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (to[i]); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2483 ASET (to[i], FONT_SIZE_INDEX, Qnil); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2484 } |
31221 | 2485 |
24995 | 2486 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
2487 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
|
2488 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2489 if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i])) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2490 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2491 to[i] = merge_face_heights (from[i], to[i], to[i]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2492 font_clear_prop (to, FONT_SIZE_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2493 } |
102989
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2494 else if (i != LFACE_FONT_INDEX |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2495 && ! EQ (to[i], from[i])) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2496 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2497 to[i] = from[i]; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2498 if (i >= LFACE_FAMILY_INDEX && i <=LFACE_SLANT_INDEX) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2499 font_clear_prop (to, |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2500 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2501 : i == LFACE_FOUNDRY_INDEX ? FONT_FOUNDRY_INDEX |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2502 : i == LFACE_SWIDTH_INDEX ? FONT_WIDTH_INDEX |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2503 : i == LFACE_HEIGHT_INDEX ? FONT_SIZE_INDEX |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2504 : i == LFACE_WEIGHT_INDEX ? FONT_WEIGHT_INDEX |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2505 : FONT_SLANT_INDEX)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2506 } |
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2507 } |
31178 | 2508 |
2509 /* TO is always an absolute face, which should inherit from nothing. | |
2510 We blindly copy the :inherit attribute above and fix it up here. */ | |
2511 to[LFACE_INHERIT_INDEX] = Qnil; | |
2512 } | |
2513 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2514 /* 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
|
2515 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
|
2516 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
|
2517 merging succeeded. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2518 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2519 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2520 merge_named_face (f, face_name, to, named_merge_points) |
31178 | 2521 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
|
2522 Lisp_Object face_name; |
31178 | 2523 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
|
2524 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
|
2525 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2526 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
|
2527 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2528 if (push_named_merge_point (&named_merge_point, |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2529 face_name, NAMED_MERGE_POINT_NORMAL, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2530 &named_merge_points)) |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2531 { |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2532 struct gcpro gcpro1; |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2533 Lisp_Object from[LFACE_VECTOR_SIZE]; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2534 int ok = get_lface_attributes (f, face_name, from, 0, named_merge_points); |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2535 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2536 if (ok) |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2537 { |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2538 GCPRO1 (named_merge_point.face_name); |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2539 merge_face_vectors (f, from, to, named_merge_points); |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2540 UNGCPRO; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2541 } |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2542 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2543 return ok; |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2544 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2545 else |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2546 return 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2547 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2548 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2549 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2550 /* 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
|
2551 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
|
2552 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
|
2553 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
|
2554 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
|
2555 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
|
2556 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2557 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
|
2558 specifications. Each face specification can be: |
24995 | 2559 |
2560 1. A symbol or string naming a Lisp face. | |
2561 | |
2562 2. A property list of the form (KEYWORD VALUE ...) where each | |
2563 KEYWORD is a face attribute name, and value is an appropriate value | |
2564 for that attribute. | |
2565 | |
2566 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
2567 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
2568 for compatibility with 20.2. | |
2569 | |
2570 Face specifications earlier in lists take precedence over later | |
2571 specifications. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2572 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2573 static int |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2574 merge_face_ref (f, face_ref, to, err_msgs, named_merge_points) |
24995 | 2575 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
|
2576 Lisp_Object face_ref; |
24995 | 2577 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
|
2578 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
|
2579 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
|
2580 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2581 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
|
2582 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2583 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
|
2584 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2585 Lisp_Object first = XCAR (face_ref); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2586 |
24995 | 2587 if (EQ (first, Qforeground_color) |
2588 || EQ (first, Qbackground_color)) | |
2589 { | |
2590 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
2591 . 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
|
2592 Lisp_Object color_name = XCDR (face_ref); |
24995 | 2593 Lisp_Object color = first; |
2594 | |
2595 if (STRINGP (color_name)) | |
2596 { | |
2597 if (EQ (color, Qforeground_color)) | |
2598 to[LFACE_FOREGROUND_INDEX] = color_name; | |
2599 else | |
2600 to[LFACE_BACKGROUND_INDEX] = color_name; | |
2601 } | |
2602 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2603 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2604 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
|
2605 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
|
2606 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2607 } |
24995 | 2608 } |
2609 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
|
2610 && *SDATA (SYMBOL_NAME (first)) == ':') |
24995 | 2611 { |
2612 /* 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
|
2613 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
24995 | 2614 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2615 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
|
2616 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
|
2617 int err = 0; |
24995 | 2618 |
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2619 /* 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
|
2620 if (EQ (value, Qunspecified)) |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2621 ; |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2622 else if (EQ (keyword, QCfamily)) |
24995 | 2623 { |
2624 if (STRINGP (value)) | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2625 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2626 to[LFACE_FAMILY_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2627 font_clear_prop (to, FONT_FAMILY_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2628 } |
24995 | 2629 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2630 err = 1; |
24995 | 2631 } |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2632 else if (EQ (keyword, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2633 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2634 if (STRINGP (value)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2635 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2636 to[LFACE_FOUNDRY_INDEX] = value; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2637 font_clear_prop (to, FONT_FOUNDRY_INDEX); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2638 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2639 else |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2640 err = 1; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2641 } |
24995 | 2642 else if (EQ (keyword, QCheight)) |
2643 { | |
31178 | 2644 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
|
2645 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
31178 | 2646 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2647 if (! NILP (new_height)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2648 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2649 to[LFACE_HEIGHT_INDEX] = new_height; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2650 font_clear_prop (to, FONT_SIZE_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2651 } |
24995 | 2652 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2653 err = 1; |
24995 | 2654 } |
2655 else if (EQ (keyword, QCweight)) | |
2656 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2657 if (SYMBOLP (value) && FONT_WEIGHT_NAME_NUMERIC (value) >= 0) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2658 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2659 to[LFACE_WEIGHT_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2660 font_clear_prop (to, FONT_WEIGHT_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2661 } |
24995 | 2662 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2663 err = 1; |
24995 | 2664 } |
2665 else if (EQ (keyword, QCslant)) | |
2666 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2667 if (SYMBOLP (value) && FONT_SLANT_NAME_NUMERIC (value) >= 0) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2668 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2669 to[LFACE_SLANT_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2670 font_clear_prop (to, FONT_SLANT_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2671 } |
24995 | 2672 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2673 err = 1; |
24995 | 2674 } |
2675 else if (EQ (keyword, QCunderline)) | |
2676 { | |
2677 if (EQ (value, Qt) | |
2678 || NILP (value) | |
2679 || STRINGP (value)) | |
2680 to[LFACE_UNDERLINE_INDEX] = value; | |
2681 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2682 err = 1; |
24995 | 2683 } |
2684 else if (EQ (keyword, QCoverline)) | |
2685 { | |
2686 if (EQ (value, Qt) | |
2687 || NILP (value) | |
2688 || STRINGP (value)) | |
2689 to[LFACE_OVERLINE_INDEX] = value; | |
2690 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2691 err = 1; |
24995 | 2692 } |
2693 else if (EQ (keyword, QCstrike_through)) | |
2694 { | |
2695 if (EQ (value, Qt) | |
2696 || NILP (value) | |
2697 || STRINGP (value)) | |
2698 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
2699 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2700 err = 1; |
24995 | 2701 } |
2702 else if (EQ (keyword, QCbox)) | |
2703 { | |
2704 if (EQ (value, Qt)) | |
2705 value = make_number (1); | |
2706 if (INTEGERP (value) | |
2707 || STRINGP (value) | |
2708 || CONSP (value) | |
2709 || NILP (value)) | |
2710 to[LFACE_BOX_INDEX] = value; | |
2711 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2712 err = 1; |
24995 | 2713 } |
2714 else if (EQ (keyword, QCinverse_video) | |
2715 || EQ (keyword, QCreverse_video)) | |
2716 { | |
2717 if (EQ (value, Qt) || NILP (value)) | |
2718 to[LFACE_INVERSE_INDEX] = value; | |
2719 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2720 err = 1; |
24995 | 2721 } |
2722 else if (EQ (keyword, QCforeground)) | |
2723 { | |
2724 if (STRINGP (value)) | |
2725 to[LFACE_FOREGROUND_INDEX] = value; | |
2726 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2727 err = 1; |
24995 | 2728 } |
2729 else if (EQ (keyword, QCbackground)) | |
2730 { | |
2731 if (STRINGP (value)) | |
2732 to[LFACE_BACKGROUND_INDEX] = value; | |
2733 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2734 err = 1; |
24995 | 2735 } |
2736 else if (EQ (keyword, QCstipple)) | |
2737 { | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
2738 #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
2739 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
24995 | 2740 if (!NILP (pixmap_p)) |
2741 to[LFACE_STIPPLE_INDEX] = value; | |
2742 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2743 err = 1; |
24995 | 2744 #endif |
2745 } | |
2746 else if (EQ (keyword, QCwidth)) | |
2747 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2748 if (SYMBOLP (value) && FONT_WIDTH_NAME_NUMERIC (value) >= 0) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2749 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2750 to[LFACE_SWIDTH_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2751 font_clear_prop (to, FONT_WIDTH_INDEX); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2752 } |
24995 | 2753 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2754 err = 1; |
24995 | 2755 } |
31178 | 2756 else if (EQ (keyword, QCinherit)) |
2757 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2758 /* 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
|
2759 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
|
2760 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
|
2761 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
|
2762 err = 1; |
31178 | 2763 } |
24995 | 2764 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2765 err = 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2766 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2767 if (err) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2768 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2769 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
|
2770 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2771 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2772 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2773 face_ref = XCDR (XCDR (face_ref)); |
24995 | 2774 } |
2775 } | |
2776 else | |
2777 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2778 /* 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
|
2779 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
|
2780 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
|
2781 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
|
2782 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2783 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
|
2784 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
|
2785 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2786 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
|
2787 ok = 0; |
24995 | 2788 } |
2789 } | |
2790 else | |
2791 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2792 /* 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
|
2793 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
|
2794 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
|
2795 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
|
2796 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2797 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2798 return ok; |
24995 | 2799 } |
2800 | |
2801 | |
2802 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
2803 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
|
2804 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
|
2805 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
|
2806 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
|
2807 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
|
2808 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
|
2809 (face, frame) |
24995 | 2810 Lisp_Object face, frame; |
2811 { | |
2812 Lisp_Object global_lface, lface; | |
2813 struct frame *f; | |
2814 int i; | |
2815 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2816 CHECK_SYMBOL (face); |
24995 | 2817 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
|
2818 |
24995 | 2819 if (!NILP (frame)) |
2820 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2821 CHECK_LIVE_FRAME (frame); |
24995 | 2822 f = XFRAME (frame); |
2823 lface = lface_from_face_name (f, face, 0); | |
2824 } | |
2825 else | |
2826 f = NULL, lface = Qnil; | |
2827 | |
2828 /* Add a global definition if there is none. */ | |
2829 if (NILP (global_lface)) | |
2830 { | |
2831 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
2832 Qunspecified); | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2833 ASET (global_lface, 0, Qface); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2834 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
24995 | 2835 Vface_new_frame_defaults); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2836 |
24995 | 2837 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
2838 face id to Lisp face is given by the vector lface_id_to_name. | |
2839 The mapping from Lisp face to Lisp face id is given by the | |
2840 property `face' of the Lisp face name. */ | |
2841 if (next_lface_id == lface_id_to_name_size) | |
2842 { | |
2843 int new_size = max (50, 2 * lface_id_to_name_size); | |
2844 int sz = new_size * sizeof *lface_id_to_name; | |
2845 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
2846 lface_id_to_name_size = new_size; | |
2847 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2848 |
24995 | 2849 lface_id_to_name[next_lface_id] = face; |
2850 Fput (face, Qface, make_number (next_lface_id)); | |
2851 ++next_lface_id; | |
2852 } | |
2853 else if (f == NULL) | |
2854 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2855 ASET (global_lface, i, Qunspecified); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2856 |
24995 | 2857 /* Add a frame-local definition. */ |
2858 if (f) | |
2859 { | |
2860 if (NILP (lface)) | |
2861 { | |
2862 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
2863 Qunspecified); | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2864 ASET (lface, 0, Qface); |
24995 | 2865 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
2866 } | |
2867 else | |
2868 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2869 ASET (lface, i, Qunspecified); |
24995 | 2870 } |
2871 else | |
2872 lface = global_lface; | |
2873 | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2874 /* 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
|
2875 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
|
2876 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
|
2877 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
|
2878 init_iterator will then free realized faces. */ |
57107 | 2879 if (NILP (Fget (face, Qface_no_inherit))) |
2880 { | |
2881 ++face_change_count; | |
2882 ++windows_or_buffers_changed; | |
2883 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2884 |
24995 | 2885 xassert (LFACEP (lface)); |
2886 check_lface (lface); | |
2887 return lface; | |
2888 } | |
2889 | |
2890 | |
2891 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
2892 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
|
2893 doc: /* Return non-nil if FACE names a face. |
106436 | 2894 FACE should be a symbol or string. |
64578
91757d0e430d
(Finternal_lisp_face_p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64426
diff
changeset
|
2895 If optional second argument FRAME is non-nil, check for the |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2896 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
|
2897 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
|
2898 (face, frame) |
24995 | 2899 Lisp_Object face, frame; |
2900 { | |
2901 Lisp_Object lface; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2902 |
81146
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2903 face = resolve_face_name (face, 1); |
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2904 |
24995 | 2905 if (!NILP (frame)) |
2906 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2907 CHECK_LIVE_FRAME (frame); |
24995 | 2908 lface = lface_from_face_name (XFRAME (frame), face, 0); |
2909 } | |
2910 else | |
2911 lface = lface_from_face_name (NULL, face, 0); | |
2912 | |
2913 return lface; | |
2914 } | |
2915 | |
2916 | |
2917 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
2918 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
|
2919 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
|
2920 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
|
2921 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
|
2922 If NEW-FRAME is a frame, copy that data into the frame-local |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
2923 definition of TO on NEW-FRAME. If NEW-FRAME is nil, |
56176
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2924 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
|
2925 |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2926 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
|
2927 (from, to, frame, new_frame) |
24995 | 2928 Lisp_Object from, to, frame, new_frame; |
2929 { | |
2930 Lisp_Object lface, copy; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2931 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2932 CHECK_SYMBOL (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2933 CHECK_SYMBOL (to); |
24995 | 2934 |
2935 if (EQ (frame, Qt)) | |
2936 { | |
2937 /* Copy global definition of FROM. We don't make copies of | |
2938 strings etc. because 20.2 didn't do it either. */ | |
2939 lface = lface_from_face_name (NULL, from, 1); | |
2940 copy = Finternal_make_lisp_face (to, Qnil); | |
2941 } | |
2942 else | |
2943 { | |
2944 /* 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
|
2945 if (NILP (new_frame)) |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2946 new_frame = frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2947 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2948 CHECK_LIVE_FRAME (new_frame); |
24995 | 2949 lface = lface_from_face_name (XFRAME (frame), from, 1); |
2950 copy = Finternal_make_lisp_face (to, new_frame); | |
2951 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2952 |
24995 | 2953 bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents, |
2954 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2955 |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2956 /* 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
|
2957 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
|
2958 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
|
2959 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
|
2960 init_iterator will then free realized faces. */ |
57107 | 2961 if (NILP (Fget (to, Qface_no_inherit))) |
2962 { | |
2963 ++face_change_count; | |
2964 ++windows_or_buffers_changed; | |
2965 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2966 |
24995 | 2967 return to; |
2968 } | |
2969 | |
2970 | |
2971 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
2972 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
|
2973 doc: /* Set attribute ATTR of FACE to VALUE. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2974 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
|
2975 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
|
2976 FRAME t means change the default for new frames. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2977 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
|
2978 for new frames. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2979 (face, attr, value, frame) |
24995 | 2980 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
|
2981 { |
24995 | 2982 Lisp_Object lface; |
2983 Lisp_Object old_value = Qnil; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2984 /* Set one of enum font_property_index (> 0) if ATTR is one of |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2985 font-related attributes other than QCfont and QCfontset. */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2986 enum font_property_index prop_index = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2987 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2988 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2989 CHECK_SYMBOL (attr); |
24995 | 2990 |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2991 face = resolve_face_name (face, 1); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2992 |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2993 /* 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
|
2994 default for new frames. */ |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2995 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
|
2996 { |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2997 Lisp_Object tail; |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
2998 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
|
2999 FOR_EACH_FRAME (tail, frame) |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3000 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
|
3001 return face; |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3002 } |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
3003 |
24995 | 3004 /* Set lface to the Lisp attribute vector of FACE. */ |
3005 if (EQ (frame, Qt)) | |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3006 { |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3007 lface = lface_from_face_name (NULL, face, 1); |
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3008 |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3009 /* When updating face-new-frame-defaults, we put :ignore-defface |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3010 where the caller wants `unspecified'. This forces the frame |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3011 defaults to ignore the defface value. Otherwise, the defface |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3012 will take effect, which is generally not what is intended. |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3013 The value of that attribute will be inherited from some other |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3014 face during face merging. See internal_merge_in_global_face. */ |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3015 if (UNSPECIFIEDP (value)) |
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
3016 value = Qignore_defface; |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3017 } |
24995 | 3018 else |
3019 { | |
3020 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3021 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3022 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3023 CHECK_LIVE_FRAME (frame); |
24995 | 3024 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
|
3025 |
24995 | 3026 /* If a frame-local face doesn't exist yet, create one. */ |
3027 if (NILP (lface)) | |
3028 lface = Finternal_make_lisp_face (face, frame); | |
3029 } | |
3030 | |
3031 if (EQ (attr, QCfamily)) | |
3032 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3033 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3034 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3035 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
|
3036 if (SCHARS (value) == 0) |
24995 | 3037 signal_error ("Invalid face family", value); |
3038 } | |
3039 old_value = LFACE_FAMILY (lface); | |
3040 LFACE_FAMILY (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3041 prop_index = FONT_FAMILY_INDEX; |
24995 | 3042 } |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3043 else if (EQ (attr, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3044 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3045 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3046 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3047 CHECK_STRING (value); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3048 if (SCHARS (value) == 0) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3049 signal_error ("Invalid face foundry", value); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3050 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3051 old_value = LFACE_FOUNDRY (lface); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3052 LFACE_FOUNDRY (lface) = value; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3053 prop_index = FONT_FOUNDRY_INDEX; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3054 } |
24995 | 3055 else if (EQ (attr, QCheight)) |
3056 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3057 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3058 { |
100816
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3059 if (EQ (face, Qdefault)) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3060 { |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3061 /* The default face must have an absolute size. */ |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3062 if (!INTEGERP (value) || XINT (value) <= 0) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3063 signal_error ("Invalid default face height", value); |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3064 } |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3065 else |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3066 { |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3067 /* For non-default faces, do a test merge with a random |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3068 height to see if VALUE's ok. */ |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3069 Lisp_Object test = merge_face_heights (value, |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3070 make_number (10), |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3071 Qnil); |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3072 if (!INTEGERP (test) || XINT (test) <= 0) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3073 signal_error ("Invalid face height", value); |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
3074 } |
24995 | 3075 } |
31178 | 3076 |
24995 | 3077 old_value = LFACE_HEIGHT (lface); |
3078 LFACE_HEIGHT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3079 prop_index = FONT_SIZE_INDEX; |
24995 | 3080 } |
3081 else if (EQ (attr, QCweight)) | |
3082 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3083 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3084 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3085 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3086 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0) |
24995 | 3087 signal_error ("Invalid face weight", value); |
3088 } | |
3089 old_value = LFACE_WEIGHT (lface); | |
3090 LFACE_WEIGHT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3091 prop_index = FONT_WEIGHT_INDEX; |
24995 | 3092 } |
3093 else if (EQ (attr, QCslant)) | |
3094 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3095 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3096 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3097 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3098 if (FONT_SLANT_NAME_NUMERIC (value) < 0) |
24995 | 3099 signal_error ("Invalid face slant", value); |
3100 } | |
3101 old_value = LFACE_SLANT (lface); | |
3102 LFACE_SLANT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3103 prop_index = FONT_SLANT_INDEX; |
24995 | 3104 } |
3105 else if (EQ (attr, QCunderline)) | |
3106 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3107 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3108 if ((SYMBOLP (value) |
3109 && !EQ (value, Qt) | |
3110 && !EQ (value, Qnil)) | |
3111 /* Underline color. */ | |
3112 || (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
|
3113 && SCHARS (value) == 0)) |
24995 | 3114 signal_error ("Invalid face underline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3115 |
24995 | 3116 old_value = LFACE_UNDERLINE (lface); |
3117 LFACE_UNDERLINE (lface) = value; | |
3118 } | |
3119 else if (EQ (attr, QCoverline)) | |
3120 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3121 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3122 if ((SYMBOLP (value) |
3123 && !EQ (value, Qt) | |
3124 && !EQ (value, Qnil)) | |
3125 /* Overline color. */ | |
3126 || (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
|
3127 && SCHARS (value) == 0)) |
24995 | 3128 signal_error ("Invalid face overline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3129 |
24995 | 3130 old_value = LFACE_OVERLINE (lface); |
3131 LFACE_OVERLINE (lface) = value; | |
3132 } | |
3133 else if (EQ (attr, QCstrike_through)) | |
3134 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3135 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3136 if ((SYMBOLP (value) |
3137 && !EQ (value, Qt) | |
3138 && !EQ (value, Qnil)) | |
3139 /* Strike-through color. */ | |
3140 || (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
|
3141 && SCHARS (value) == 0)) |
24995 | 3142 signal_error ("Invalid face strike-through", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3143 |
24995 | 3144 old_value = LFACE_STRIKE_THROUGH (lface); |
3145 LFACE_STRIKE_THROUGH (lface) = value; | |
3146 } | |
3147 else if (EQ (attr, QCbox)) | |
3148 { | |
3149 int valid_p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3150 |
24995 | 3151 /* Allow t meaning a simple box of width 1 in foreground color |
3152 of the face. */ | |
3153 if (EQ (value, Qt)) | |
3154 value = make_number (1); | |
3155 | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3156 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value)) |
24995 | 3157 valid_p = 1; |
3158 else if (NILP (value)) | |
3159 valid_p = 1; | |
3160 else if (INTEGERP (value)) | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3161 valid_p = XINT (value) != 0; |
24995 | 3162 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
|
3163 valid_p = SCHARS (value) > 0; |
24995 | 3164 else if (CONSP (value)) |
3165 { | |
3166 Lisp_Object tem; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3167 |
24995 | 3168 tem = value; |
3169 while (CONSP (tem)) | |
3170 { | |
3171 Lisp_Object k, v; | |
3172 | |
3173 k = XCAR (tem); | |
3174 tem = XCDR (tem); | |
3175 if (!CONSP (tem)) | |
3176 break; | |
3177 v = XCAR (tem); | |
3178 tem = XCDR (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3179 |
24995 | 3180 if (EQ (k, QCline_width)) |
3181 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3182 if (!INTEGERP (v) || XINT (v) == 0) |
24995 | 3183 break; |
3184 } | |
3185 else if (EQ (k, QCcolor)) | |
3186 { | |
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
3187 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
24995 | 3188 break; |
3189 } | |
3190 else if (EQ (k, QCstyle)) | |
3191 { | |
3192 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
3193 break; | |
3194 } | |
3195 else | |
3196 break; | |
3197 } | |
3198 | |
3199 valid_p = NILP (tem); | |
3200 } | |
3201 else | |
3202 valid_p = 0; | |
3203 | |
3204 if (!valid_p) | |
3205 signal_error ("Invalid face box", value); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3206 |
24995 | 3207 old_value = LFACE_BOX (lface); |
3208 LFACE_BOX (lface) = value; | |
3209 } | |
3210 else if (EQ (attr, QCinverse_video) | |
3211 || EQ (attr, QCreverse_video)) | |
3212 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3213 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3214 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3215 CHECK_SYMBOL (value); |
24995 | 3216 if (!EQ (value, Qt) && !NILP (value)) |
3217 signal_error ("Invalid inverse-video face attribute value", value); | |
3218 } | |
3219 old_value = LFACE_INVERSE (lface); | |
3220 LFACE_INVERSE (lface) = value; | |
3221 } | |
3222 else if (EQ (attr, QCforeground)) | |
3223 { | |
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3224 /* Compatibility with 20.x. */ |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3225 if (NILP (value)) |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3226 value = Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3227 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3228 { |
3229 /* Don't check for valid color names here because it depends | |
3230 on the frame (display) whether the color will be valid | |
3231 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
|
3232 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
|
3233 if (SCHARS (value) == 0) |
24995 | 3234 signal_error ("Empty foreground color value", value); |
3235 } | |
3236 old_value = LFACE_FOREGROUND (lface); | |
3237 LFACE_FOREGROUND (lface) = value; | |
3238 } | |
3239 else if (EQ (attr, QCbackground)) | |
3240 { | |
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3241 /* Compatibility with 20.x. */ |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3242 if (NILP (value)) |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3243 value = Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3244 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3245 { |
3246 /* Don't check for valid color names here because it depends | |
3247 on the frame (display) whether the color will be valid | |
3248 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
|
3249 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
|
3250 if (SCHARS (value) == 0) |
24995 | 3251 signal_error ("Empty background color value", value); |
3252 } | |
3253 old_value = LFACE_BACKGROUND (lface); | |
3254 LFACE_BACKGROUND (lface) = value; | |
3255 } | |
3256 else if (EQ (attr, QCstipple)) | |
3257 { | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3258 #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3259 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
24995 | 3260 && !NILP (value) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3261 && NILP (Fbitmap_spec_p (value))) |
24995 | 3262 signal_error ("Invalid stipple attribute", value); |
3263 old_value = LFACE_STIPPLE (lface); | |
3264 LFACE_STIPPLE (lface) = value; | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3265 #endif /* HAVE_X_WINDOWS || HAVE_NS */ |
24995 | 3266 } |
3267 else if (EQ (attr, QCwidth)) | |
3268 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3269 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3270 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3271 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3272 if (FONT_WIDTH_NAME_NUMERIC (value) < 0) |
24995 | 3273 signal_error ("Invalid face width", value); |
3274 } | |
3275 old_value = LFACE_SWIDTH (lface); | |
3276 LFACE_SWIDTH (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3277 prop_index = FONT_WIDTH_INDEX; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3278 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3279 else if (EQ (attr, QCfont)) |
24995 | 3280 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3281 #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
|
3282 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
|
3283 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3284 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3285 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3286 FRAME_PTR f; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3287 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3288 old_value = LFACE_FONT (lface); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3289 if (! FONTP (value)) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3290 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3291 if (STRINGP (value)) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3292 { |
101292
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3293 Lisp_Object name = value; |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3294 int fontset = fs_query_fontset (name, 0); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3295 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3296 if (fontset >= 0) |
101292
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3297 name = fontset_ascii (fontset); |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3298 value = font_spec_from_name (name); |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3299 if (!FONTP (value)) |
ab308039742a
(Finternal_set_lisp_face_attribute, Fx_list_fonts): Check return value of font_spec_from_name.
Chong Yidong <cyd@stupidchicken.com>
parents:
101157
diff
changeset
|
3300 signal_error ("Invalid font name", name); |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3301 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3302 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3303 signal_error ("Invalid font or font-spec", value); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3304 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3305 if (EQ (frame, Qt)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3306 f = XFRAME (selected_frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3307 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3308 f = XFRAME (frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3309 if (! FONT_OBJECT_P (value)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3310 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3311 Lisp_Object *attrs = XVECTOR (lface)->contents; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3312 Lisp_Object font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3313 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3314 font_object = font_load_for_lface (f, attrs, value); |
91346
04866c5fd4b5
(Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]:
Kenichi Handa <handa@m17n.org>
parents:
91333
diff
changeset
|
3315 if (NILP (font_object)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3316 signal_error ("Font not available", value); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3317 value = font_object; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3318 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3319 set_lface_from_font (f, lface, value, 1); |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3320 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3321 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3322 LFACE_FONT (lface) = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3323 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3324 #endif /* HAVE_WINDOW_SYSTEM */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3325 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3326 else if (EQ (attr, QCfontset)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3327 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3328 #ifdef HAVE_WINDOW_SYSTEM |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3329 if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame))) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3330 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3331 Lisp_Object tmp; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3332 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3333 old_value = LFACE_FONTSET (lface); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3334 tmp = Fquery_fontset (value, Qnil); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3335 if (NILP (tmp)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3336 signal_error ("Invalid fontset name", value); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3337 LFACE_FONTSET (lface) = value = tmp; |
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
3338 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3339 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3340 } |
31178 | 3341 else if (EQ (attr, QCinherit)) |
3342 { | |
3343 Lisp_Object tail; | |
3344 if (SYMBOLP (value)) | |
3345 tail = Qnil; | |
3346 else | |
3347 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
3348 if (!SYMBOLP (XCAR (tail))) | |
3349 break; | |
3350 if (NILP (tail)) | |
3351 LFACE_INHERIT (lface) = value; | |
3352 else | |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3353 signal_error ("Invalid face inheritance", value); |
31178 | 3354 } |
24995 | 3355 else if (EQ (attr, QCbold)) |
3356 { | |
3357 old_value = LFACE_WEIGHT (lface); | |
3358 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3359 prop_index = FONT_WEIGHT_INDEX; |
24995 | 3360 } |
3361 else if (EQ (attr, QCitalic)) | |
3362 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3363 attr = QCslant; |
24995 | 3364 old_value = LFACE_SLANT (lface); |
3365 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3366 prop_index = FONT_SLANT_INDEX; |
24995 | 3367 } |
3368 else | |
3369 signal_error ("Invalid face attribute name", attr); | |
3370 | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3371 if (prop_index) |
98698
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3372 { |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3373 /* If a font-related attribute other than QCfont and QCfontset |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3374 is specified, and if the original QCfont attribute has a font |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3375 (font-spec or font-object), set the corresponding property in |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3376 the font to nil so that the font selector doesn't think that |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3377 the attribute is mandatory. Also, clear the average |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3378 width. */ |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3379 font_clear_prop (XVECTOR (lface)->contents, prop_index); |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3380 } |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3381 |
24995 | 3382 /* Changing a named face means that all realized faces depending on |
3383 that face are invalid. Since we cannot tell which realized faces | |
3384 depend on the face, make sure they are all removed. This is done | |
3385 by incrementing face_change_count. The next call to | |
3386 init_iterator will then free realized faces. */ | |
3387 if (!EQ (frame, Qt) | |
57107 | 3388 && NILP (Fget (face, Qface_no_inherit)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3389 && NILP (Fequal (old_value, value))) |
24995 | 3390 { |
3391 ++face_change_count; | |
3392 ++windows_or_buffers_changed; | |
3393 } | |
3394 | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3395 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
24995 | 3396 && NILP (Fequal (old_value, value))) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3397 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3398 Lisp_Object param; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3399 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3400 param = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3401 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3402 if (EQ (face, Qdefault)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3403 { |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3404 #ifdef HAVE_WINDOW_SYSTEM |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3405 /* 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
|
3406 reflected in changed `font' frame parameters. */ |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3407 if (FRAMEP (frame) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3408 && (prop_index || EQ (attr, QCfont)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3409 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3410 set_font_frame_param (frame, lface); |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3411 else |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3412 #endif /* HAVE_WINDOW_SYSTEM */ |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3413 |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3414 if (EQ (attr, QCforeground)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3415 param = Qforeground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3416 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3417 param = Qbackground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3418 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3419 #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
|
3420 #ifndef WINDOWSNT |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3421 else if (EQ (face, Qscroll_bar)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3422 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3423 /* 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
|
3424 `scroll-bar-foreground' and `scroll-bar-background'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3425 if (EQ (attr, QCforeground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3426 param = Qscroll_bar_foreground; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3427 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3428 param = Qscroll_bar_background; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3429 } |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3430 #endif /* not WINDOWSNT */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3431 else if (EQ (face, Qborder)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3432 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3433 /* Changing background color of `border' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3434 `border-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3435 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3436 param = Qborder_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3437 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3438 else if (EQ (face, Qcursor)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3439 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3440 /* Changing background color of `cursor' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3441 `cursor-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3442 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3443 param = Qcursor_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3444 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3445 else if (EQ (face, Qmouse)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3446 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3447 /* Changing background color of `mouse' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3448 `mouse-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3449 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3450 param = Qmouse_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3451 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3452 #endif /* HAVE_WINDOW_SYSTEM */ |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
3453 else if (EQ (face, Qmenu)) |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3454 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3455 /* 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
|
3456 realizing faces on FRAME. FRAME t change the |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3457 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
|
3458 setting the flag in new face caches */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3459 if (FRAMEP (frame)) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3460 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3461 struct frame *f = XFRAME (frame); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3462 if (FRAME_FACE_CACHE (f) == NULL) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3463 FRAME_FACE_CACHE (f) = make_face_cache (f); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3464 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
|
3465 } |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3466 else |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3467 menu_face_changed_default = 1; |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3468 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3469 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3470 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
|
3471 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3472 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
|
3473 /* 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
|
3474 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3475 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
|
3476 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3477 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3478 /* 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
|
3479 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3480 Lisp_Object cons; |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3481 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
|
3482 XSETCAR (cons, param); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3483 XSETCDR (cons, value); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3484 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
|
3485 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3486 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3487 } |
24995 | 3488 |
3489 return face; | |
3490 } | |
3491 | |
3492 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3493 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 3494 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3495 /* Set the `font' frame parameter of FRAME determined from the |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3496 font-object set in `default' face attributes LFACE. */ |
24995 | 3497 |
3498 static void | |
3499 set_font_frame_param (frame, lface) | |
3500 Lisp_Object frame, lface; | |
3501 { | |
3502 struct frame *f = XFRAME (frame); | |
96532
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3503 Lisp_Object font; |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3504 |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3505 if (FRAME_WINDOW_P (f) |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3506 /* Don't do anything if the font is `unspecified'. This can |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3507 happen during frame creation. */ |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3508 && (font = LFACE_FONT (lface), |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3509 ! UNSPECIFIEDP (font))) |
addc38841ba7
(set_font_frame_param): Don't try to set the font parameter if it is
Chong Yidong <cyd@stupidchicken.com>
parents:
96529
diff
changeset
|
3510 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3511 if (FONT_SPEC_P (font)) |
90414 | 3512 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3513 font = font_load_for_lface (f, XVECTOR (lface)->contents, font); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3514 if (NILP (font)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3515 return; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3516 LFACE_FONT (lface) = font; |
90414 | 3517 } |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
3518 f->default_face_done_p = 0; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3519 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); |
35040
604d4b3d1054
(set_font_frame_param): Don't do anything for
Gerd Moellmann <gerd@gnu.org>
parents:
35004
diff
changeset
|
3520 } |
24995 | 3521 } |
3522 | |
3523 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3524 /* 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
|
3525 has been assigned the value NEW_VALUE. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3526 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3527 void |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3528 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
|
3529 struct frame *f; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3530 Lisp_Object param, new_value; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3531 { |
57107 | 3532 Lisp_Object face = Qnil; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3533 Lisp_Object lface; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3534 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3535 /* 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
|
3536 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
|
3537 face-set-after-frame-defaults. */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3538 if (NILP (f->face_alist)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3539 return; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3540 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3541 if (EQ (param, Qforeground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3542 { |
57107 | 3543 face = Qdefault; |
3544 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
|
3545 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3546 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3547 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3548 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3549 else if (EQ (param, Qbackground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3550 { |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3551 Lisp_Object frame; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3552 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3553 /* Changing the background color might change the background |
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3554 mode, so that we have to load new defface specs. |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
3555 Call frame-update-face-colors to do that. */ |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3556 XSETFRAME (frame, f); |
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3557 call1 (Qframe_set_background_mode, frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3558 |
57107 | 3559 face = Qdefault; |
3560 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
|
3561 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3562 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3563 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3564 } |
57107 | 3565 else if (EQ (param, Qborder_color)) |
3566 { | |
3567 face = Qborder; | |
3568 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
|
3569 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3570 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3571 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3572 else if (EQ (param, Qcursor_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3573 { |
57107 | 3574 face = Qcursor; |
3575 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
|
3576 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3577 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3578 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3579 else if (EQ (param, Qmouse_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3580 { |
57107 | 3581 face = Qmouse; |
3582 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
|
3583 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3584 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3585 } |
57107 | 3586 |
3587 /* Changing a named face means that all realized faces depending on | |
3588 that face are invalid. Since we cannot tell which realized faces | |
3589 depend on the face, make sure they are all removed. This is done | |
3590 by incrementing face_change_count. The next call to | |
3591 init_iterator will then free realized faces. */ | |
3592 if (!NILP (face) | |
3593 && NILP (Fget (face, Qface_no_inherit))) | |
3594 { | |
3595 ++face_change_count; | |
3596 ++windows_or_buffers_changed; | |
3597 } | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3598 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3599 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3600 |
24995 | 3601 /* Get the value of X resource RESOURCE, class CLASS for the display |
3602 of frame FRAME. This is here because ordinary `x-get-resource' | |
3603 doesn't take a frame argument. */ | |
3604 | |
3605 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
|
3606 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
|
3607 (resource, class, frame) |
24995 | 3608 Lisp_Object resource, class, frame; |
3609 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3610 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
|
3611 CHECK_STRING (resource); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3612 CHECK_STRING (class); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3613 CHECK_LIVE_FRAME (frame); |
24995 | 3614 BLOCK_INPUT; |
3615 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
3616 resource, class, Qnil, Qnil); | |
3617 UNBLOCK_INPUT; | |
3618 return value; | |
3619 } | |
3620 | |
3621 | |
3622 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
3623 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
3624 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
3625 error; if SIGNAL_P is zero, return 0. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3626 |
24995 | 3627 static Lisp_Object |
3628 face_boolean_x_resource_value (value, signal_p) | |
3629 Lisp_Object value; | |
3630 int signal_p; | |
3631 { | |
3632 Lisp_Object result = make_number (0); | |
3633 | |
3634 xassert (STRINGP (value)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3635 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3636 if (xstrcasecmp (SDATA (value), "on") == 0 |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3637 || xstrcasecmp (SDATA (value), "true") == 0) |
24995 | 3638 result = Qt; |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3639 else if (xstrcasecmp (SDATA (value), "off") == 0 |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3640 || xstrcasecmp (SDATA (value), "false") == 0) |
24995 | 3641 result = Qnil; |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3642 else if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
24995 | 3643 result = Qunspecified; |
3644 else if (signal_p) | |
3645 signal_error ("Invalid face attribute value from X resource", value); | |
3646 | |
3647 return result; | |
3648 } | |
3649 | |
3650 | |
3651 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
3652 Finternal_set_lisp_face_attribute_from_resource, | |
3653 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
|
3654 3, 4, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3655 (face, attr, value, frame) |
24995 | 3656 Lisp_Object face, attr, value, frame; |
3657 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3658 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3659 CHECK_SYMBOL (attr); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3660 CHECK_STRING (value); |
24995 | 3661 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3662 if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
24995 | 3663 value = Qunspecified; |
3664 else if (EQ (attr, QCheight)) | |
3665 { | |
3666 value = Fstring_to_number (value, make_number (10)); | |
3667 if (XINT (value) <= 0) | |
3668 signal_error ("Invalid face height from X resource", value); | |
3669 } | |
3670 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
3671 value = face_boolean_x_resource_value (value, 1); | |
3672 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
|
3673 value = intern (SDATA (value)); |
24995 | 3674 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
3675 value = face_boolean_x_resource_value (value, 1); | |
3676 else if (EQ (attr, QCunderline) | |
3677 || EQ (attr, QCoverline) | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3678 || EQ (attr, QCstrike_through)) |
24995 | 3679 { |
3680 Lisp_Object boolean_value; | |
3681 | |
3682 /* If the result of face_boolean_x_resource_value is t or nil, | |
3683 VALUE does NOT specify a color. */ | |
3684 boolean_value = face_boolean_x_resource_value (value, 0); | |
3685 if (SYMBOLP (boolean_value)) | |
3686 value = boolean_value; | |
3687 } | |
67130
c5ff1098b0b8
(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents:
67056
diff
changeset
|
3688 else if (EQ (attr, QCbox) || EQ (attr, QCinherit)) |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3689 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
24995 | 3690 |
3691 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
|
3692 } |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
3693 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3694 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3695 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3696 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3697 /*********************************************************************** |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3698 Menu face |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3699 ***********************************************************************/ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3700 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3701 #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
|
3702 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3703 /* 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
|
3704 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3705 static void |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3706 x_update_menu_appearance (f) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3707 struct frame *f; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3708 { |
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3709 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
|
3710 XrmDatabase rdb; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3711 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3712 if (dpyinfo |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3713 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3714 rdb != NULL)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3715 { |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3716 char line[512]; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3717 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
|
3718 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
|
3719 const char *myname = SDATA (Vx_resource_name); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3720 int changed_p = 0; |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3721 #ifdef USE_MOTIF |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3722 const char *popup_path = "popup_menu"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3723 #else |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3724 const char *popup_path = "menu.popup"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3725 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3726 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3727 if (STRINGP (LFACE_FOREGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3728 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3729 sprintf (line, "%s.%s*foreground: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3730 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
|
3731 SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3732 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3733 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
|
3734 myname, SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3735 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3736 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3737 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3738 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3739 if (STRINGP (LFACE_BACKGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3740 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3741 sprintf (line, "%s.%s*background: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3742 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
|
3743 SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3744 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3745 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
|
3746 myname, SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3747 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3748 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3749 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3750 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3751 if (face->font |
97599
9806866dbf50
(x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents:
97502
diff
changeset
|
3752 /* On Solaris 5.8, it's been reported that the `menu' face |
9806866dbf50
(x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents:
97502
diff
changeset
|
3753 can be unspecified here, during startup. Why this |
9806866dbf50
(x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents:
97502
diff
changeset
|
3754 happens remains unknown. -- cyd */ |
9806866dbf50
(x_update_menu_appearance): Check validity of menu font before using
Chong Yidong <cyd@stupidchicken.com>
parents:
97502
diff
changeset
|
3755 && FONTP (LFACE_FONT (lface)) |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3756 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3757 || !UNSPECIFIEDP (LFACE_FOUNDRY (lface)) |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3758 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3759 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3760 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3761 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3762 { |
95189
70380eb2fa9d
(x_update_menu_appearance): Call Ffont_xlfd_name with
Kenichi Handa <handa@m17n.org>
parents:
95178
diff
changeset
|
3763 Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface), Qnil); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3764 #ifdef USE_MOTIF |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3765 const char *suffix = "List"; |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3766 Bool motif = True; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3767 #else |
64232
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3768 #if defined HAVE_X_I18N |
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3769 |
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3770 const char *suffix = "Set"; |
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3771 #else |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3772 const char *suffix = ""; |
64232
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3773 #endif |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3774 Bool motif = False; |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3775 #endif |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3776 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3777 if (! NILP (xlfd)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3778 { |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3779 #if defined HAVE_X_I18N |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3780 extern char *xic_create_fontsetname |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3781 P_ ((char *base_fontname, Bool motif)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3782 char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif); |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3783 #else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3784 char *fontsetname = (char *) SDATA (xlfd); |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3785 #endif |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3786 sprintf (line, "%s.pane.menubar*font%s: %s", |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3787 myname, suffix, fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3788 XrmPutLineResource (&rdb, line); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3789 sprintf (line, "%s.%s*font%s: %s", |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3790 myname, popup_path, suffix, fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3791 XrmPutLineResource (&rdb, line); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3792 changed_p = 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3793 if (fontsetname != (char *) SDATA (xlfd)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3794 xfree (fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3795 } |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3796 } |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3797 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3798 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
|
3799 free_frame_menubar (f); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3800 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3801 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3802 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3803 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
24995 | 3804 |
3805 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3806 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
|
3807 Sface_attribute_relative_p, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3808 2, 2, 0, |
71576
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3809 doc: /* Check whether a face attribute value is relative. |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3810 Specifically, this function returns t if the attribute ATTRIBUTE |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3811 with the value VALUE is relative. |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3812 |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3813 A relative value is one that doesn't entirely override whatever is |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3814 inherited from another face. For most possible attributes, |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3815 the only relative value that users see is `unspecified'. |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3816 However, for :height, floating point values are also relative. */) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3817 (attribute, value) |
40532
221868112227
(Fface_attribute_relative_p): Declare args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40441
diff
changeset
|
3818 Lisp_Object attribute, value; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3819 { |
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3820 if (EQ (value, Qunspecified) || (EQ (value, Qignore_defface))) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3821 return Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3822 else if (EQ (attribute, QCheight)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3823 return INTEGERP (value) ? Qnil : Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3824 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3825 return Qnil; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3826 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3827 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3828 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
|
3829 3, 3, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3830 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
|
3831 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
|
3832 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
|
3833 (attribute, value1, value2) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3834 Lisp_Object attribute, value1, value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3835 { |
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3836 if (EQ (value1, Qunspecified) || EQ (value1, Qignore_defface)) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3837 return value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3838 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
|
3839 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
|
3840 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3841 return value1; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3842 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3843 |
24995 | 3844 |
3845 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
3846 Sinternal_get_lisp_face_attribute, | |
3847 2, 3, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3848 doc: /* Return face attribute KEYWORD of face SYMBOL. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3849 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
|
3850 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
|
3851 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
|
3852 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
|
3853 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
|
3854 (symbol, keyword, frame) |
24995 | 3855 Lisp_Object symbol, keyword, frame; |
3856 { | |
3857 Lisp_Object lface, value = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3858 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3859 CHECK_SYMBOL (symbol); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3860 CHECK_SYMBOL (keyword); |
24995 | 3861 |
3862 if (EQ (frame, Qt)) | |
3863 lface = lface_from_face_name (NULL, symbol, 1); | |
3864 else | |
3865 { | |
3866 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3867 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3868 CHECK_LIVE_FRAME (frame); |
24995 | 3869 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
3870 } | |
3871 | |
3872 if (EQ (keyword, QCfamily)) | |
3873 value = LFACE_FAMILY (lface); | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3874 else if (EQ (keyword, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3875 value = LFACE_FOUNDRY (lface); |
24995 | 3876 else if (EQ (keyword, QCheight)) |
3877 value = LFACE_HEIGHT (lface); | |
3878 else if (EQ (keyword, QCweight)) | |
3879 value = LFACE_WEIGHT (lface); | |
3880 else if (EQ (keyword, QCslant)) | |
3881 value = LFACE_SLANT (lface); | |
3882 else if (EQ (keyword, QCunderline)) | |
3883 value = LFACE_UNDERLINE (lface); | |
3884 else if (EQ (keyword, QCoverline)) | |
3885 value = LFACE_OVERLINE (lface); | |
3886 else if (EQ (keyword, QCstrike_through)) | |
3887 value = LFACE_STRIKE_THROUGH (lface); | |
3888 else if (EQ (keyword, QCbox)) | |
3889 value = LFACE_BOX (lface); | |
3890 else if (EQ (keyword, QCinverse_video) | |
3891 || EQ (keyword, QCreverse_video)) | |
3892 value = LFACE_INVERSE (lface); | |
3893 else if (EQ (keyword, QCforeground)) | |
3894 value = LFACE_FOREGROUND (lface); | |
3895 else if (EQ (keyword, QCbackground)) | |
3896 value = LFACE_BACKGROUND (lface); | |
3897 else if (EQ (keyword, QCstipple)) | |
3898 value = LFACE_STIPPLE (lface); | |
3899 else if (EQ (keyword, QCwidth)) | |
3900 value = LFACE_SWIDTH (lface); | |
31178 | 3901 else if (EQ (keyword, QCinherit)) |
3902 value = LFACE_INHERIT (lface); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3903 else if (EQ (keyword, QCfont)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3904 value = LFACE_FONT (lface); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3905 else if (EQ (keyword, QCfontset)) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3906 value = LFACE_FONTSET (lface); |
24995 | 3907 else |
3908 signal_error ("Invalid face attribute name", keyword); | |
3909 | |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3910 if (IGNORE_DEFFACE_P (value)) |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3911 return Qunspecified; |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3912 |
24995 | 3913 return value; |
3914 } | |
3915 | |
3916 | |
3917 DEFUN ("internal-lisp-face-attribute-values", | |
3918 Finternal_lisp_face_attribute_values, | |
3919 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
|
3920 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
|
3921 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
|
3922 (attr) |
24995 | 3923 Lisp_Object attr; |
3924 { | |
3925 Lisp_Object result = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3926 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3927 CHECK_SYMBOL (attr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3928 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3929 if (EQ (attr, QCunderline)) |
24995 | 3930 result = Fcons (Qt, Fcons (Qnil, Qnil)); |
3931 else if (EQ (attr, QCoverline)) | |
3932 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3933 else if (EQ (attr, QCstrike_through)) | |
3934 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3935 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
3936 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3937 | |
3938 return result; | |
3939 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3940 |
24995 | 3941 |
3942 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
|
3943 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
|
3944 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
|
3945 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
|
3946 (face, frame) |
24995 | 3947 Lisp_Object face, frame; |
3948 { | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3949 int i; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3950 Lisp_Object global_lface, local_lface, *gvec, *lvec; |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3951 struct frame *f = XFRAME (frame); |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3952 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3953 CHECK_LIVE_FRAME (frame); |
24995 | 3954 global_lface = lface_from_face_name (NULL, face, 1); |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3955 local_lface = lface_from_face_name (f, face, 0); |
24995 | 3956 if (NILP (local_lface)) |
3957 local_lface = Finternal_make_lisp_face (face, frame); | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3958 |
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
3959 /* 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
|
3960 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
|
3961 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
|
3962 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
|
3963 "global before local" priority. */ |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3964 lvec = XVECTOR (local_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3965 gvec = XVECTOR (global_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3966 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3967 if (IGNORE_DEFFACE_P (gvec[i])) |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3968 lvec[i] = Qunspecified; |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3969 else if (! UNSPECIFIEDP (gvec[i])) |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3970 lvec[i] = gvec[i]; |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3971 |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3972 /* If the default face was changed, update the face cache and the |
96428
51371c50583a
Fix typo in comments.
Chong Yidong <cyd@stupidchicken.com>
parents:
96427
diff
changeset
|
3973 `font' frame parameter. */ |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3974 if (EQ (face, Qdefault)) |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3975 { |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3976 struct face_cache *c = FRAME_FACE_CACHE (f); |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3977 struct face *newface, *oldface = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3978 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3979 |
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3980 /* This can be NULL (e.g., in batch mode). */ |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3981 if (oldface) |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3982 { |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3983 /* Ensure that the face vector is fully specified by merging |
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3984 the previously-cached vector. */ |
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3985 bcopy (oldface->lface, attrs, sizeof attrs); |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3986 merge_face_vectors (f, lvec, attrs, 0); |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3987 bcopy (attrs, lvec, sizeof attrs); |
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3988 newface = realize_face (c, lvec, DEFAULT_FACE_ID); |
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3989 |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3990 if ((! UNSPECIFIEDP (gvec[LFACE_FAMILY_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3991 || ! UNSPECIFIEDP (gvec[LFACE_FOUNDRY_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3992 || ! UNSPECIFIEDP (gvec[LFACE_HEIGHT_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3993 || ! UNSPECIFIEDP (gvec[LFACE_WEIGHT_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3994 || ! UNSPECIFIEDP (gvec[LFACE_SLANT_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3995 || ! UNSPECIFIEDP (gvec[LFACE_SWIDTH_INDEX]) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3996 || ! UNSPECIFIEDP (gvec[LFACE_FONT_INDEX])) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3997 && newface->font) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3998 { |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3999 Lisp_Object name = newface->font->props[FONT_NAME_INDEX]; |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
4000 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, name), |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
4001 Qnil)); |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
4002 } |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
4003 } |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
4004 } |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4005 |
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
4006 return Qnil; |
24995 | 4007 } |
4008 | |
4009 | |
4010 /* The following function is implemented for compatibility with 20.2. | |
4011 The function is used in x-resolve-fonts when it is asked to | |
4012 return fonts with the same size as the font of a face. This is | |
4013 done in fontset.el. */ | |
4014 | |
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4015 DEFUN ("face-font", Fface_font, Sface_font, 1, 3, 0, |
40598
7f3db64c7d42
(Finternal_merge_in_global_face): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40555
diff
changeset
|
4016 doc: /* Return the font name of face FACE, or nil if it is unspecified. |
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4017 The font name is, by default, for ASCII characters. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4018 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
|
4019 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
|
4020 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
|
4021 of the form (bold), (italic) or (bold italic). |
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4022 If FRAME is omitted or nil, use the selected frame. And, in this case, |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4023 if the optional third argument CHARACTER is given, |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4024 return the font name used for CHARACTER. */) |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4025 (face, frame, character) |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4026 Lisp_Object face, frame, character; |
24995 | 4027 { |
4028 if (EQ (frame, Qt)) | |
4029 { | |
4030 Lisp_Object result = Qnil; | |
4031 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
4032 | |
4033 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
4034 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
4035 result = Fcons (Qbold, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4036 |
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
4037 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
24995 | 4038 && !EQ (LFACE_SLANT (lface), Qnormal)) |
4039 result = Fcons (Qitalic, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4040 |
24995 | 4041 return result; |
4042 } | |
4043 else | |
4044 { | |
4045 struct frame *f = frame_or_selected_frame (frame, 1); | |
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4046 int face_id = lookup_named_face (f, face, 1); |
24995 | 4047 struct face *face = FACE_FROM_ID (f, face_id); |
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4048 |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4049 if (! face) |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
4050 return Qnil; |
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4051 #ifdef HAVE_WINDOW_SYSTEM |
89948
e94e49dc760e
(Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89947
diff
changeset
|
4052 if (FRAME_WINDOW_P (f) && !NILP (character)) |
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4053 { |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4054 CHECK_CHARACTER (character); |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4055 face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil); |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4056 face = FACE_FROM_ID (f, face_id); |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
4057 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4058 return (face->font |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4059 ? face->font->props[FONT_NAME_INDEX] |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4060 : Qnil); |
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4061 #else /* !HAVE_WINDOW_SYSTEM */ |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4062 return build_string (FRAME_MSDOS_P (f) |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4063 ? "ms-dos" |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4064 : FRAME_W32_P (f) ? "w32term" |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4065 :"tty"); |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
4066 #endif |
24995 | 4067 } |
4068 } | |
4069 | |
4070 | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4071 /* 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
|
4072 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
|
4073 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
|
4074 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4075 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
|
4076 face_attr_equal_p (v1, v2) |
56063
109c0a603543
(face_attr_equal_p): Declare parameters.
Andreas Schwab <schwab@suse.de>
parents:
55982
diff
changeset
|
4077 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
|
4078 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4079 /* 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
|
4080 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
|
4081 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
|
4082 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4083 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4084 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
|
4085 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4086 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4087 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
|
4088 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4089 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
|
4090 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
|
4091 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4092 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4093 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
|
4094 |
105885
8103235103a7
Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105877
diff
changeset
|
4095 case_Lisp_Int: |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4096 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
|
4097 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4098 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4099 default: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4100 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
|
4101 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4102 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4103 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4104 |
24995 | 4105 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
4106 all attributes are `equal'. Tries to be fast because this function | |
4107 is called quite often. */ | |
4108 | |
4109 static INLINE int | |
4110 lface_equal_p (v1, v2) | |
4111 Lisp_Object *v1, *v2; | |
4112 { | |
4113 int i, equal_p = 1; | |
4114 | |
4115 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
|
4116 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
|
4117 |
24995 | 4118 return equal_p; |
4119 } | |
4120 | |
4121 | |
4122 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
4123 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
|
4124 doc: /* True if FACE1 and FACE2 are equal. |
62969
24f25f7c89cd
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents:
62945
diff
changeset
|
4125 If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame. |
24f25f7c89cd
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents:
62945
diff
changeset
|
4126 If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames). |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4127 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
|
4128 (face1, face2, frame) |
24995 | 4129 Lisp_Object face1, face2, frame; |
4130 { | |
4131 int equal_p; | |
4132 struct frame *f; | |
4133 Lisp_Object lface1, lface2; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4134 |
24995 | 4135 if (EQ (frame, Qt)) |
4136 f = NULL; | |
4137 else | |
4138 /* Don't use check_x_frame here because this function is called | |
4139 before X frames exist. At that time, if FRAME is nil, | |
4140 selected_frame will be used which is the frame dumped with | |
4141 Emacs. That frame is not an X frame. */ | |
4142 f = frame_or_selected_frame (frame, 2); | |
4143 | |
62969
24f25f7c89cd
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents:
62945
diff
changeset
|
4144 lface1 = lface_from_face_name (f, face1, 1); |
24f25f7c89cd
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
Juanma Barranquero <lekktu@gmail.com>
parents:
62945
diff
changeset
|
4145 lface2 = lface_from_face_name (f, face2, 1); |
24995 | 4146 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
4147 XVECTOR (lface2)->contents); | |
4148 return equal_p ? Qt : Qnil; | |
4149 } | |
4150 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4151 |
24995 | 4152 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
4153 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
|
4154 doc: /* True if FACE has no attribute specified. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4155 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
|
4156 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
|
4157 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
|
4158 (face, frame) |
24995 | 4159 Lisp_Object face, frame; |
4160 { | |
4161 struct frame *f; | |
4162 Lisp_Object lface; | |
4163 int i; | |
4164 | |
4165 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4166 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4167 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4168 f = XFRAME (frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4169 |
24995 | 4170 if (EQ (frame, Qt)) |
4171 lface = lface_from_face_name (NULL, face, 1); | |
4172 else | |
4173 lface = lface_from_face_name (f, face, 1); | |
4174 | |
4175 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
|
4176 if (!UNSPECIFIEDP (AREF (lface, i))) |
24995 | 4177 break; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4178 |
24995 | 4179 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
4180 } | |
4181 | |
4182 | |
4183 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
|
4184 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4185 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
|
4186 For internal use only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4187 (frame) |
24995 | 4188 Lisp_Object frame; |
4189 { | |
4190 struct frame *f = frame_or_selected_frame (frame, 0); | |
4191 return f->face_alist; | |
4192 } | |
4193 | |
4194 | |
4195 /* Return a hash code for Lisp string STRING with case ignored. Used | |
4196 below in computing a hash value for a Lisp face. */ | |
4197 | |
4198 static INLINE unsigned | |
4199 hash_string_case_insensitive (string) | |
4200 Lisp_Object string; | |
4201 { | |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4202 const unsigned char *s; |
24995 | 4203 unsigned hash = 0; |
4204 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
|
4205 for (s = SDATA (string); *s; ++s) |
24995 | 4206 hash = (hash << 1) ^ tolower (*s); |
4207 return hash; | |
4208 } | |
4209 | |
4210 | |
4211 /* Return a hash code for face attribute vector V. */ | |
4212 | |
4213 static INLINE unsigned | |
4214 lface_hash (v) | |
4215 Lisp_Object *v; | |
4216 { | |
4217 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4218 ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX]) |
24995 | 4219 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) |
4220 ^ hash_string_case_insensitive (v[LFACE_BACKGROUND_INDEX]) | |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4221 ^ XHASH (v[LFACE_WEIGHT_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4222 ^ XHASH (v[LFACE_SLANT_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4223 ^ XHASH (v[LFACE_SWIDTH_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4224 ^ XHASH (v[LFACE_HEIGHT_INDEX])); |
24995 | 4225 } |
4226 | |
4227 | |
4228 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
4229 considering charsets/registries). They do if they specify the same | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4230 family, point size, weight, width, slant, and font. Both |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4231 LFACE1 and LFACE2 must be fully-specified. */ |
24995 | 4232 |
4233 static INLINE int | |
4234 lface_same_font_attributes_p (lface1, lface2) | |
4235 Lisp_Object *lface1, *lface2; | |
4236 { | |
4237 xassert (lface_fully_specified_p (lface1) | |
4238 && lface_fully_specified_p (lface2)); | |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4239 return (xstrcasecmp (SDATA (lface1[LFACE_FAMILY_INDEX]), |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4240 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4241 && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]), |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4242 SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0 |
31178 | 4243 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
24995 | 4244 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
4245 && 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
|
4246 && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX]) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4247 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4248 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4249 || (STRINGP (lface1[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4250 && STRINGP (lface2[LFACE_FONTSET_INDEX]) |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4251 && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]), |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4252 SDATA (lface2[LFACE_FONTSET_INDEX])))) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4253 ); |
24995 | 4254 } |
4255 | |
4256 | |
4257 | |
4258 /*********************************************************************** | |
4259 Realized Faces | |
4260 ***********************************************************************/ | |
4261 | |
4262 /* 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
|
4263 vector ATTR. */ |
24995 | 4264 |
4265 static struct face * | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4266 make_realized_face (attr) |
24995 | 4267 Lisp_Object *attr; |
4268 { | |
4269 struct face *face = (struct face *) xmalloc (sizeof *face); | |
4270 bzero (face, sizeof *face); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4271 face->ascii_face = face; |
24995 | 4272 bcopy (attr, face->lface, sizeof face->lface); |
4273 return face; | |
4274 } | |
4275 | |
4276 | |
4277 /* Free realized face FACE, including its X resources. FACE may | |
4278 be null. */ | |
4279 | |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4280 void |
24995 | 4281 free_realized_face (f, face) |
4282 struct frame *f; | |
4283 struct face *face; | |
4284 { | |
4285 if (face) | |
4286 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4287 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4288 if (FRAME_WINDOW_P (f)) |
24995 | 4289 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4290 /* 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
|
4291 if (face->fontset >= 0 && face == face->ascii_face) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4292 free_face_fontset (f, face); |
24995 | 4293 if (face->gc) |
4294 { | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4295 BLOCK_INPUT; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4296 if (face->font) |
90414 | 4297 font_done_for_face (f, face); |
24995 | 4298 x_free_gc (f, face->gc); |
4299 face->gc = 0; | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4300 UNBLOCK_INPUT; |
24995 | 4301 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4302 |
24995 | 4303 free_face_colors (f, face); |
4304 x_destroy_bitmap (f, face->stipple); | |
4305 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4306 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4307 |
4308 xfree (face); | |
4309 } | |
4310 } | |
4311 | |
4312 | |
4313 /* Prepare face FACE for subsequent display on frame F. This | |
4314 allocated GCs if they haven't been allocated yet or have been freed | |
4315 by clearing the face cache. */ | |
4316 | |
4317 void | |
4318 prepare_face_for_display (f, face) | |
4319 struct frame *f; | |
4320 struct face *face; | |
4321 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4322 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4323 xassert (FRAME_WINDOW_P (f)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4324 |
24995 | 4325 if (face->gc == 0) |
4326 { | |
4327 XGCValues xgcv; | |
4328 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
4329 | |
4330 xgcv.foreground = face->foreground; | |
4331 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
|
4332 #ifdef HAVE_X_WINDOWS |
24995 | 4333 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
|
4334 #endif |
24995 | 4335 |
4336 BLOCK_INPUT; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4337 #ifdef HAVE_X_WINDOWS |
24995 | 4338 if (face->stipple) |
4339 { | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
4340 xgcv.fill_style = FillOpaqueStippled; |
24995 | 4341 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
4342 mask |= GCFillStyle | GCStipple; | |
4343 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4344 #endif |
24995 | 4345 face->gc = x_create_gc (f, mask, &xgcv); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4346 if (face->font) |
90414 | 4347 font_prepare_for_face (f, face); |
24995 | 4348 UNBLOCK_INPUT; |
4349 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4350 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4351 } |
4352 | |
4353 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4354 /* 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
|
4355 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4356 static int |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4357 color_distance (x, y) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4358 XColor *x, *y; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4359 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4360 /* 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
|
4361 Quoting from that paper: |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4362 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4363 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
|
4364 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
|
4365 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
|
4366 gives far from optimal results. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4367 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4368 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
|
4369 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4370 long r = (x->red - y->red) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4371 long g = (x->green - y->green) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4372 long b = (x->blue - y->blue) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4373 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
|
4374 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4375 return |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4376 (((512 + r_mean) * r * r) >> 8) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4377 + 4 * g * g |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4378 + (((767 - r_mean) * b * b) >> 8); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4379 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4380 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4381 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 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
|
4387 (color1, color2, frame) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4388 Lisp_Object color1, color2, frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4389 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4390 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4391 XColor cdef1, cdef2; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4392 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4393 if (NILP (frame)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4394 frame = selected_frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4395 CHECK_LIVE_FRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4396 f = XFRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4397 |
75885
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4398 if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1)) |
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4399 && !(STRINGP (color1) && 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
|
4400 signal_error ("Invalid color", color1); |
75885
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4401 if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2)) |
19bf7ffe644e
(Fcolor_distance): Don't continue checking a color for errors after it has been
Juanma Barranquero <lekktu@gmail.com>
parents:
75348
diff
changeset
|
4402 && !(STRINGP (color2) && 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
|
4403 signal_error ("Invalid color", color2); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4404 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4405 return make_number (color_distance (&cdef1, &cdef2)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4406 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4407 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4408 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4409 /*********************************************************************** |
24995 | 4410 Face Cache |
4411 ***********************************************************************/ | |
4412 | |
4413 /* Return a new face cache for frame F. */ | |
4414 | |
4415 static struct face_cache * | |
4416 make_face_cache (f) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4417 struct frame *f; |
24995 | 4418 { |
4419 struct face_cache *c; | |
4420 int size; | |
4421 | |
4422 c = (struct face_cache *) xmalloc (sizeof *c); | |
4423 bzero (c, sizeof *c); | |
4424 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
4425 c->buckets = (struct face **) xmalloc (size); | |
4426 bzero (c->buckets, size); | |
4427 c->size = 50; | |
4428 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
4429 c->f = f; | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4430 c->menu_face_changed_p = menu_face_changed_default; |
24995 | 4431 return c; |
4432 } | |
4433 | |
4434 | |
4435 /* Clear out all graphics contexts for all realized faces, except for | |
4436 the basic faces. This should be done from time to time just to avoid | |
4437 keeping too many graphics contexts that are no longer needed. */ | |
4438 | |
4439 static void | |
4440 clear_face_gcs (c) | |
4441 struct face_cache *c; | |
4442 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4443 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
|
4444 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4445 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4446 int i; |
4447 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
4448 { | |
4449 struct face *face = c->faces_by_id[i]; | |
4450 if (face && face->gc) | |
4451 { | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4452 BLOCK_INPUT; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4453 if (face->font) |
90414 | 4454 font_done_for_face (c->f, face); |
24995 | 4455 x_free_gc (c->f, face->gc); |
4456 face->gc = 0; | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4457 UNBLOCK_INPUT; |
24995 | 4458 } |
4459 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4460 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4461 } |
4462 } | |
4463 | |
4464 | |
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4465 /* 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
|
4466 C may be null. If faces are freed, make sure the frame's current |
24995 | 4467 matrix is marked invalid, so that a display caused by an expose |
4468 event doesn't try to use faces we destroyed. */ | |
4469 | |
4470 static void | |
4471 free_realized_faces (c) | |
4472 struct face_cache *c; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4473 { |
24995 | 4474 if (c && c->used) |
4475 { | |
4476 int i, size; | |
4477 struct frame *f = c->f; | |
4478 | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4479 /* 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
|
4480 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
|
4481 current matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4482 BLOCK_INPUT; |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4483 |
24995 | 4484 for (i = 0; i < c->used; ++i) |
4485 { | |
4486 free_realized_face (f, c->faces_by_id[i]); | |
4487 c->faces_by_id[i] = NULL; | |
4488 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4489 |
24995 | 4490 c->used = 0; |
4491 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
4492 bzero (c->buckets, size); | |
4493 | |
4494 /* Must do a thorough redisplay the next time. Mark current | |
4495 matrices as invalid because they will reference faces freed | |
4496 above. This function is also called when a frame is | |
4497 destroyed. In this case, the root window of F is nil. */ | |
4498 if (WINDOWP (f->root_window)) | |
4499 { | |
4500 clear_current_matrices (f); | |
4501 ++windows_or_buffers_changed; | |
4502 } | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4503 |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4504 UNBLOCK_INPUT; |
24995 | 4505 } |
4506 } | |
4507 | |
4508 | |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4509 /* Free all realized faces that are using FONTSET on frame F. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4510 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4511 void |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4512 free_realized_faces_for_fontset (f, fontset) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4513 struct frame *f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4514 int fontset; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4515 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4516 struct face_cache *cache = FRAME_FACE_CACHE (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4517 struct face *face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4518 int i; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4519 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4520 /* 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
|
4521 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
|
4522 matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4523 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4524 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4525 for (i = 0; i < cache->used; i++) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4526 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4527 face = cache->faces_by_id[i]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4528 if (face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4529 && face->fontset == fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4530 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4531 uncache_face (cache, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4532 free_realized_face (f, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4533 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4534 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4535 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4536 /* 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
|
4537 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
|
4538 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
|
4539 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
|
4540 if (WINDOWP (f->root_window)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4541 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4542 clear_current_matrices (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4543 ++windows_or_buffers_changed; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4544 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4545 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4546 UNBLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4547 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4548 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4549 |
24995 | 4550 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
4551 This is done after attributes of a named face have been changed, | |
4552 because we can't tell which realized faces depend on that face. */ | |
4553 | |
4554 void | |
4555 free_all_realized_faces (frame) | |
4556 Lisp_Object frame; | |
4557 { | |
4558 if (NILP (frame)) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4559 { |
24995 | 4560 Lisp_Object rest; |
4561 FOR_EACH_FRAME (rest, frame) | |
4562 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
4563 } | |
4564 else | |
4565 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
4566 } | |
4567 | |
4568 | |
4569 /* Free face cache C and faces in it, including their X resources. */ | |
4570 | |
4571 static void | |
4572 free_face_cache (c) | |
4573 struct face_cache *c; | |
4574 { | |
4575 if (c) | |
4576 { | |
4577 free_realized_faces (c); | |
4578 xfree (c->buckets); | |
4579 xfree (c->faces_by_id); | |
4580 xfree (c); | |
4581 } | |
4582 } | |
4583 | |
4584 | |
4585 /* Cache realized face FACE in face cache C. HASH is the hash value | |
88907 | 4586 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face == |
4587 FACE), insert the new face to the beginning of the collision list | |
4588 of the face hash table of C. Otherwise, add the new face to the | |
4589 end of the collision list. This way, lookup_face can quickly find | |
4590 that a requested face is not cached. */ | |
24995 | 4591 |
4592 static void | |
4593 cache_face (c, face, hash) | |
4594 struct face_cache *c; | |
4595 struct face *face; | |
4596 unsigned hash; | |
4597 { | |
4598 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
4599 | |
4600 face->hash = hash; | |
4601 | |
88907 | 4602 if (face->ascii_face != face) |
24995 | 4603 { |
4604 struct face *last = c->buckets[i]; | |
4605 if (last) | |
4606 { | |
4607 while (last->next) | |
4608 last = last->next; | |
4609 last->next = face; | |
4610 face->prev = last; | |
4611 face->next = NULL; | |
4612 } | |
4613 else | |
4614 { | |
4615 c->buckets[i] = face; | |
4616 face->prev = face->next = NULL; | |
4617 } | |
4618 } | |
4619 else | |
4620 { | |
4621 face->prev = NULL; | |
4622 face->next = c->buckets[i]; | |
4623 if (face->next) | |
4624 face->next->prev = face; | |
4625 c->buckets[i] = face; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4626 } |
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4627 |
24995 | 4628 /* Find a free slot in C->faces_by_id and use the index of the free |
4629 slot as FACE->id. */ | |
4630 for (i = 0; i < c->used; ++i) | |
4631 if (c->faces_by_id[i] == NULL) | |
4632 break; | |
4633 face->id = i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4634 |
24995 | 4635 /* 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
|
4636 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
|
4637 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4638 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
|
4639 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4640 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
|
4641 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
|
4642 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
|
4643 abort (); /* Alternatives? ++kfs */ |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4644 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
|
4645 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
|
4646 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
|
4647 } |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4648 c->used++; |
24995 | 4649 } |
4650 | |
4651 #if GLYPH_DEBUG | |
4652 /* Check that FACE got a unique id. */ | |
4653 { | |
4654 int j, n; | |
4655 struct face *face; | |
4656 | |
4657 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
4658 for (face = c->buckets[j]; face; face = face->next) | |
4659 if (face->id == i) | |
4660 ++n; | |
4661 | |
4662 xassert (n == 1); | |
4663 } | |
4664 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4665 |
24995 | 4666 c->faces_by_id[i] = face; |
4667 } | |
4668 | |
4669 | |
4670 /* Remove face FACE from cache C. */ | |
4671 | |
4672 static void | |
4673 uncache_face (c, face) | |
4674 struct face_cache *c; | |
4675 struct face *face; | |
4676 { | |
4677 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4678 |
24995 | 4679 if (face->prev) |
4680 face->prev->next = face->next; | |
4681 else | |
4682 c->buckets[i] = face->next; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4683 |
24995 | 4684 if (face->next) |
4685 face->next->prev = face->prev; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4686 |
24995 | 4687 c->faces_by_id[face->id] = NULL; |
4688 if (face->id == c->used) | |
4689 --c->used; | |
4690 } | |
4691 | |
4692 | |
4693 /* Look up a realized face with face attributes ATTR in the face cache | |
88907 | 4694 of frame F. The face will be used to display ASCII characters. |
4695 Value is the ID of the face found. If no suitable face is found, | |
4696 realize a new one. */ | |
24995 | 4697 |
4698 INLINE int | |
88907 | 4699 lookup_face (f, attr) |
24995 | 4700 struct frame *f; |
4701 Lisp_Object *attr; | |
4702 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4703 struct face_cache *cache = FRAME_FACE_CACHE (f); |
24995 | 4704 unsigned hash; |
4705 int i; | |
4706 struct face *face; | |
4707 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4708 xassert (cache != NULL); |
24995 | 4709 check_lface_attrs (attr); |
4710 | |
4711 /* Look up ATTR in the face cache. */ | |
4712 hash = lface_hash (attr); | |
4713 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4714 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4715 for (face = cache->buckets[i]; face; face = face->next) |
88907 | 4716 { |
4717 if (face->ascii_face != face) | |
4718 { | |
4719 /* There's no more ASCII face. */ | |
4720 face = NULL; | |
4721 break; | |
4722 } | |
4723 if (face->hash == hash | |
4724 && lface_equal_p (face->lface, attr)) | |
4725 break; | |
4726 } | |
24995 | 4727 |
4728 /* If not found, realize a new face. */ | |
4729 if (face == NULL) | |
88907 | 4730 face = realize_face (cache, attr, -1); |
24995 | 4731 |
4732 #if GLYPH_DEBUG | |
4733 xassert (face == FACE_FROM_ID (f, face->id)); | |
4734 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4735 |
24995 | 4736 return face->id; |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4737 } |
24995 | 4738 |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4739 #ifdef HAVE_WINDOW_SYSTEM |
88907 | 4740 /* Look up a realized face that has the same attributes as BASE_FACE |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4741 except for the font in the face cache of frame F. If FONT-OBJECT |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4742 is not nil, it is an already opened font. If FONT-OBJECT is nil, |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4743 the face has no font. Value is the ID of the face found. If no |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4744 suitable face is found, realize a new one. */ |
24995 | 4745 |
4746 int | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4747 face_for_font (f, font_object, base_face) |
88907 | 4748 struct frame *f; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4749 Lisp_Object font_object; |
88907 | 4750 struct face *base_face; |
4751 { | |
4752 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
4753 unsigned hash; | |
4754 int i; | |
4755 struct face *face; | |
4756 | |
4757 xassert (cache != NULL); | |
4758 base_face = base_face->ascii_face; | |
4759 hash = lface_hash (base_face->lface); | |
4760 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
4761 | |
4762 for (face = cache->buckets[i]; face; face = face->next) | |
4763 { | |
4764 if (face->ascii_face == face) | |
4765 continue; | |
4766 if (face->ascii_face == base_face | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4767 && face->font == (NILP (font_object) ? NULL |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4768 : XFONT_OBJECT (font_object)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4769 && lface_equal_p (face->lface, base_face->lface)) |
90414 | 4770 return face->id; |
4771 } | |
4772 | |
4773 /* If not found, realize a new face. */ | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4774 face = realize_non_ascii_face (f, font_object, base_face); |
90414 | 4775 return face->id; |
4776 } | |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4777 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4778 |
4779 /* Return the face id of the realized face for named face SYMBOL on | |
88907 | 4780 frame F suitable for displaying ASCII characters. Value is -1 if |
4781 the face couldn't be determined, which might happen if the default | |
4782 face isn't realized and cannot be realized. */ | |
24995 | 4783 |
4784 int | |
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4785 lookup_named_face (f, symbol, signal_p) |
24995 | 4786 struct frame *f; |
4787 Lisp_Object symbol; | |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4788 int signal_p; |
24995 | 4789 { |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4790 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4791 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
24995 | 4792 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
4793 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4794 if (default_face == NULL) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4795 { |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4796 if (!realize_basic_faces (f)) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4797 return -1; |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4798 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
72170
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4799 if (default_face == NULL) |
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4800 abort (); /* realize_basic_faces must have set it up */ |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4801 } |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4802 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4803 if (! get_lface_attributes (f, symbol, symbol_attrs, signal_p, 0)) |
58439
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4804 return -1; |
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4805 |
24995 | 4806 bcopy (default_face->lface, attrs, sizeof attrs); |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4807 merge_face_vectors (f, symbol_attrs, attrs, 0); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4808 |
88907 | 4809 return lookup_face (f, attrs); |
24995 | 4810 } |
4811 | |
4812 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4813 /* Return the display face-id of the basic face who's canonical face-id |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4814 is FACE_ID. The return value will usually simply be FACE_ID, unless that |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4815 basic face has bee remapped via Vface_remapping_alist. This function is |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4816 conservative: if something goes wrong, it will simply return FACE_ID |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4817 rather than signal an error. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4818 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4819 int |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4820 lookup_basic_face (f, face_id) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4821 struct frame *f; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4822 int face_id; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4823 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4824 Lisp_Object name, mapping; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4825 int remapped_face_id; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4826 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4827 if (NILP (Vface_remapping_alist)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4828 return face_id; /* Nothing to do. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4829 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4830 switch (face_id) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4831 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4832 case DEFAULT_FACE_ID: name = Qdefault; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4833 case MODE_LINE_FACE_ID: name = Qmode_line; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4834 case MODE_LINE_INACTIVE_FACE_ID: name = Qmode_line_inactive; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4835 case HEADER_LINE_FACE_ID: name = Qheader_line; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4836 case TOOL_BAR_FACE_ID: name = Qtool_bar; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4837 case FRINGE_FACE_ID: name = Qfringe; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4838 case SCROLL_BAR_FACE_ID: name = Qscroll_bar; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4839 case BORDER_FACE_ID: name = Qborder; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4840 case CURSOR_FACE_ID: name = Qcursor; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4841 case MOUSE_FACE_ID: name = Qmouse; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4842 case MENU_FACE_ID: name = Qmenu; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4843 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4844 default: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4845 abort (); /* the caller is supposed to pass us a basic face id */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4846 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4847 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4848 /* Do a quick scan through Vface_remapping_alist, and return immediately |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4849 if there is no remapping for face NAME. This is just an optimization |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4850 for the very common no-remapping case. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4851 mapping = assq_no_quit (name, Vface_remapping_alist); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4852 if (NILP (mapping)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4853 return face_id; /* Give up. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4854 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4855 /* If there is a remapping entry, lookup the face using NAME, which will |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4856 handle the remapping too. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4857 remapped_face_id = lookup_named_face (f, name, 0); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4858 if (remapped_face_id < 0) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4859 return face_id; /* Give up. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4860 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4861 return remapped_face_id; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4862 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4863 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4864 |
24995 | 4865 /* Return the ID of the realized ASCII face of Lisp face with ID |
4866 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
4867 | |
4868 int | |
4869 ascii_face_of_lisp_face (f, lface_id) | |
4870 struct frame *f; | |
4871 int lface_id; | |
4872 { | |
4873 int face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4874 |
24995 | 4875 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
4876 { | |
4877 Lisp_Object face_name = lface_id_to_name[lface_id]; | |
90054
f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Miles Bader <miles@gnu.org>
diff
changeset
|
4878 face_id = lookup_named_face (f, face_name, 1); |
24995 | 4879 } |
4880 else | |
4881 face_id = -1; | |
4882 | |
4883 return face_id; | |
4884 } | |
4885 | |
4886 | |
4887 /* Return a face for charset ASCII that is like the face with id | |
4888 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
4889 STEPS < 0 means larger. Value is the id of the face. */ | |
4890 | |
4891 int | |
4892 smaller_face (f, face_id, steps) | |
4893 struct frame *f; | |
4894 int face_id, steps; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4895 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4896 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4897 struct face *face; |
4898 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
4899 int pt, last_pt, last_height; | |
4900 int delta; | |
4901 int new_face_id; | |
4902 struct face *new_face; | |
4903 | |
4904 /* If not called for an X frame, just return the original face. */ | |
4905 if (FRAME_TERMCAP_P (f)) | |
4906 return face_id; | |
4907 | |
4908 /* Try in increments of 1/2 pt. */ | |
4909 delta = steps < 0 ? 5 : -5; | |
85262 | 4910 steps = eabs (steps); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4911 |
24995 | 4912 face = FACE_FROM_ID (f, face_id); |
4913 bcopy (face->lface, attrs, sizeof attrs); | |
4914 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); | |
4915 new_face_id = face_id; | |
4916 last_height = FONT_HEIGHT (face->font); | |
4917 | |
4918 while (steps | |
4919 && pt + delta > 0 | |
4920 /* Give up if we cannot find a font within 10pt. */ | |
85262 | 4921 && eabs (last_pt - pt) < 100) |
24995 | 4922 { |
4923 /* Look up a face for a slightly smaller/larger font. */ | |
4924 pt += delta; | |
4925 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
88907 | 4926 new_face_id = lookup_face (f, attrs); |
24995 | 4927 new_face = FACE_FROM_ID (f, new_face_id); |
4928 | |
4929 /* 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
|
4930 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
|
4931 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
24995 | 4932 { |
4933 --steps; | |
4934 last_height = FONT_HEIGHT (new_face->font); | |
4935 last_pt = pt; | |
4936 } | |
4937 } | |
4938 | |
4939 return new_face_id; | |
4940 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4941 #else /* not HAVE_WINDOW_SYSTEM */ |
24995 | 4942 |
4943 return face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4944 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4945 #endif /* not HAVE_WINDOW_SYSTEM */ |
24995 | 4946 } |
4947 | |
4948 | |
4949 /* Return a face for charset ASCII that is like the face with id | |
4950 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
|
4951 |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
4952 int |
24995 | 4953 face_with_height (f, face_id, height) |
4954 struct frame *f; | |
4955 int face_id; | |
4956 int height; | |
4957 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4958 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4959 struct face *face; |
4960 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
4961 | |
4962 if (FRAME_TERMCAP_P (f) | |
4963 || height <= 0) | |
4964 return face_id; | |
4965 | |
4966 face = FACE_FROM_ID (f, face_id); | |
4967 bcopy (face->lface, attrs, sizeof attrs); | |
4968 attrs[LFACE_HEIGHT_INDEX] = make_number (height); | |
104079
40593ae49f6b
(face_with_height): Call font_clear_prop.
Kenichi Handa <handa@m17n.org>
parents:
103624
diff
changeset
|
4969 font_clear_prop (attrs, FONT_SIZE_INDEX); |
88907 | 4970 face_id = lookup_face (f, attrs); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4971 #endif /* HAVE_WINDOW_SYSTEM */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4972 |
24995 | 4973 return face_id; |
4974 } | |
4975 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4976 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4977 /* Return the face id of the realized face for named face SYMBOL on |
88907 | 4978 frame F suitable for displaying ASCII characters, and use |
4979 attributes of the face FACE_ID for attributes that aren't | |
4980 completely specified by SYMBOL. This is like lookup_named_face, | |
4981 except that the default attributes come from FACE_ID, not from the | |
4982 default face. FACE_ID 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
|
4983 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4984 int |
90128
13796b0653c7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
diff
changeset
|
4985 lookup_derived_face (f, symbol, face_id, signal_p) |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4986 struct frame *f; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4987 Lisp_Object symbol; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4988 int face_id; |
65713
ad24f42046b1
* xlwmenu.c (find_next_selectable):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65347
diff
changeset
|
4989 int signal_p; |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4990 { |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4991 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4992 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
|
4993 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
|
4994 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4995 if (!default_face) |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4996 abort (); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4997 |
97502
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4998 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p, 0)) |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4999 return -1; |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
5000 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5001 bcopy (default_face->lface, attrs, sizeof attrs); |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5002 merge_face_vectors (f, symbol_attrs, attrs, 0); |
88907 | 5003 return lookup_face (f, attrs); |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5004 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5005 |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5006 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
|
5007 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
|
5008 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
|
5009 (plist) |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5010 Lisp_Object plist; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5011 { |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5012 Lisp_Object lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5013 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
|
5014 Qunspecified); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5015 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
|
5016 1, 0); |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5017 return lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5018 } |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
5019 |
24995 | 5020 |
5021 | |
5022 /*********************************************************************** | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5023 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
|
5024 ***********************************************************************/ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5025 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5026 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5027 /* 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
|
5028 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
|
5029 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
|
5030 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5031 #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
|
5032 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5033 #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
|
5034 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5035 /* 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
|
5036 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
|
5037 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5038 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
|
5039 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
|
5040 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
|
5041 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5042 \(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
|
5043 \(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
|
5044 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5045 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
|
5046 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
|
5047 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
|
5048 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
|
5049 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
|
5050 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5051 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
|
5052 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5053 /* 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
|
5054 face. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5055 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
|
5056 && 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
|
5057 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
|
5058 || (!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
|
5059 && 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
|
5060 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
|
5061 || (!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
|
5062 && 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
|
5063 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
|
5064 || (!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
|
5065 && 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
|
5066 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
|
5067 || (!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
|
5068 && 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
|
5069 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
|
5070 || (!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
|
5071 && 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
|
5072 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
|
5073 || (!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
|
5074 && 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
|
5075 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
|
5076 || (!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
|
5077 && 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
|
5078 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
|
5079 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5080 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5081 /* 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
|
5082 "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
|
5083 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5084 || !UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5085 || !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
|
5086 || !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
|
5087 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5088 || !UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX])) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5089 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5090 int face_id; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5091 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
|
5092 Lisp_Object merged_attrs[LFACE_VECTOR_SIZE]; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5093 int i; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5094 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5095 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
|
5096 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
5097 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
|
5098 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5099 face_id = lookup_face (f, merged_attrs); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
5100 face = FACE_FROM_ID (f, face_id); |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5101 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5102 if (! face) |
63705
9e649a045c18
(x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
5103 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
|
5104 |
95471
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5105 /* If the font is the same, or no font is found, then not |
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5106 supported. */ |
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5107 if (face->font == def_face->font |
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
5108 || ! face->font) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5109 return 0; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5110 for (i = FONT_TYPE_INDEX; i <= FONT_SIZE_INDEX; i++) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5111 if (! EQ (face->font->props[i], def_face->font->props[i])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5112 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5113 Lisp_Object s1, s2; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5114 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5115 if (i < FONT_FOUNDRY_INDEX || i > FONT_REGISTRY_INDEX |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5116 || face->font->driver->case_sensitive) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5117 return 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5118 s1 = SYMBOL_NAME (face->font->props[i]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5119 s2 = SYMBOL_NAME (def_face->font->props[i]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5120 if (! EQ (Fcompare_strings (s1, make_number (0), Qnil, |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5121 s2, make_number (0), Qnil, Qt), Qt)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5122 return 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5123 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5124 return 0; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5125 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5126 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5127 /* 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
|
5128 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5129 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5130 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
5131 #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
|
5132 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5133 /* 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
|
5134 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
|
5135 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5136 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
|
5137 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
|
5138 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
|
5139 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5140 \(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
|
5141 \(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
|
5142 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 { |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5155 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 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
|
5161 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5162 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5163 /* 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
|
5164 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
|
5165 (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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 specifies. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5171 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5172 || !UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5173 || !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
|
5174 || !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
|
5175 || !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
|
5176 || !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
|
5177 || !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
|
5178 || !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
|
5179 || !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
|
5180 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5181 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5182 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5183 /* 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
|
5184 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5185 /* font weight (bold/dim) */ |
103228
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5186 val = attrs[LFACE_WEIGHT_INDEX]; |
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5187 if (!UNSPECIFIEDP (val) |
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5188 && (weight = FONT_WEIGHT_NAME_NUMERIC (val), weight >= 0)) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5189 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5190 int def_weight = FONT_WEIGHT_NAME_NUMERIC (def_attrs[LFACE_WEIGHT_INDEX]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5191 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5192 if (weight > 100) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5193 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5194 if (def_weight > 100) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5195 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
|
5196 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
|
5197 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5198 else if (weight < 100) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5199 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5200 if (def_weight < 100) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5201 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
|
5202 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
|
5203 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5204 else if (def_weight == 100) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5205 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
|
5206 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5207 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5208 /* underlining */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5209 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
|
5210 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
|
5211 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5212 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
|
5213 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
|
5214 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
|
5215 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
|
5216 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5217 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
|
5218 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5219 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5220 /* inverse video */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5221 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
|
5222 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
|
5223 { |
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5224 if (face_attr_equal_p (val, def_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
|
5225 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
|
5226 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5227 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
|
5228 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5229 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5230 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5231 /* Color testing. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5232 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5233 /* 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
|
5234 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
|
5235 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
|
5236 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
|
5237 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
|
5238 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5239 /* 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
|
5240 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
|
5241 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
|
5242 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5243 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
|
5244 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5245 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
|
5246 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
|
5247 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
|
5248 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
|
5249 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
|
5250 > 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
|
5251 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
|
5252 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5253 /* 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
|
5254 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5255 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
|
5256 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
|
5257 && (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
|
5258 <= 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
|
5259 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5260 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5261 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5262 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5263 /* 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
|
5264 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
|
5265 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
|
5266 { |
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5267 Lisp_Object def_bg = def_attrs[LFACE_BACKGROUND_INDEX]; |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5268 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5269 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
|
5270 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
|
5271 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
|
5272 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
|
5273 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
|
5274 > 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
|
5275 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
|
5276 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5277 /* 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
|
5278 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5279 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
|
5280 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
|
5281 && (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
|
5282 <= 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
|
5283 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5284 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5285 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5286 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5287 /* 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
|
5288 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
|
5289 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
|
5290 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
|
5291 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
|
5292 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5293 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
|
5294 = (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
|
5295 - 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
|
5296 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
|
5297 || 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
|
5298 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5299 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5300 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5301 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5302 /* 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
|
5303 given colors. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5304 if (test_caps != 0 && |
83145 | 5305 ! tty_capable_p (FRAME_TTY (f), test_caps, fg_tty_color.pixel, bg_tty_color.pixel)) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5306 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5307 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5308 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5309 /* 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
|
5310 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5311 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5312 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5313 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5314 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
|
5315 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
|
5316 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
|
5317 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
|
5318 The optional argument DISPLAY can be a display name, a frame, or |
63164
c4a3a3afa8ce
(Fdisplay_supports_face_attributes_p): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62969
diff
changeset
|
5319 nil (meaning the selected frame's display). |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5320 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5321 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
|
5322 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
|
5323 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
|
5324 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5325 \(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
|
5326 \(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
|
5327 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5328 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
|
5329 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
|
5330 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
|
5331 satisfied by the tty display code's automatic substitution of a `dim' |
63164
c4a3a3afa8ce
(Fdisplay_supports_face_attributes_p): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62969
diff
changeset
|
5332 face for italic. */) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5333 (attributes, display) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5334 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
|
5335 { |
74071
ea7f3c26d52b
(Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents:
73509
diff
changeset
|
5336 int supports = 0, i; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5337 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
|
5338 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
|
5339 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
|
5340 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
|
5341 |
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5342 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
|
5343 /* 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
|
5344 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
|
5345 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
|
5346 return Qnil; |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5347 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5348 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
|
5349 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
|
5350 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
|
5351 frame = display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5352 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5353 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5354 /* 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
|
5355 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
|
5356 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5357 frame = Qnil; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5358 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
|
5359 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5360 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
|
5361 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
|
5362 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
|
5363 display))) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5364 break; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5365 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5366 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5367 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5368 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
|
5369 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
|
5370 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5371 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
|
5372 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
|
5373 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
|
5374 |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5375 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
|
5376 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
|
5377 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5378 if (! realize_basic_faces (f)) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5379 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
|
5380 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
72170
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5381 if (def_face == NULL) |
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5382 abort (); /* realize_basic_faces must have set it up */ |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5383 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5384 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5385 /* 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
|
5386 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
|
5387 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
|
5388 #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
|
5389 else |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5390 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
|
5391 #endif |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5392 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5393 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
|
5394 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5395 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5396 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5397 /*********************************************************************** |
24995 | 5398 Font selection |
5399 ***********************************************************************/ | |
5400 | |
102232
7de4f0f549a4
(Finternal_set_font_selection_order): Remove leading whitespace that
Glenn Morris <rgm@gnu.org>
parents:
101292
diff
changeset
|
5401 DEFUN ("internal-set-font-selection-order", |
24995 | 5402 Finternal_set_font_selection_order, |
5403 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
|
5404 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
|
5405 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
|
5406 `:height', `:weight', and `:slant'. Face attributes appearing |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5407 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
|
5408 `: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
|
5409 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
|
5410 Value is ORDER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
5411 (order) |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5412 Lisp_Object order; |
24995 | 5413 { |
5414 Lisp_Object list; | |
5415 int i; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5416 int indices[DIM (font_sort_order)]; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5417 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5418 CHECK_LIST (order); |
24995 | 5419 bzero (indices, sizeof indices); |
5420 i = 0; | |
5421 | |
5422 for (list = order; | |
5423 CONSP (list) && i < DIM (indices); | |
5424 list = XCDR (list), ++i) | |
5425 { | |
5426 Lisp_Object attr = XCAR (list); | |
5427 int xlfd; | |
5428 | |
5429 if (EQ (attr, QCwidth)) | |
5430 xlfd = XLFD_SWIDTH; | |
5431 else if (EQ (attr, QCheight)) | |
5432 xlfd = XLFD_POINT_SIZE; | |
5433 else if (EQ (attr, QCweight)) | |
5434 xlfd = XLFD_WEIGHT; | |
5435 else if (EQ (attr, QCslant)) | |
5436 xlfd = XLFD_SLANT; | |
5437 else | |
5438 break; | |
5439 | |
5440 if (indices[i] != 0) | |
5441 break; | |
5442 indices[i] = xlfd; | |
5443 } | |
5444 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5445 if (!NILP (list) || i != DIM (indices)) |
24995 | 5446 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
|
5447 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
|
5448 if (indices[i] == 0) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5449 signal_error ("Invalid font sort order", order); |
24995 | 5450 |
5451 if (bcmp (indices, font_sort_order, sizeof indices) != 0) | |
5452 { | |
5453 bcopy (indices, font_sort_order, sizeof font_sort_order); | |
5454 free_all_realized_faces (Qnil); | |
5455 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5456 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5457 font_update_sort_order (font_sort_order); |
90414 | 5458 |
24995 | 5459 return Qnil; |
5460 } | |
5461 | |
5462 | |
5463 DEFUN ("internal-set-alternative-font-family-alist", | |
5464 Finternal_set_alternative_font_family_alist, | |
5465 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
|
5466 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
|
5467 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5468 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
|
5469 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
|
5470 (alist) |
24995 | 5471 Lisp_Object alist; |
5472 { | |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5473 Lisp_Object entry, tail, tail2; |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5474 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5475 CHECK_LIST (alist); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5476 alist = Fcopy_sequence (alist); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5477 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5478 { |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5479 entry = XCAR (tail); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5480 CHECK_LIST (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5481 entry = Fcopy_sequence (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5482 XSETCAR (tail, entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5483 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5484 XSETCAR (tail2, Fintern (XCAR (tail2), Qnil)); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5485 } |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5486 |
24995 | 5487 Vface_alternative_font_family_alist = alist; |
5488 free_all_realized_faces (Qnil); | |
5489 return alist; | |
5490 } | |
5491 | |
5492 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5493 DEFUN ("internal-set-alternative-font-registry-alist", |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5494 Finternal_set_alternative_font_registry_alist, |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5495 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
|
5496 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
|
5497 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5498 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
|
5499 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
|
5500 (alist) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5501 Lisp_Object alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5502 { |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5503 Lisp_Object entry, tail, tail2; |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5504 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5505 CHECK_LIST (alist); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5506 alist = Fcopy_sequence (alist); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5507 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5508 { |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5509 entry = XCAR (tail); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5510 CHECK_LIST (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5511 entry = Fcopy_sequence (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5512 XSETCAR (tail, entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5513 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5514 XSETCAR (tail2, Fdowncase (XCAR (tail2))); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5515 } |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5516 Vface_alternative_font_registry_alist = alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5517 free_all_realized_faces (Qnil); |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5518 return alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5519 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5520 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5521 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5522 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5523 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5524 /* 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
|
5525 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5526 #define FONT_POINT_SIZE_QUANTUM 5 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5527 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5528 /* 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
|
5529 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
|
5530 attribute of ATTRS doesn't name a fontset. */ |
24995 | 5531 |
5532 static int | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5533 face_fontset (attrs) |
24995 | 5534 Lisp_Object *attrs; |
5535 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5536 Lisp_Object name; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5537 |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
5538 name = attrs[LFACE_FONTSET_INDEX]; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5539 if (!STRINGP (name)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5540 return -1; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5541 return fs_query_fontset (name, 0); |
24995 | 5542 } |
5543 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5544 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5545 |
5546 | |
5547 | |
5548 /*********************************************************************** | |
5549 Face Realization | |
5550 ***********************************************************************/ | |
5551 | |
5552 /* Realize basic faces on frame F. Value is zero if frame parameters | |
5553 of F don't contain enough information needed to realize the default | |
5554 face. */ | |
5555 | |
5556 static int | |
5557 realize_basic_faces (f) | |
2342 | 5558 struct frame *f; |
24995 | 5559 { |
5560 int success_p = 0; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
5561 int count = SPECPDL_INDEX (); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5562 |
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
5563 /* 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
|
5564 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
|
5565 BLOCK_INPUT; |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5566 specbind (Qscalable_fonts_allowed, Qt); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5567 |
24995 | 5568 if (realize_default_face (f)) |
5569 { | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
5570 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
|
5571 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
|
5572 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
41129 | 5573 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
25546 | 5574 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
|
5575 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
|
5576 realize_named_face (f, Qborder, BORDER_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5577 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5578 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
|
5579 realize_named_face (f, Qmenu, MENU_FACE_ID); |
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63642
diff
changeset
|
5580 realize_named_face (f, Qvertical_border, VERTICAL_BORDER_FACE_ID); |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5581 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5582 /* 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
|
5583 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
|
5584 { |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5585 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
|
5586 #ifdef USE_X_TOOLKIT |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82984
diff
changeset
|
5587 if (FRAME_WINDOW_P (f)) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82984
diff
changeset
|
5588 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
|
5589 #endif |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5590 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5591 |
24995 | 5592 success_p = 1; |
5593 } | |
5594 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5595 unbind_to (count, Qnil); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5596 UNBLOCK_INPUT; |
24995 | 5597 return success_p; |
5598 } | |
5599 | |
5600 | |
5601 /* Realize the default face on frame F. If the face is not fully | |
5602 specified, make it fully-specified. Attributes of the default face | |
5603 that are not explicitly specified are taken from frame parameters. */ | |
5604 | |
5605 static int | |
5606 realize_default_face (f) | |
5607 struct frame *f; | |
5608 { | |
5609 struct face_cache *c = FRAME_FACE_CACHE (f); | |
5610 Lisp_Object lface; | |
5611 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5612 struct face *face; | |
5613 | |
5614 /* If the `default' face is not yet known, create it. */ | |
5615 lface = lface_from_face_name (f, Qdefault, 0); | |
5616 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
|
5617 { |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5618 Lisp_Object frame; |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5619 XSETFRAME (frame, f); |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5620 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
|
5621 } |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5622 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5623 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5624 if (FRAME_WINDOW_P (f)) |
24995 | 5625 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5626 Lisp_Object font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5627 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5628 XSETFONT (font_object, FRAME_FONT (f)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5629 set_lface_from_font (f, lface, font_object, f->default_face_done_p); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5630 LFACE_FONTSET (lface) = fontset_name (FRAME_FONTSET (f)); |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51500
diff
changeset
|
5631 f->default_face_done_p = 1; |
24995 | 5632 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5633 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5634 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5635 if (!FRAME_WINDOW_P (f)) |
24995 | 5636 { |
5637 LFACE_FAMILY (lface) = build_string ("default"); | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5638 LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface); |
24995 | 5639 LFACE_SWIDTH (lface) = Qnormal; |
5640 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
|
5641 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
|
5642 LFACE_WEIGHT (lface) = Qnormal; |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
5643 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
|
5644 LFACE_SLANT (lface) = Qnormal; |
96027
6aa4148ea6bc
(realize_default_face): If the frame is not on window
Kenichi Handa <handa@m17n.org>
parents:
96019
diff
changeset
|
5645 if (UNSPECIFIEDP (LFACE_FONTSET (lface))) |
6aa4148ea6bc
(realize_default_face): If the frame is not on window
Kenichi Handa <handa@m17n.org>
parents:
96019
diff
changeset
|
5646 LFACE_FONTSET (lface) = Qnil; |
24995 | 5647 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5648 |
24995 | 5649 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
5650 LFACE_UNDERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5651 |
24995 | 5652 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
5653 LFACE_OVERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5654 |
24995 | 5655 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
5656 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5657 |
24995 | 5658 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
5659 LFACE_BOX (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5660 |
24995 | 5661 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
5662 LFACE_INVERSE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5663 |
24995 | 5664 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
5665 { | |
5666 /* This function is called so early that colors are not yet | |
5667 set in the frame parameter list. */ | |
5668 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
|
5669 |
24995 | 5670 if (CONSP (color) && STRINGP (XCDR (color))) |
5671 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
|
5672 else if (FRAME_WINDOW_P (f)) |
24995 | 5673 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5674 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
5675 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
|
5676 else |
24995 | 5677 abort (); |
5678 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5679 |
24995 | 5680 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
5681 { | |
5682 /* This function is called so early that colors are not yet | |
5683 set in the frame parameter list. */ | |
5684 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
5685 if (CONSP (color) && STRINGP (XCDR (color))) | |
5686 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
|
5687 else if (FRAME_WINDOW_P (f)) |
24995 | 5688 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5689 else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
5690 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
|
5691 else |
24995 | 5692 abort (); |
5693 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5694 |
24995 | 5695 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
5696 LFACE_STIPPLE (lface) = Qnil; | |
5697 | |
5698 /* Realize the face; it must be fully-specified now. */ | |
5699 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
5700 check_lface (lface); | |
5701 bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); | |
88907 | 5702 face = realize_face (c, attrs, DEFAULT_FACE_ID); |
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5703 |
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5704 #ifdef HAVE_WINDOW_SYSTEM |
70795
1d1c6a83c277
(best_matching_font): Fix crash in 2006-05-17 change.
Kim F. Storm <storm@cua.dk>
parents:
70699
diff
changeset
|
5705 #ifdef HAVE_X_WINDOWS |
83519
717426715b03
Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents:
83518
diff
changeset
|
5706 if (FRAME_X_P (f) && face->font != FRAME_FONT (f)) |
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5707 { |
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5708 /* This can happen when making a frame on a display that does |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5709 not support the default font. */ |
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5710 if (!face->font) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5711 return 0; |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
5712 |
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5713 /* Otherwise, the font specified for the frame was not |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5714 acceptable as a font for the default face (perhaps because |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5715 auto-scaled fonts are rejected), so we must adjust the frame |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5716 font. */ |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5717 x_set_font (f, LFACE_FONT (lface), Qnil); |
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5718 } |
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5719 #endif /* HAVE_X_WINDOWS */ |
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5720 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5721 return 1; |
5722 } | |
5723 | |
5724 | |
5725 /* Realize basic faces other than the default face in face cache C. | |
5726 SYMBOL is the face name, ID is the face id the realized face must | |
5727 have. The default face must have been realized already. */ | |
5728 | |
5729 static void | |
5730 realize_named_face (f, symbol, id) | |
5731 struct frame *f; | |
5732 Lisp_Object symbol; | |
5733 int id; | |
5734 { | |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5735 struct face_cache *c = FRAME_FACE_CACHE (f); |
24995 | 5736 Lisp_Object lface = lface_from_face_name (f, symbol, 0); |
5737 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5738 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5739 struct face *new_face; |
24995 | 5740 |
5741 /* The default face must exist and be fully specified. */ | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
5742 get_lface_attributes_no_remap (f, Qdefault, attrs, 1); |
24995 | 5743 check_lface_attrs (attrs); |
5744 xassert (lface_fully_specified_p (attrs)); | |
5745 | |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5746 /* If SYMBOL isn't know as a face, create it. */ |
24995 | 5747 if (NILP (lface)) |
5748 { | |
5749 Lisp_Object frame; | |
5750 XSETFRAME (frame, f); | |
5751 lface = Finternal_make_lisp_face (symbol, frame); | |
5752 } | |
5753 | |
5754 /* Merge SYMBOL's face with the default face. */ | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
5755 get_lface_attributes_no_remap (f, symbol, symbol_attrs, 1); |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5756 merge_face_vectors (f, symbol_attrs, attrs, 0); |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5757 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5758 /* Realize the face. */ |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5759 new_face = realize_face (c, attrs, id); |
24995 | 5760 } |
5761 | |
5762 | |
5763 /* Realize the fully-specified face with attributes ATTRS in face | |
88907 | 5764 cache CACHE for ASCII characters. If FORMER_FACE_ID is |
5765 non-negative, it is an ID of face to remove before caching the new | |
5766 face. Value is a pointer to the newly created realized face. */ | |
24995 | 5767 |
5768 static struct face * | |
88907 | 5769 realize_face (cache, attrs, former_face_id) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5770 struct face_cache *cache; |
24995 | 5771 Lisp_Object *attrs; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5772 int former_face_id; |
24995 | 5773 { |
5774 struct face *face; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5775 |
24995 | 5776 /* LFACE must be fully specified. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5777 xassert (cache != NULL); |
24995 | 5778 check_lface_attrs (attrs); |
5779 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5780 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
|
5781 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5782 /* Remove the former face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5783 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
|
5784 uncache_face (cache, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5785 free_realized_face (cache->f, former_face); |
109301
d7201a19a376
* xfaces.c (realize_face): Garbage the frame if a face is removed
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
5786 SET_FRAME_GARBAGED (cache->f); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5787 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5788 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5789 if (FRAME_WINDOW_P (cache->f)) |
88907 | 5790 face = realize_x_face (cache, attrs); |
35443 | 5791 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
88907 | 5792 face = realize_tty_face (cache, attrs); |
83021
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5793 else if (FRAME_INITIAL_P (cache->f)) |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5794 { |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5795 /* Create a dummy face. */ |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5796 face = make_realized_face (attrs); |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5797 } |
24995 | 5798 else |
5799 abort (); | |
5800 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5801 /* Insert the new face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5802 cache_face (cache, face, lface_hash (attrs)); |
88907 | 5803 return face; |
5804 } | |
5805 | |
5806 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5807 #ifdef HAVE_WINDOW_SYSTEM |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5808 /* Realize the fully-specified face that uses FONT-OBJECT and has the |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5809 same attributes as BASE_FACE except for the font on frame F. |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5810 FONT-OBJECT may be nil, in which case, realized a face of |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5811 no-font. */ |
88907 | 5812 |
5813 static struct face * | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5814 realize_non_ascii_face (f, font_object, base_face) |
88907 | 5815 struct frame *f; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5816 Lisp_Object font_object; |
88907 | 5817 struct face *base_face; |
5818 { | |
5819 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
89483 | 5820 struct face *face; |
88907 | 5821 |
5822 face = (struct face *) xmalloc (sizeof *face); | |
5823 *face = *base_face; | |
5824 face->gc = 0; | |
90526
af0b00c37c9b
* xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
90519
diff
changeset
|
5825 face->extra = NULL; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5826 face->overstrike |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5827 = (! NILP (font_object) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5828 && FONT_WEIGHT_NAME_NUMERIC (face->lface[LFACE_WEIGHT_INDEX]) > 100 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5829 && FONT_WEIGHT_NUMERIC (font_object) <= 100); |
88907 | 5830 |
5831 /* Don't try to free the colors copied bitwise from BASE_FACE. */ | |
5832 face->colors_copied_bitwise_p = 1; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5833 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object); |
88907 | 5834 face->gc = 0; |
5835 | |
5836 cache_face (cache, face, face->hash); | |
5837 | |
24995 | 5838 return face; |
5839 } | |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
5840 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5841 |
5842 | |
5843 /* Realize the fully-specified face with attributes ATTRS in face | |
88907 | 5844 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If |
5845 the new face doesn't share font with the default face, a fontname | |
5846 is allocated from the heap and set in `font_name' of the new face, | |
5847 but it is not yet loaded here. Value is a pointer to the newly | |
5848 created realized face. */ | |
24995 | 5849 |
5850 static struct face * | |
88907 | 5851 realize_x_face (cache, attrs) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5852 struct face_cache *cache; |
24995 | 5853 Lisp_Object *attrs; |
5854 { | |
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5855 struct face *face = NULL; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5856 #ifdef HAVE_WINDOW_SYSTEM |
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5857 struct face *default_face; |
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
5858 struct frame *f; |
24995 | 5859 Lisp_Object stipple, overline, strike_through, box; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5860 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5861 xassert (FRAME_WINDOW_P (cache->f)); |
24995 | 5862 |
5863 /* Allocate a new realized face. */ | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5864 face = make_realized_face (attrs); |
88907 | 5865 face->ascii_face = face; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5866 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5867 f = cache->f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5868 |
24995 | 5869 /* Determine the font to use. Most of the time, the font will be |
5870 the same as the font of the default face, so try that first. */ | |
5871 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
5872 if (default_face | |
5873 && lface_same_font_attributes_p (default_face->lface, attrs)) | |
5874 { | |
5875 face->font = default_face->font; | |
95567
4170d7f0d918
(realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents:
95471
diff
changeset
|
5876 face->fontset |
4170d7f0d918
(realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents:
95471
diff
changeset
|
5877 = make_fontset_for_ascii_face (f, default_face->fontset, face); |
24995 | 5878 } |
5879 else | |
5880 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5881 /* 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
|
5882 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
|
5883 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
|
5884 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
|
5885 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
|
5886 are constructed from ATTRS. */ |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5887 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
|
5888 |
88907 | 5889 /* If we are realizing the default face, ATTRS should specify a |
5890 fontset. In other words, if FONTSET is -1, we are not | |
5891 realizing the default face, thus the default face should have | |
5892 already been realized. */ | |
5893 if (fontset == -1) | |
100102
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5894 { |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5895 if (default_face) |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5896 fontset = default_face->fontset; |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5897 if (fontset == -1) |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5898 abort (); |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5899 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5900 if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5901 attrs[LFACE_FONT_INDEX] |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5902 = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5903 if (FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5904 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5905 face->font = XFONT_OBJECT (attrs[LFACE_FONT_INDEX]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5906 face->fontset = make_fontset_for_ascii_face (f, fontset, face); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5907 } |
90414 | 5908 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5909 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5910 face->font = NULL; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5911 face->fontset = -1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5912 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5913 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5914 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5915 if (face->font |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5916 && FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]) > 100 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5917 && FONT_WEIGHT_NUMERIC (attrs[LFACE_FONT_INDEX]) <= 100) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5918 face->overstrike = 1; |
24995 | 5919 |
5920 /* Load colors, and set remaining attributes. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5921 |
24995 | 5922 load_face_colors (f, face, attrs); |
5923 | |
5924 /* Set up box. */ | |
5925 box = attrs[LFACE_BOX_INDEX]; | |
5926 if (STRINGP (box)) | |
5927 { | |
5928 /* A simple box of line width 1 drawn in color given by | |
5929 the string. */ | |
5930 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
5931 LFACE_BOX_INDEX); | |
5932 face->box = FACE_SIMPLE_BOX; | |
5933 face->box_line_width = 1; | |
5934 } | |
5935 else if (INTEGERP (box)) | |
5936 { | |
5937 /* Simple box of specified line width in foreground color of the | |
5938 face. */ | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5939 xassert (XINT (box) != 0); |
24995 | 5940 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
|
5941 face->box_line_width = XINT (box); |
24995 | 5942 face->box_color = face->foreground; |
5943 face->box_color_defaulted_p = 1; | |
5944 } | |
5945 else if (CONSP (box)) | |
5946 { | |
5947 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
5948 being one of `raised' or `sunken'. */ | |
5949 face->box = FACE_SIMPLE_BOX; | |
5950 face->box_color = face->foreground; | |
5951 face->box_color_defaulted_p = 1; | |
5952 face->box_line_width = 1; | |
5953 | |
5954 while (CONSP (box)) | |
5955 { | |
5956 Lisp_Object keyword, value; | |
5957 | |
5958 keyword = XCAR (box); | |
5959 box = XCDR (box); | |
5960 | |
5961 if (!CONSP (box)) | |
5962 break; | |
5963 value = XCAR (box); | |
5964 box = XCDR (box); | |
5965 | |
5966 if (EQ (keyword, QCline_width)) | |
5967 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5968 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
|
5969 face->box_line_width = XINT (value); |
24995 | 5970 } |
5971 else if (EQ (keyword, QCcolor)) | |
5972 { | |
5973 if (STRINGP (value)) | |
5974 { | |
5975 face->box_color = load_color (f, face, value, | |
5976 LFACE_BOX_INDEX); | |
5977 face->use_box_color_for_shadows_p = 1; | |
5978 } | |
5979 } | |
5980 else if (EQ (keyword, QCstyle)) | |
5981 { | |
5982 if (EQ (value, Qreleased_button)) | |
5983 face->box = FACE_RAISED_BOX; | |
5984 else if (EQ (value, Qpressed_button)) | |
5985 face->box = FACE_SUNKEN_BOX; | |
5986 } | |
5987 } | |
5988 } | |
5989 | |
5990 /* Text underline, overline, strike-through. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5991 |
24995 | 5992 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5993 { |
24995 | 5994 /* Use default color (same as foreground color). */ |
5995 face->underline_p = 1; | |
5996 face->underline_defaulted_p = 1; | |
5997 face->underline_color = 0; | |
5998 } | |
5999 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
6000 { | |
6001 /* Use specified color. */ | |
6002 face->underline_p = 1; | |
6003 face->underline_defaulted_p = 0; | |
6004 face->underline_color | |
6005 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
6006 LFACE_UNDERLINE_INDEX); | |
6007 } | |
6008 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
6009 { | |
6010 face->underline_p = 0; | |
6011 face->underline_defaulted_p = 0; | |
6012 face->underline_color = 0; | |
6013 } | |
6014 | |
6015 overline = attrs[LFACE_OVERLINE_INDEX]; | |
6016 if (STRINGP (overline)) | |
6017 { | |
6018 face->overline_color | |
6019 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
6020 LFACE_OVERLINE_INDEX); | |
6021 face->overline_p = 1; | |
6022 } | |
6023 else if (EQ (overline, Qt)) | |
6024 { | |
6025 face->overline_color = face->foreground; | |
6026 face->overline_color_defaulted_p = 1; | |
6027 face->overline_p = 1; | |
6028 } | |
6029 | |
6030 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
6031 if (STRINGP (strike_through)) | |
6032 { | |
6033 face->strike_through_color | |
6034 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
6035 LFACE_STRIKE_THROUGH_INDEX); | |
6036 face->strike_through_p = 1; | |
6037 } | |
6038 else if (EQ (strike_through, Qt)) | |
6039 { | |
6040 face->strike_through_color = face->foreground; | |
6041 face->strike_through_color_defaulted_p = 1; | |
6042 face->strike_through_p = 1; | |
6043 } | |
6044 | |
6045 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
6046 if (!NILP (stipple)) | |
6047 face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h); | |
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
6048 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 6049 |
6050 return face; | |
6051 } | |
6052 | |
6053 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6054 /* 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
|
6055 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
|
6056 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
|
6057 default foreground/background colors. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6058 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6059 static void |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6060 map_tty_color (f, face, idx, defaulted) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6061 struct frame *f; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6062 struct face *face; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6063 enum lface_attribute_index idx; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6064 int *defaulted; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6065 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6066 Lisp_Object frame, color, def; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6067 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6068 unsigned long default_pixel, default_other_pixel, pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6069 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6070 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
|
6071 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6072 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6073 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6074 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6075 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6076 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6077 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6078 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6079 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6080 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6081 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6082 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6083 XSETFRAME (frame, f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6084 color = face->lface[idx]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
6085 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6086 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
|
6087 && SCHARS (color) |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6088 && CONSP (Vtty_defined_color_alist) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6089 && (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
|
6090 CONSP (def))) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6091 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6092 /* 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
|
6093 (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
|
6094 pixel = XINT (XCAR (XCDR (def))); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6095 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6096 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6097 if (pixel == default_pixel && STRINGP (color)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6098 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6099 pixel = load_color (f, face, color, idx); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6100 |
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6101 #ifdef MSDOS |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6102 /* 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
|
6103 use the foreground color defined by the frame. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6104 if (FRAME_MSDOS_P (f)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6105 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6106 if (pixel == default_pixel |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6107 || pixel == FACE_TTY_DEFAULT_COLOR) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6108 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6109 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6110 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6111 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6112 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6113 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6114 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6115 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6116 else if (pixel == default_other_pixel) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6117 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6118 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6119 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6120 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6121 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6122 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6123 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6124 } |
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6125 } |
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
6126 #endif /* MSDOS */ |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6127 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6128 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6129 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6130 face->foreground = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6131 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6132 face->background = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6133 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6134 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6135 |
24995 | 6136 /* Realize the fully-specified face with attributes ATTRS in face |
88907 | 6137 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f. |
6138 Value is a pointer to the newly created realized face. */ | |
24995 | 6139 |
6140 static struct face * | |
88907 | 6141 realize_tty_face (cache, attrs) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6142 struct face_cache *cache; |
24995 | 6143 Lisp_Object *attrs; |
6144 { | |
6145 struct face *face; | |
6146 int weight, slant; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6147 int face_colors_defaulted = 0; |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6148 struct frame *f = cache->f; |
24995 | 6149 |
6150 /* Frame must be a termcap frame. */ | |
35443 | 6151 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
|
6152 |
24995 | 6153 /* Allocate a new realized face. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6154 face = make_realized_face (attrs); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6155 #if 0 |
35443 | 6156 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty"; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6157 #endif |
24995 | 6158 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6159 /* Map face attributes to TTY appearances. We map slant to |
24995 | 6160 dimmed text because we want italic text to appear differently |
6161 and because dimmed text is probably used infrequently. */ | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6162 weight = FONT_WEIGHT_NAME_NUMERIC (attrs[LFACE_WEIGHT_INDEX]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6163 slant = FONT_SLANT_NAME_NUMERIC (attrs[LFACE_SLANT_INDEX]); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6164 if (weight > 100) |
24995 | 6165 face->tty_bold_p = 1; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6166 if (weight < 100 || slant != 100) |
24995 | 6167 face->tty_dim_p = 1; |
6168 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
6169 face->tty_underline_p = 1; | |
6170 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
6171 face->tty_reverse_p = 1; | |
6172 | |
6173 /* Map color names to color indices. */ | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6174 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
|
6175 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
|
6176 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6177 /* 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
|
6178 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
|
6179 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
|
6180 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
|
6181 { |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6182 unsigned long tem = face->foreground; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6183 face->foreground = face->background; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6184 face->background = tem; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6185 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
6186 |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6187 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
|
6188 && face->tty_bold_p |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6189 && 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
|
6190 && 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
|
6191 face->tty_bold_p = 0; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6192 |
24995 | 6193 return face; |
6194 } | |
6195 | |
6196 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6197 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
|
6198 Ftty_suppress_bold_inverse_default_colors, |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6199 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
|
6200 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
|
6201 SUPPRESS non-nil means suppress it. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6202 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
|
6203 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
|
6204 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
|
6205 is non-nil. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6206 (suppress) |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6207 Lisp_Object suppress; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6208 { |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6209 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
|
6210 ++face_change_count; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6211 return suppress; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6212 } |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6213 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6214 |
24995 | 6215 |
6216 /*********************************************************************** | |
6217 Computing Faces | |
6218 ***********************************************************************/ | |
6219 | |
6220 /* Return the ID of the face to use to display character CH with face | |
6221 property PROP on frame F in current_buffer. */ | |
6222 | |
6223 int | |
6224 compute_char_face (f, ch, prop) | |
6225 struct frame *f; | |
6226 int ch; | |
6227 Lisp_Object prop; | |
6228 { | |
6229 int face_id; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6230 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6231 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
|
6232 ch = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6233 |
24995 | 6234 if (NILP (prop)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6235 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6236 struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
89701
a1d897828f2f
(compute_char_face): Call FACE_FOR_CHAR with POS and OBJECT args.
Kenichi Handa <handa@m17n.org>
parents:
89620
diff
changeset
|
6237 face_id = FACE_FOR_CHAR (f, face, ch, -1, Qnil); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6238 } |
24995 | 6239 else |
6240 { | |
6241 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6242 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
6243 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
|
6244 merge_face_ref (f, prop, attrs, 1, 0); |
88907 | 6245 face_id = lookup_face (f, attrs); |
24995 | 6246 } |
6247 | |
6248 return face_id; | |
6249 } | |
6250 | |
6251 /* Return the face ID associated with buffer position POS for | |
6252 displaying ASCII characters. Return in *ENDPTR the position at | |
6253 which a different face is needed, as far as text properties and | |
6254 overlays are concerned. W is a window displaying current_buffer. | |
6255 | |
6256 REGION_BEG, REGION_END delimit the region, so it can be | |
6257 highlighted. | |
6258 | |
6259 LIMIT is a position not to scan beyond. That is to limit the time | |
6260 this function can take. | |
6261 | |
6262 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
6263 | |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6264 BASE_FACE_ID, if non-negative, specifies a base face id to use |
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6265 instead of DEFAULT_FACE_ID. |
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6266 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6267 The face returned is suitable for displaying ASCII characters. */ |
24995 | 6268 |
6269 int | |
6270 face_at_buffer_position (w, pos, region_beg, region_end, | |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6271 endptr, limit, mouse, base_face_id) |
2391 | 6272 struct window *w; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6273 EMACS_INT pos; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6274 EMACS_INT region_beg, region_end; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6275 EMACS_INT *endptr; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6276 EMACS_INT limit; |
6615
96ddf85642d1
(compute_char_face): New arg MOUSE.
Richard M. Stallman <rms@gnu.org>
parents:
5858
diff
changeset
|
6277 int mouse; |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6278 int base_face_id; |
2342 | 6279 { |
24995 | 6280 struct frame *f = XFRAME (w->frame); |
6281 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
|
6282 Lisp_Object prop, position; |
24995 | 6283 int i, noverlays; |
2342 | 6284 Lisp_Object *overlay_vec; |
2391 | 6285 Lisp_Object frame; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6286 EMACS_INT endpos; |
24995 | 6287 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
6288 Lisp_Object limit1, end; | |
6289 struct face *default_face; | |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6290 |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6291 /* 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
|
6292 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
|
6293 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
2391 | 6294 |
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
6295 XSETFRAME (frame, f); |
24995 | 6296 XSETFASTINT (position, pos); |
2342 | 6297 |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6298 endpos = ZV; |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6299 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
|
6300 endpos = region_beg; |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6301 |
24995 | 6302 /* Get the `face' or `mouse_face' text property at POS, and |
6303 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
|
6304 prop = Fget_text_property (position, propname, w->buffer); |
24995 | 6305 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
6306 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
6307 if (INTEGERP (end)) | |
6308 endpos = XINT (end); | |
6309 | |
6310 /* 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
|
6311 { |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
6312 EMACS_INT next_overlay; |
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6313 |
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6314 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
|
6315 if (next_overlay < endpos) |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6316 endpos = next_overlay; |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6317 } |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6318 |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6319 *endptr = endpos; |
2342 | 6320 |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6321 default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id |
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6322 : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID |
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6323 : lookup_basic_face (f, DEFAULT_FACE_ID)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6324 |
24995 | 6325 /* Optimize common cases where we can use the default face. */ |
6326 if (noverlays == 0 | |
6327 && NILP (prop) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6328 && !(pos >= region_beg && pos < region_end)) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6329 return default_face->id; |
24995 | 6330 |
6331 /* Begin with attributes from the default face. */ | |
6332 bcopy (default_face->lface, attrs, sizeof attrs); | |
6333 | |
6334 /* Merge in attributes specified via text properties. */ | |
6335 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
|
6336 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 6337 |
6338 /* 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
|
6339 noverlays = sort_overlays (overlay_vec, noverlays, w); |
2342 | 6340 for (i = 0; i < noverlays; i++) |
6341 { | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6342 Lisp_Object oend; |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6343 int oendpos; |
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
6344 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6345 prop = Foverlay_get (overlay_vec[i], propname); |
24995 | 6346 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
|
6347 merge_face_ref (f, prop, attrs, 1, 0); |
2342 | 6348 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6349 oend = OVERLAY_END (overlay_vec[i]); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6350 oendpos = OVERLAY_POSITION (oend); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6351 if (oendpos < endpos) |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6352 endpos = oendpos; |
2342 | 6353 } |
6354 | |
24995 | 6355 /* 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
|
6356 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
|
6357 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6358 merge_named_face (f, Qregion, attrs, 0); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6359 |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6360 if (region_end < endpos) |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6361 endpos = region_end; |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6362 } |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6363 |
2342 | 6364 *endptr = endpos; |
6365 | |
24995 | 6366 /* 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
|
6367 or realize a new one for ASCII characters. */ |
88907 | 6368 return lookup_face (f, attrs); |
2342 | 6369 } |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6370 |
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6371 /* Return the face ID at buffer position POS for displaying ASCII |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6372 characters associated with overlay strings for overlay OVERLAY. |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6373 |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6374 Like face_at_buffer_position except for OVERLAY. Currently it |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6375 simply disregards the `face' properties of all overlays. */ |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6376 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6377 int |
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6378 face_for_overlay_string (w, pos, region_beg, region_end, |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6379 endptr, limit, mouse, overlay) |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6380 struct window *w; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6381 EMACS_INT pos; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6382 EMACS_INT region_beg, region_end; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6383 EMACS_INT *endptr; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6384 EMACS_INT limit; |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6385 int mouse; |
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6386 Lisp_Object overlay; |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6387 { |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6388 struct frame *f = XFRAME (w->frame); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6389 Lisp_Object attrs[LFACE_VECTOR_SIZE]; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6390 Lisp_Object prop, position; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6391 Lisp_Object frame; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6392 int endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6393 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6394 Lisp_Object limit1, end; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6395 struct face *default_face; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6396 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6397 /* W must display the current buffer. We could write this function |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6398 to use the frame and buffer of W, but right now it doesn't. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6399 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6400 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6401 XSETFRAME (frame, f); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6402 XSETFASTINT (position, pos); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6403 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6404 endpos = ZV; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6405 if (pos < region_beg && region_beg < endpos) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6406 endpos = region_beg; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6407 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6408 /* Get the `face' or `mouse_face' text property at POS, and |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6409 determine the next position at which the property changes. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6410 prop = Fget_text_property (position, propname, w->buffer); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6411 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6412 end = Fnext_single_property_change (position, propname, w->buffer, limit1); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6413 if (INTEGERP (end)) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6414 endpos = XINT (end); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6415 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6416 *endptr = endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6417 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6418 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6419 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6420 /* Optimize common cases where we can use the default face. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6421 if (NILP (prop) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6422 && !(pos >= region_beg && pos < region_end)) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6423 return DEFAULT_FACE_ID; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6424 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6425 /* Begin with attributes from the default face. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6426 bcopy (default_face->lface, attrs, sizeof attrs); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6427 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6428 /* Merge in attributes specified via text properties. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6429 if (!NILP (prop)) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6430 merge_face_ref (f, prop, attrs, 1, 0); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6431 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6432 /* If in the region, merge in the region face. */ |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6433 if (pos >= region_beg && pos < region_end) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6434 { |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6435 merge_named_face (f, Qregion, attrs, 0); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6436 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6437 if (region_end < endpos) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6438 endpos = region_end; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6439 } |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6440 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6441 *endptr = endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6442 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6443 /* Look up a realized face with the given face attributes, |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6444 or realize a new one for ASCII characters. */ |
91087
66f982c3b25e
(face_for_overlay_string): Call lookup_face with
Kenichi Handa <handa@m17n.org>
parents:
91085
diff
changeset
|
6445 return lookup_face (f, attrs); |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6446 } |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6447 |
24995 | 6448 |
6449 /* 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
|
6450 window W, for ASCII characters. |
24995 | 6451 |
6452 If STRING is an overlay string, it comes from position BUFPOS in | |
6453 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
6454 not an overlay string. W must display the current buffer. | |
6455 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
|
6456 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
|
6457 |
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
6458 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
|
6459 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
|
6460 |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6461 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
|
6462 |
24995 | 6463 Set *ENDPTR to the next position where to check for faces in |
6464 STRING; -1 if the face is constant from POS to the end of the | |
6465 string. | |
6466 | |
6467 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
|
6468 for displaying ASCII characters. */ |
24995 | 6469 |
6470 int | |
6471 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
|
6472 region_end, endptr, base_face_id, mouse_p) |
24995 | 6473 struct window *w; |
6474 Lisp_Object string; | |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6475 EMACS_INT pos, bufpos; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6476 EMACS_INT region_beg, region_end; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92150
diff
changeset
|
6477 EMACS_INT *endptr; |
24995 | 6478 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
|
6479 int mouse_p; |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6480 { |
24995 | 6481 Lisp_Object prop, position, end, limit; |
6482 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
6483 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6484 struct face *base_face; | |
6485 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
|
6486 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
24995 | 6487 |
6488 /* Get the value of the face property at the current position within | |
6489 STRING. Value is nil if there is no face property. */ | |
6490 XSETFASTINT (position, pos); | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6491 prop = Fget_text_property (position, prop_name, string); |
24995 | 6492 |
6493 /* Get the next position at which to check for faces. Value of end | |
6494 is nil if face is constant all the way to the end of the string. | |
6495 Otherwise it is a string position where to check faces next. | |
6496 Limit is the maximum position up to which to check for property | |
6497 changes in Fnext_single_property_change. Strings are usually | |
6498 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
|
6499 XSETFASTINT (limit, SCHARS (string)); |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6500 end = Fnext_single_property_change (position, prop_name, string, limit); |
24995 | 6501 if (INTEGERP (end)) |
6502 *endptr = XFASTINT (end); | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6503 else |
24995 | 6504 *endptr = -1; |
6505 | |
6506 base_face = FACE_FROM_ID (f, base_face_id); | |
6507 xassert (base_face); | |
6508 | |
6509 /* Optimize the default case that there is no face property and we | |
6510 are not in the region. */ | |
6511 if (NILP (prop) | |
6512 && (base_face_id != DEFAULT_FACE_ID | |
6513 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
6514 that the region doesn't have to be taken into account. */ | |
6515 || bufpos <= 0 | |
6516 || bufpos < region_beg | |
6517 || bufpos >= region_end) | |
6518 && (multibyte_p | |
6519 /* We can't realize faces for different charsets differently | |
6520 if we don't have fonts, so we can stop here if not working | |
6521 on a window-system frame. */ | |
6522 || !FRAME_WINDOW_P (f) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6523 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
24995 | 6524 return base_face->id; |
6525 | |
6526 /* Begin with attributes from the base face. */ | |
6527 bcopy (base_face->lface, attrs, sizeof attrs); | |
6528 | |
6529 /* Merge in attributes specified via text properties. */ | |
6530 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
|
6531 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 6532 |
6533 /* If in the region, merge in the region face. */ | |
6534 if (bufpos | |
6535 && bufpos >= region_beg | |
6536 && 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
|
6537 merge_named_face (f, Qregion, attrs, 0); |
24995 | 6538 |
6539 /* 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
|
6540 or realize a new one for ASCII characters. */ |
88907 | 6541 return lookup_face (f, attrs); |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6542 } |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6543 |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6544 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6545 /* 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
|
6546 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6547 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
|
6548 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6549 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
|
6550 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6551 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
|
6552 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6553 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
|
6554 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6555 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
|
6556 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6557 Return new face id. |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6558 */ |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6559 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6560 int |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6561 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
|
6562 struct frame *f; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6563 Lisp_Object face_name; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6564 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
|
6565 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6566 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
|
6567 struct face *base_face; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6568 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6569 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
|
6570 if (!base_face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6571 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6572 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6573 if (EQ (face_name, Qt)) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6574 { |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6575 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
|
6576 return base_face_id; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6577 face_name = lface_id_to_name[face_id]; |
97502
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
6578 /* When called during make-frame, lookup_derived_face may fail |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
6579 if the faces are uninitialized. Don't signal an error. */ |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
6580 face_id = lookup_derived_face (f, face_name, base_face_id, 0); |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
6581 return (face_id >= 0 ? face_id : base_face_id); |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6582 } |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6583 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6584 /* 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
|
6585 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
|
6586 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6587 if (!NILP (face_name)) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6588 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6589 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
|
6590 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6591 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6592 else |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6593 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6594 struct face *face; |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6595 if (face_id < 0) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6596 return base_face_id; |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6597 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
|
6598 if (!face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6599 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6600 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
|
6601 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6602 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6603 /* 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
|
6604 or realize a new one for ASCII characters. */ |
90079
609c840fe65f
(merge_faces): Fix argument to lookup_derived_face and
Kenichi Handa <handa@m17n.org>
parents:
90072
diff
changeset
|
6605 return lookup_face (f, attrs); |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6606 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6607 |
2336 | 6608 |
97194
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6609 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6610 #ifndef HAVE_X_WINDOWS |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6611 DEFUN ("x-load-color-file", Fx_load_color_file, |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6612 Sx_load_color_file, 1, 1, 0, |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6613 doc: /* Create an alist of color entries from an external file. |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6614 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6615 The file should define one named RGB color per line like so: |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6616 R G B name |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6617 where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6618 (filename) |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6619 Lisp_Object filename; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6620 { |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6621 FILE *fp; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6622 Lisp_Object cmap = Qnil; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6623 Lisp_Object abspath; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6624 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6625 CHECK_STRING (filename); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6626 abspath = Fexpand_file_name (filename, Qnil); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6627 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6628 fp = fopen (SDATA (filename), "rt"); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6629 if (fp) |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6630 { |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6631 char buf[512]; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6632 int red, green, blue; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6633 int num; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6634 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6635 BLOCK_INPUT; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6636 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6637 while (fgets (buf, sizeof (buf), fp) != NULL) { |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6638 if (sscanf (buf, "%u %u %u %n", &red, &green, &blue, &num) == 3) |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6639 { |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6640 char *name = buf + num; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6641 num = strlen (name) - 1; |
103359
eb941fcd33b4
x-load-color-file: avoid array bounds error
Jim Meyering <jim@meyering.net>
parents:
103228
diff
changeset
|
6642 if (num >= 0 && name[num] == '\n') |
97194
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6643 name[num] = 0; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6644 cmap = Fcons (Fcons (build_string (name), |
97217
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6645 #ifdef WINDOWSNT |
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6646 make_number (RGB (red, green, blue))), |
97200
d53d10659659
commit patch to x-load-color-file posted by lekktu@gmail.com
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97198
diff
changeset
|
6647 #else |
97217
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6648 make_number ((red << 16) | (green << 8) | blue)), |
97200
d53d10659659
commit patch to x-load-color-file posted by lekktu@gmail.com
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97198
diff
changeset
|
6649 #endif |
97194
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6650 cmap); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6651 } |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6652 } |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6653 fclose (fp); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6654 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6655 UNBLOCK_INPUT; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6656 } |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6657 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6658 return cmap; |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6659 } |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6660 #endif |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6661 |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6662 |
24995 | 6663 /*********************************************************************** |
6664 Tests | |
6665 ***********************************************************************/ | |
6666 | |
6667 #if GLYPH_DEBUG | |
6668 | |
6669 /* Print the contents of the realized face FACE to stderr. */ | |
6670 | |
6671 static void | |
6672 dump_realized_face (face) | |
6673 struct face *face; | |
2336 | 6674 { |
24995 | 6675 fprintf (stderr, "ID: %d\n", face->id); |
6676 #ifdef HAVE_X_WINDOWS | |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
6677 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
24995 | 6678 #endif |
6679 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
6680 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
|
6681 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
24995 | 6682 fprintf (stderr, "background: 0x%lx (%s)\n", |
6683 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
|
6684 SDATA (face->lface[LFACE_BACKGROUND_INDEX])); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6685 if (face->font) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6686 fprintf (stderr, "font_name: %s (%s)\n", |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6687 SDATA (face->font->props[FONT_NAME_INDEX]), |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6688 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
24995 | 6689 #ifdef HAVE_X_WINDOWS |
6690 fprintf (stderr, "font = %p\n", face->font); | |
6691 #endif | |
6692 fprintf (stderr, "fontset: %d\n", face->fontset); | |
6693 fprintf (stderr, "underline: %d (%s)\n", | |
6694 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
|
6695 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
24995 | 6696 fprintf (stderr, "hash: %d\n", face->hash); |
6697 } | |
6698 | |
6699 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6700 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
|
6701 (n) |
24995 | 6702 Lisp_Object n; |
6703 { | |
6704 if (NILP (n)) | |
2336 | 6705 { |
24995 | 6706 int i; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6707 |
24995 | 6708 fprintf (stderr, "font selection order: "); |
6709 for (i = 0; i < DIM (font_sort_order); ++i) | |
6710 fprintf (stderr, "%d ", font_sort_order[i]); | |
6711 fprintf (stderr, "\n"); | |
6712 | |
6713 fprintf (stderr, "alternative fonts: "); | |
6714 debug_print (Vface_alternative_font_family_alist); | |
6715 fprintf (stderr, "\n"); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6716 |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6717 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
24995 | 6718 Fdump_face (make_number (i)); |
2336 | 6719 } |
24995 | 6720 else |
6721 { | |
6722 struct face *face; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6723 CHECK_NUMBER (n); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6724 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
24995 | 6725 if (face == NULL) |
6726 error ("Not a valid face"); | |
6727 dump_realized_face (face); | |
6728 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6729 |
2336 | 6730 return Qnil; |
6731 } | |
6732 | |
6733 | |
24995 | 6734 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
|
6735 0, 0, 0, doc: /* */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6736 () |
2336 | 6737 { |
24995 | 6738 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
6739 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
6740 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
2336 | 6741 return Qnil; |
6742 } | |
24995 | 6743 |
6744 #endif /* GLYPH_DEBUG != 0 */ | |
6745 | |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6746 |
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6747 |
24995 | 6748 /*********************************************************************** |
6749 Initialization | |
6750 ***********************************************************************/ | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
6751 |
2336 | 6752 void |
2391 | 6753 syms_of_xfaces () |
2336 | 6754 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6755 Qface = intern_c_string ("face"); |
2391 | 6756 staticpro (&Qface); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6757 Qface_no_inherit = intern_c_string ("face-no-inherit"); |
57107 | 6758 staticpro (&Qface_no_inherit); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6759 Qbitmap_spec_p = intern_c_string ("bitmap-spec-p"); |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6760 staticpro (&Qbitmap_spec_p); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6761 Qframe_set_background_mode = intern_c_string ("frame-set-background-mode"); |
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
6762 staticpro (&Qframe_set_background_mode); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6763 |
24995 | 6764 /* Lisp face attribute keywords. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6765 QCfamily = intern_c_string (":family"); |
24995 | 6766 staticpro (&QCfamily); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6767 QCheight = intern_c_string (":height"); |
24995 | 6768 staticpro (&QCheight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6769 QCweight = intern_c_string (":weight"); |
24995 | 6770 staticpro (&QCweight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6771 QCslant = intern_c_string (":slant"); |
24995 | 6772 staticpro (&QCslant); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6773 QCunderline = intern_c_string (":underline"); |
24995 | 6774 staticpro (&QCunderline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6775 QCinverse_video = intern_c_string (":inverse-video"); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6776 staticpro (&QCinverse_video); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6777 QCreverse_video = intern_c_string (":reverse-video"); |
24995 | 6778 staticpro (&QCreverse_video); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6779 QCforeground = intern_c_string (":foreground"); |
24995 | 6780 staticpro (&QCforeground); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6781 QCbackground = intern_c_string (":background"); |
24995 | 6782 staticpro (&QCbackground); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6783 QCstipple = intern_c_string (":stipple"); |
24995 | 6784 staticpro (&QCstipple); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6785 QCwidth = intern_c_string (":width"); |
24995 | 6786 staticpro (&QCwidth); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6787 QCfont = intern_c_string (":font"); |
24995 | 6788 staticpro (&QCfont); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6789 QCfontset = intern_c_string (":fontset"); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6790 staticpro (&QCfontset); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6791 QCbold = intern_c_string (":bold"); |
24995 | 6792 staticpro (&QCbold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6793 QCitalic = intern_c_string (":italic"); |
24995 | 6794 staticpro (&QCitalic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6795 QCoverline = intern_c_string (":overline"); |
24995 | 6796 staticpro (&QCoverline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6797 QCstrike_through = intern_c_string (":strike-through"); |
24995 | 6798 staticpro (&QCstrike_through); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6799 QCbox = intern_c_string (":box"); |
24995 | 6800 staticpro (&QCbox); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6801 QCinherit = intern_c_string (":inherit"); |
31178 | 6802 staticpro (&QCinherit); |
24995 | 6803 |
6804 /* Symbols used for Lisp face attribute values. */ | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6805 QCcolor = intern_c_string (":color"); |
24995 | 6806 staticpro (&QCcolor); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6807 QCline_width = intern_c_string (":line-width"); |
24995 | 6808 staticpro (&QCline_width); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6809 QCstyle = intern_c_string (":style"); |
24995 | 6810 staticpro (&QCstyle); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6811 Qreleased_button = intern_c_string ("released-button"); |
24995 | 6812 staticpro (&Qreleased_button); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6813 Qpressed_button = intern_c_string ("pressed-button"); |
24995 | 6814 staticpro (&Qpressed_button); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6815 Qnormal = intern_c_string ("normal"); |
24995 | 6816 staticpro (&Qnormal); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6817 Qultra_light = intern_c_string ("ultra-light"); |
24995 | 6818 staticpro (&Qultra_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6819 Qextra_light = intern_c_string ("extra-light"); |
24995 | 6820 staticpro (&Qextra_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6821 Qlight = intern_c_string ("light"); |
24995 | 6822 staticpro (&Qlight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6823 Qsemi_light = intern_c_string ("semi-light"); |
24995 | 6824 staticpro (&Qsemi_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6825 Qsemi_bold = intern_c_string ("semi-bold"); |
24995 | 6826 staticpro (&Qsemi_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6827 Qbold = intern_c_string ("bold"); |
24995 | 6828 staticpro (&Qbold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6829 Qextra_bold = intern_c_string ("extra-bold"); |
24995 | 6830 staticpro (&Qextra_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6831 Qultra_bold = intern_c_string ("ultra-bold"); |
24995 | 6832 staticpro (&Qultra_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6833 Qoblique = intern_c_string ("oblique"); |
24995 | 6834 staticpro (&Qoblique); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6835 Qitalic = intern_c_string ("italic"); |
24995 | 6836 staticpro (&Qitalic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6837 Qreverse_oblique = intern_c_string ("reverse-oblique"); |
24995 | 6838 staticpro (&Qreverse_oblique); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6839 Qreverse_italic = intern_c_string ("reverse-italic"); |
24995 | 6840 staticpro (&Qreverse_italic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6841 Qultra_condensed = intern_c_string ("ultra-condensed"); |
24995 | 6842 staticpro (&Qultra_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6843 Qextra_condensed = intern_c_string ("extra-condensed"); |
24995 | 6844 staticpro (&Qextra_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6845 Qcondensed = intern_c_string ("condensed"); |
24995 | 6846 staticpro (&Qcondensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6847 Qsemi_condensed = intern_c_string ("semi-condensed"); |
24995 | 6848 staticpro (&Qsemi_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6849 Qsemi_expanded = intern_c_string ("semi-expanded"); |
24995 | 6850 staticpro (&Qsemi_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6851 Qexpanded = intern_c_string ("expanded"); |
24995 | 6852 staticpro (&Qexpanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6853 Qextra_expanded = intern_c_string ("extra-expanded"); |
24995 | 6854 staticpro (&Qextra_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6855 Qultra_expanded = intern_c_string ("ultra-expanded"); |
24995 | 6856 staticpro (&Qultra_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6857 Qbackground_color = intern_c_string ("background-color"); |
24995 | 6858 staticpro (&Qbackground_color); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6859 Qforeground_color = intern_c_string ("foreground-color"); |
24995 | 6860 staticpro (&Qforeground_color); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6861 Qunspecified = intern_c_string ("unspecified"); |
24995 | 6862 staticpro (&Qunspecified); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6863 Qignore_defface = intern_c_string (":ignore-defface"); |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6864 staticpro (&Qignore_defface); |
24995 | 6865 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6866 Qface_alias = intern_c_string ("face-alias"); |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6867 staticpro (&Qface_alias); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6868 Qdefault = intern_c_string ("default"); |
24995 | 6869 staticpro (&Qdefault); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6870 Qtool_bar = intern_c_string ("tool-bar"); |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25389
diff
changeset
|
6871 staticpro (&Qtool_bar); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6872 Qregion = intern_c_string ("region"); |
24995 | 6873 staticpro (&Qregion); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6874 Qfringe = intern_c_string ("fringe"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6875 staticpro (&Qfringe); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6876 Qheader_line = intern_c_string ("header-line"); |
25546 | 6877 staticpro (&Qheader_line); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6878 Qscroll_bar = intern_c_string ("scroll-bar"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6879 staticpro (&Qscroll_bar); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6880 Qmenu = intern_c_string ("menu"); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6881 staticpro (&Qmenu); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6882 Qcursor = intern_c_string ("cursor"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6883 staticpro (&Qcursor); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6884 Qborder = intern_c_string ("border"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6885 staticpro (&Qborder); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6886 Qmouse = intern_c_string ("mouse"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6887 staticpro (&Qmouse); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6888 Qmode_line_inactive = intern_c_string ("mode-line-inactive"); |
43203
dd98ef3675e5
(Qmode_line_inactive): New face variable for mode-line
Kim F. Storm <storm@cua.dk>
parents:
43069
diff
changeset
|
6889 staticpro (&Qmode_line_inactive); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6890 Qvertical_border = intern_c_string ("vertical-border"); |
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63642
diff
changeset
|
6891 staticpro (&Qvertical_border); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6892 Qtty_color_desc = intern_c_string ("tty-color-desc"); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6893 staticpro (&Qtty_color_desc); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6894 Qtty_color_standard_values = intern_c_string ("tty-color-standard-values"); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6895 staticpro (&Qtty_color_standard_values); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6896 Qtty_color_by_index = intern_c_string ("tty-color-by-index"); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
6897 staticpro (&Qtty_color_by_index); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6898 Qtty_color_alist = intern_c_string ("tty-color-alist"); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6899 staticpro (&Qtty_color_alist); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6900 Qscalable_fonts_allowed = intern_c_string ("scalable-fonts-allowed"); |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
6901 staticpro (&Qscalable_fonts_allowed); |
24995 | 6902 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6903 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6904 staticpro (&Vparam_value_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6905 Vface_alternative_font_family_alist = Qnil; |
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6906 staticpro (&Vface_alternative_font_family_alist); |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6907 Vface_alternative_font_registry_alist = Qnil; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6908 staticpro (&Vface_alternative_font_registry_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6909 |
24995 | 6910 defsubr (&Sinternal_make_lisp_face); |
6911 defsubr (&Sinternal_lisp_face_p); | |
6912 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
|
6913 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 6914 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
|
6915 #endif |
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6916 defsubr (&Scolor_gray_p); |
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6917 defsubr (&Scolor_supported_p); |
97194
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6918 #ifndef HAVE_X_WINDOWS |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6919 defsubr (&Sx_load_color_file); |
d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
6920 #endif |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6921 defsubr (&Sface_attribute_relative_p); |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6922 defsubr (&Smerge_face_attribute); |
24995 | 6923 defsubr (&Sinternal_get_lisp_face_attribute); |
6924 defsubr (&Sinternal_lisp_face_attribute_values); | |
6925 defsubr (&Sinternal_lisp_face_equal_p); | |
6926 defsubr (&Sinternal_lisp_face_empty_p); | |
6927 defsubr (&Sinternal_copy_lisp_face); | |
6928 defsubr (&Sinternal_merge_in_global_face); | |
6929 defsubr (&Sface_font); | |
6930 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
|
6931 defsubr (&Sdisplay_supports_face_attributes_p); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6932 defsubr (&Scolor_distance); |
24995 | 6933 defsubr (&Sinternal_set_font_selection_order); |
6934 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
|
6935 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
|
6936 defsubr (&Sface_attributes_as_vector); |
24995 | 6937 #if GLYPH_DEBUG |
6938 defsubr (&Sdump_face); | |
6939 defsubr (&Sshow_face_resources); | |
6940 #endif /* GLYPH_DEBUG */ | |
6941 defsubr (&Sclear_face_cache); | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6942 defsubr (&Stty_suppress_bold_inverse_default_colors); |
24995 | 6943 |
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
6944 #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
|
6945 defsubr (&Sdump_colors); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6946 #endif |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6947 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6948 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
|
6949 doc: /* *Limit for font matching. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6950 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
|
6951 that number of fonts when searching for a matching font. */); |
25270 | 6952 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
6953 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6954 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
|
6955 doc: /* List of global face definitions (for internal use only.) */); |
24995 | 6956 Vface_new_frame_defaults = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6957 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6958 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
|
6959 doc: /* *Default stipple pattern used on monochrome displays. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6960 This stipple pattern is used on monochrome displays |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6961 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
|
6962 See `set-face-stipple' for possible values for this variable. */); |
105942
5fc80e6b5b7c
* xfns.c (syms_of_xfns): Use make_pure_string instead of build_string.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105885
diff
changeset
|
6963 Vface_default_stipple = make_pure_c_string ("gray3"); |
24995 | 6964 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6965 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
|
6966 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
|
6967 Vtty_defined_color_alist = Qnil; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6968 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6969 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
|
6970 doc: /* Allowed scalable fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6971 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
|
6972 A value of t means allow any scalable font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6973 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
|
6974 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
|
6975 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
|
6976 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
|
6977 Vscalable_fonts_allowed = Qnil; |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6978 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6979 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
|
6980 doc: /* List of ignored fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6981 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
|
6982 ignore. */); |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6983 Vface_ignored_fonts = Qnil; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6984 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6985 DEFVAR_LISP ("face-remapping-alist", &Vface_remapping_alist, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6986 doc: /* Alist of face remappings. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6987 Each element is of the form: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6988 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6989 (FACE REPLACEMENT...), |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6990 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6991 which causes display of the face FACE to use REPLACEMENT... instead. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6992 REPLACEMENT... is interpreted the same way the value of a `face' text |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6993 property is: it may be (1) A face name, (2) A list of face names, (3) A |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6994 property-list of face attribute/value pairs, or (4) A list of face names |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6995 intermixed with lists containing face attribute/value pairs. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6996 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6997 Multiple entries in REPLACEMENT... are merged together to form the final |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6998 result, with faces or attributes earlier in the list taking precedence |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6999 over those that are later. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7000 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7001 Face-name remapping cycles are suppressed; recursive references use the |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7002 underlying face instead of the remapped face. So a remapping of the form: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7003 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7004 (FACE EXTRA-FACE... FACE) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7005 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7006 or: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7007 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7008 (FACE (FACE-ATTR VAL ...) FACE) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7009 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7010 will cause EXTRA-FACE... or (FACE-ATTR VAL ...) to be _merged_ with the |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7011 existing definition of FACE. Note that for the default face, this isn't |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7012 necessary, as every face inherits from the default face. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7013 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7014 Making this variable buffer-local is a good way to allow buffer-specific |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7015 face definitions. For instance, the mode my-mode could define a face |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7016 `my-mode-default', and then in the mode setup function, do: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7017 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7018 (set (make-local-variable 'face-remapping-alist) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7019 '((default my-mode-default)))). */); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7020 Vface_remapping_alist = Qnil; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
7021 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
7022 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
|
7023 doc: /* Alist of fonts vs the rescaling factors. |
100383
e1b931c8770a
(font_rescale_ratio): Moved to font.c.
Kenichi Handa <handa@m17n.org>
parents:
100102
diff
changeset
|
7024 Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where |
e1b931c8770a
(font_rescale_ratio): Moved to font.c.
Kenichi Handa <handa@m17n.org>
parents:
100102
diff
changeset
|
7025 FONT-PATTERN is a font-spec or a regular expression matching a font name, and |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
7026 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
|
7027 \(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
|
7028 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
|
7029 Vface_font_rescale_alist = Qnil; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
7030 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
7031 #ifdef HAVE_WINDOW_SYSTEM |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
7032 defsubr (&Sbitmap_spec_p); |
24995 | 7033 defsubr (&Sx_list_fonts); |
7034 defsubr (&Sinternal_face_x_get_resource); | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
7035 defsubr (&Sx_family_fonts); |
99995
6f62aec59b3d
(Fx_font_family_list, syms_of_xfaces): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
99934
diff
changeset
|
7036 #endif |
2336 | 7037 } |
52401 | 7038 |
7039 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
7040 (do not change this comment) */ |