Mercurial > emacs
annotate src/xfaces.c @ 110548:f7b98576d87f
Fix all EMACS_INT/int conversion errors in print.c (and related files).
author | Lars Magne Ingebrigtsen <larsi@gnus.org> |
---|---|
date | Fri, 24 Sep 2010 17:01:03 +0200 |
parents | 9cfca8c9fb07 |
children | d9b0552c39a6 |
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 |
324 /* Symbols used for attribute values. */ | |
325 | |
326 Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; | |
327 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; | |
328 Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; | |
329 Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; | |
330 Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; | |
331 Lisp_Object Qultra_expanded; | |
332 Lisp_Object Qreleased_button, Qpressed_button; | |
333 Lisp_Object QCstyle, QCcolor, QCline_width; | |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
334 Lisp_Object Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
335 Lisp_Object Qignore_defface; |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
336 |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
337 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; |
24995 | 338 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
339 /* 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
|
340 has changed, frame_set_background_mode. */ |
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
341 |
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
342 Lisp_Object Qframe_set_background_mode; |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
343 |
24995 | 344 /* Names of basic faces. */ |
345 | |
26574
5510d0cc07c3
Don't duplicate Qmode_line definition done elsewhere.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
346 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
|
347 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
|
348 Lisp_Object Qmode_line_inactive, Qvertical_border; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
349 |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
350 /* 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
|
351 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
|
352 the aliased face. */ |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
353 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
354 Lisp_Object Qface_alias; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
355 |
24995 | 356 /* Default stipple pattern used on monochrome displays. This stipple |
357 pattern is used on monochrome displays instead of shades of gray | |
358 for a face background color. See `set-face-stipple' for possible | |
359 values for this variable. */ | |
360 | |
361 Lisp_Object Vface_default_stipple; | |
362 | |
363 /* Alist of alternative font families. Each element is of the form | |
364 (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, | |
365 try FAMILY1, then FAMILY2, ... */ | |
366 | |
367 Lisp_Object Vface_alternative_font_family_alist; | |
368 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
369 /* 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
|
370 (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
|
371 loaded, try REGISTRY1, then REGISTRY2, ... */ |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
372 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
373 Lisp_Object Vface_alternative_font_registry_alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
374 |
24995 | 375 /* Allowed scalable fonts. A value of nil means don't allow any |
376 scalable fonts. A value of t means allow the use of any scalable | |
377 font. Otherwise, value must be a list of regular expressions. A | |
378 font may be scaled if its name matches a regular expression in the | |
379 list. */ | |
380 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
381 Lisp_Object Vscalable_fonts_allowed, Qscalable_fonts_allowed; |
24995 | 382 |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
383 /* 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
|
384 |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
385 Lisp_Object Vface_ignored_fonts; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
386 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
387 /* 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
|
388 |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
389 Lisp_Object Vface_font_rescale_alist; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
390 |
25270 | 391 /* Maximum number of fonts to consider in font_list. If not an |
392 integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */ | |
393 | |
394 Lisp_Object Vfont_list_limit; | |
395 #define DEFAULT_FONT_LIST_LIMIT 100 | |
396 | |
24995 | 397 /* The symbols `foreground-color' and `background-color' which can be |
398 used as part of a `face' property. This is for compatibility with | |
399 Emacs 20.2. */ | |
400 | |
401 Lisp_Object Qforeground_color, Qbackground_color; | |
402 | |
403 /* The symbols `face' and `mouse-face' used as text properties. */ | |
2342 | 404 |
23730
c71c3ac4b80a
(Qmouse_face): Replace definition with extern decl.
Richard M. Stallman <rms@gnu.org>
parents:
21766
diff
changeset
|
405 Lisp_Object Qface; |
24995 | 406 |
57107 | 407 /* Property for basic faces which other faces cannot inherit. */ |
408 | |
409 Lisp_Object Qface_no_inherit; | |
410 | |
24995 | 411 /* Error symbol for wrong_type_argument in load_pixmap. */ |
412 | |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
413 Lisp_Object Qbitmap_spec_p; |
2391 | 414 |
24995 | 415 /* Alist of global face definitions. Each element is of the form |
416 (FACE . LFACE) where FACE is a symbol naming a face and LFACE | |
417 is a Lisp vector of face attributes. These faces are used | |
418 to initialize faces for new frames. */ | |
419 | |
420 Lisp_Object Vface_new_frame_defaults; | |
421 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
422 /* 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
|
423 (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
|
424 REPLACEMENT... instead. REPLACEMENT... is interpreted the same way |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
425 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
|
426 (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
|
427 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
|
428 face attribute/value pairs. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
429 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
430 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
|
431 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
|
432 over those that are later. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
433 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
434 Face-name remapping cycles are suppressed; recursive references use |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
435 the underlying face instead of the remapped face. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
436 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
437 Lisp_Object Vface_remapping_alist; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
438 |
24995 | 439 /* The next ID to assign to Lisp faces. */ |
440 | |
441 static int next_lface_id; | |
442 | |
443 /* A vector mapping Lisp face Id's to face names. */ | |
444 | |
445 static Lisp_Object *lface_id_to_name; | |
446 static int lface_id_to_name_size; | |
447 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
448 /* 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
|
449 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
450 Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; |
24995 | 451 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
452 /* 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
|
453 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
454 Lisp_Object Qtty_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
455 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
456 /* 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
|
457 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
458 Lisp_Object Vtty_defined_color_alist; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
459 |
24995 | 460 /* Counter for calls to clear_face_cache. If this counter reaches |
461 CLEAR_FONT_TABLE_COUNT, and a frame has more than | |
462 CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */ | |
463 | |
464 static int clear_font_table_count; | |
465 #define CLEAR_FONT_TABLE_COUNT 100 | |
466 #define CLEAR_FONT_TABLE_NFONTS 10 | |
467 | |
468 /* Non-zero means face attributes have been changed since the last | |
469 redisplay. Used in redisplay_internal. */ | |
470 | |
471 int face_change_count; | |
472 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
473 /* 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
|
474 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
|
475 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
|
476 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
|
477 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
478 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
|
479 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
480 /* 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
|
481 Finternal_set_lisp_face_attribute. */ |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
482 |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
483 static Lisp_Object Vparam_value_alist; |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
484 |
24995 | 485 /* The total number of colors currently allocated. */ |
486 | |
487 #if GLYPH_DEBUG | |
488 static int ncolors_allocated; | |
489 static int npixmaps_allocated; | |
490 static int ngcs; | |
491 #endif | |
492 | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
493 /* 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
|
494 been changed. */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
495 |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
496 int menu_face_changed_default; |
24995 | 497 |
2336 | 498 |
24995 | 499 /* Function prototypes. */ |
500 | |
501 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
|
502 struct named_merge_point; |
24995 | 503 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
504 static void map_tty_color (struct frame *, struct face *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
505 enum lface_attribute_index, int *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
506 static Lisp_Object resolve_face_name (Lisp_Object, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
507 static void set_font_frame_param (Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
508 static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
509 int, struct named_merge_point *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
510 static int load_pixmap (struct frame *, Lisp_Object, unsigned *, unsigned *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
511 static struct frame *frame_or_selected_frame (Lisp_Object, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
512 static void load_face_colors (struct frame *, struct face *, Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
513 static void free_face_colors (struct frame *, struct face *); |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
514 static int face_color_gray_p (struct frame *, const char *); |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
515 static struct face *realize_face (struct face_cache *, Lisp_Object *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
516 int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
517 static struct face *realize_non_ascii_face (struct frame *, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
518 struct face *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
519 static struct face *realize_x_face (struct face_cache *, Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
520 static struct face *realize_tty_face (struct face_cache *, Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
521 static int realize_basic_faces (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
522 static int realize_default_face (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
523 static void realize_named_face (struct frame *, Lisp_Object, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
524 static int lface_fully_specified_p (Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
525 static int lface_equal_p (Lisp_Object *, Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
526 static unsigned hash_string_case_insensitive (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
527 static unsigned lface_hash (Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
528 static int lface_same_font_attributes_p (Lisp_Object *, Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
529 static struct face_cache *make_face_cache (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
530 static void clear_face_gcs (struct face_cache *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
531 static void free_face_cache (struct face_cache *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
532 static int face_fontset (Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
533 static void merge_face_vectors (struct frame *, Lisp_Object *, Lisp_Object*, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
534 struct named_merge_point *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
535 static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
536 int, struct named_merge_point *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
537 static int set_lface_from_font (struct frame *, Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
538 int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
539 static Lisp_Object lface_from_face_name (struct frame *, Lisp_Object, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
540 static struct face *make_realized_face (Lisp_Object *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
541 static void cache_face (struct face_cache *, struct face *, unsigned); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
542 static void uncache_face (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
|
543 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
544 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 545 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
546 static GC x_create_gc (struct frame *, unsigned long, XGCValues *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
547 static void x_free_gc (struct frame *, GC); |
24995 | 548 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
549 #ifdef USE_X_TOOLKIT |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
550 static void x_update_menu_appearance (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
551 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
552 extern void free_frame_menubar (struct frame *); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
553 #endif /* USE_X_TOOLKIT */ |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
554 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
555 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 556 |
557 | |
558 /*********************************************************************** | |
559 Utilities | |
560 ***********************************************************************/ | |
561 | |
562 #ifdef HAVE_X_WINDOWS | |
563 | |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
564 #ifdef DEBUG_X_COLORS |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
565 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
566 /* 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
|
567 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
|
568 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
|
569 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
|
570 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
|
571 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
|
572 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
|
573 single display/screen. --gerd. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
574 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
575 /* Reference counts for pixel colors. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
576 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
577 int color_count[256]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
578 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
579 /* Register color PIXEL as allocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
580 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
581 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
582 register_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
583 unsigned long pixel; |
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 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
586 ++color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
587 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
588 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
589 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
590 /* Register color PIXEL as deallocated. */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
591 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
592 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
593 unregister_color (pixel) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
594 unsigned long pixel; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
595 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
596 xassert (pixel < 256); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
597 if (color_count[pixel] > 0) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
598 --color_count[pixel]; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
599 else |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
600 abort (); |
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 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
603 |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
604 /* Register N colors from PIXELS as deallocated. */ |
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 void |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
607 unregister_colors (pixels, n) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
608 unsigned long *pixels; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
609 int n; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
610 { |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
611 int i; |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
612 for (i = 0; i < n; ++i) |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
613 unregister_color (pixels[i]); |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
614 } |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
615 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
616 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
617 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
|
618 doc: /* Dump currently allocated colors to stderr. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
619 (void) |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
620 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
621 int i, n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
622 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
623 fputc ('\n', stderr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
624 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
625 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
|
626 if (color_count[i]) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
627 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
628 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
|
629 ++n; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
630 if (n % 5 == 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
631 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
632 else |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
633 fputc ('\t', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
634 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
635 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
636 if (n % 5 != 0) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
637 fputc ('\n', stderr); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
638 return Qnil; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
639 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
640 |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
641 #endif /* DEBUG_X_COLORS */ |
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
642 |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
643 |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
644 /* 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
|
645 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
|
646 is called. */ |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
647 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
648 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
649 x_free_colors (struct frame *f, long unsigned int *pixels, int npixels) |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
650 { |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
651 int class = FRAME_X_DISPLAY_INFO (f)->visual->class; |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
652 |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
653 /* 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
|
654 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
|
655 if (class != StaticColor && class != StaticGray && class != TrueColor) |
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
656 { |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
657 #ifdef DEBUG_X_COLORS |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
658 unregister_colors (pixels, npixels); |
28354
d6ae8188fa58
(register_color, unregister_colors, unregister_colors)
Gerd Moellmann <gerd@gnu.org>
parents:
28349
diff
changeset
|
659 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
660 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
|
661 pixels, npixels, 0); |
27960
25a04100858d
(x_free_colors): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27743
diff
changeset
|
662 } |
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 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
665 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
666 /* 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
|
667 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
|
668 is called. */ |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
669 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
670 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
671 x_free_dpy_colors (Display *dpy, Screen *screen, Colormap cmap, long unsigned int *pixels, int npixels) |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
672 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
673 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
|
674 int class = dpyinfo->visual->class; |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
675 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
676 /* 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
|
677 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
|
678 if (class != StaticColor && class != StaticGray && class != TrueColor) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
679 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
680 #ifdef DEBUG_X_COLORS |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
681 unregister_colors (pixels, npixels); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
682 #endif |
35228
ae27a81ee8dc
(x_free_colors, x_free_dpy_colors): Do the
Gerd Moellmann <gerd@gnu.org>
parents:
35040
diff
changeset
|
683 XFreeColors (dpy, cmap, pixels, npixels, 0); |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
684 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
685 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
686 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
687 |
24995 | 688 /* Create and return a GC for use on frame F. GC values and mask |
689 are given by XGCV and MASK. */ | |
690 | |
691 static INLINE GC | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
692 x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv) |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
693 { |
2336 | 694 GC gc; |
24995 | 695 BLOCK_INPUT; |
696 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), mask, xgcv); | |
697 UNBLOCK_INPUT; | |
698 IF_DEBUG (++ngcs); | |
699 return gc; | |
700 } | |
701 | |
702 | |
703 /* Free GC which was used on frame F. */ | |
704 | |
705 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
706 x_free_gc (struct frame *f, GC gc) |
24995 | 707 { |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
708 eassert (interrupt_input_blocked); |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
709 IF_DEBUG (xassert (--ngcs >= 0)); |
24995 | 710 XFreeGC (FRAME_X_DISPLAY (f), gc); |
711 } | |
712 | |
713 #endif /* HAVE_X_WINDOWS */ | |
714 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
715 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
716 /* W32 emulation of GCs */ |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
717 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
718 static INLINE GC |
109480
d12162869c07
Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
109372
diff
changeset
|
719 x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv) |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
720 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
721 GC gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
722 BLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
723 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
|
724 UNBLOCK_INPUT; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
725 IF_DEBUG (++ngcs); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
726 return gc; |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
727 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
728 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
729 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
730 /* 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
|
731 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
732 static INLINE void |
109480
d12162869c07
Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
109372
diff
changeset
|
733 x_free_gc (struct frame *f, GC gc) |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
734 { |
59903
f2619addaa72
(x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
Kim F. Storm <storm@cua.dk>
parents:
59458
diff
changeset
|
735 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
|
736 xfree (gc); |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
737 } |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
738 |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
739 #endif /* WINDOWSNT */ |
24995 | 740 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
741 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
742 /* NS emulation of GCs */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
743 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
744 static INLINE GC |
109653
9cfca8c9fb07
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109637
diff
changeset
|
745 x_create_gc (struct frame *f, |
9cfca8c9fb07
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109637
diff
changeset
|
746 unsigned long mask, |
9cfca8c9fb07
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109637
diff
changeset
|
747 XGCValues *xgcv) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
748 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
749 GC gc = xmalloc (sizeof (*gc)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
750 if (gc) |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
751 memcpy (gc, xgcv, sizeof (XGCValues)); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
752 return gc; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
753 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
754 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
755 static INLINE void |
109653
9cfca8c9fb07
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109637
diff
changeset
|
756 x_free_gc (struct frame *f, GC gc) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
757 { |
103624
3e06f0e66062
Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents:
103359
diff
changeset
|
758 xfree (gc); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
759 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
760 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
761 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
762 /* 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
|
763 are in ISO8859-1. */ |
24995 | 764 |
765 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
766 xstrcasecmp (const unsigned char *s1, const unsigned char *s2) |
24995 | 767 { |
768 while (*s1 && *s2) | |
769 { | |
770 unsigned char c1 = tolower (*s1); | |
771 unsigned char c2 = tolower (*s2); | |
772 if (c1 != c2) | |
773 return c1 < c2 ? -1 : 1; | |
774 ++s1, ++s2; | |
775 } | |
776 | |
777 if (*s1 == 0) | |
778 return *s2 == 0 ? 0 : -1; | |
779 return 1; | |
780 } | |
781 | |
782 | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
783 /* 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
|
784 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
|
785 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
|
786 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
|
787 Lisp function definitions. */ |
24995 | 788 |
789 static INLINE struct frame * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
790 frame_or_selected_frame (Lisp_Object frame, int nparam) |
24995 | 791 { |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
792 if (NILP (frame)) |
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
793 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
794 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
795 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
796 return XFRAME (frame); |
24995 | 797 } |
798 | |
799 | |
800 /*********************************************************************** | |
801 Frames and faces | |
802 ***********************************************************************/ | |
803 | |
804 /* 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
|
805 |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
806 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
807 init_frame_faces (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
|
808 { |
24995 | 809 /* Make a face cache, if F doesn't have one. */ |
810 if (FRAME_FACE_CACHE (f) == NULL) | |
811 FRAME_FACE_CACHE (f) = make_face_cache (f); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
812 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
813 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 814 /* 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
|
815 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
|
816 { |
100398 | 817 /* We initialize the image cache when creating the first frame |
818 on a terminal, and not during terminal creation. This way, | |
819 `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
|
820 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
|
821 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
|
822 ++FRAME_IMAGE_CACHE (f)->refcount; |
24995 | 823 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
824 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 825 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
826 /* Realize basic faces. Must have enough information in frame |
24995 | 827 parameters to realize basic faces at this point. */ |
828 #ifdef HAVE_X_WINDOWS | |
829 if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | |
830 #endif | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
831 #ifdef WINDOWSNT |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
832 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
|
833 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
834 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
835 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
|
836 #endif |
24995 | 837 if (!realize_basic_faces (f)) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
838 abort (); |
24995 | 839 } |
840 | |
841 | |
100666
dab9cf44bf3f
In comments, write delete_frame instead of Fdelete_frame.
Martin Rudalics <rudalics@gmx.at>
parents:
100398
diff
changeset
|
842 /* Free face cache of frame F. Called from delete_frame. */ |
24995 | 843 |
844 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
845 free_frame_faces (struct frame *f) |
24995 | 846 { |
847 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
|
848 |
24995 | 849 if (face_cache) |
850 { | |
851 free_face_cache (face_cache); | |
852 FRAME_FACE_CACHE (f) = NULL; | |
853 } | |
854 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
855 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
856 if (FRAME_WINDOW_P (f)) |
24995 | 857 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91900
diff
changeset
|
858 struct image_cache *image_cache = FRAME_IMAGE_CACHE (f); |
24995 | 859 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
|
860 { |
24995 | 861 --image_cache->refcount; |
862 if (image_cache->refcount == 0) | |
863 free_image_cache (f); | |
864 } | |
865 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
866 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 867 } |
868 | |
869 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
870 /* 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
|
871 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
|
872 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
|
873 of named faces. */ |
24995 | 874 |
875 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
876 recompute_basic_faces (struct frame *f) |
24995 | 877 { |
878 if (FRAME_FACE_CACHE (f)) | |
879 { | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
880 clear_face_cache (0); |
26601
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
881 if (!realize_basic_faces (f)) |
e23e3120d84f
(set_lface_from_font_name): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
26594
diff
changeset
|
882 abort (); |
24995 | 883 } |
884 } | |
885 | |
886 | |
887 /* Clear the face caches of all frames. CLEAR_FONTS_P non-zero means | |
888 try to free unused fonts, too. */ | |
889 | |
890 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
891 clear_face_cache (int clear_fonts_p) |
24995 | 892 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
893 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 894 Lisp_Object tail, frame; |
895 struct frame *f; | |
896 | |
897 if (clear_fonts_p | |
898 || ++clear_font_table_count == CLEAR_FONT_TABLE_COUNT) | |
899 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
900 #if 0 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
901 /* Not yet implemented. */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
902 clear_font_cache (frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
903 #endif |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
904 |
24995 | 905 /* From time to time see if we can unload some fonts. This also |
906 frees all realized faces on all frames. Fonts needed by | |
907 faces will be loaded again when faces are realized again. */ | |
908 clear_font_table_count = 0; | |
909 | |
910 FOR_EACH_FRAME (tail, frame) | |
911 { | |
38434
86a4e78aeae0
(clear_face_cache): Clear fonts on a display basis.
Gerd Moellmann <gerd@gnu.org>
parents:
38346
diff
changeset
|
912 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
|
913 if (FRAME_WINDOW_P (f) |
24995 | 914 && 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
|
915 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
|
916 } |
8e610355cb29
Eliminate the "display faces"; store GCs in the "computed faces".
Richard M. Stallman <rms@gnu.org>
parents:
9326
diff
changeset
|
917 } |
24995 | 918 else |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
919 { |
24995 | 920 /* Clear GCs of realized faces. */ |
921 FOR_EACH_FRAME (tail, frame) | |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
922 { |
24995 | 923 f = XFRAME (frame); |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
924 if (FRAME_WINDOW_P (f)) |
24995 | 925 clear_face_gcs (FRAME_FACE_CACHE (f)); |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
926 } |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
927 clear_image_caches (Qnil); |
13460
5513606156bc
(unload_font): Invalidate computed faces.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
928 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
929 #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
|
930 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
931 |
24995 | 932 |
933 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
|
934 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
|
935 Optional THOROUGHLY non-nil means try to free unused fonts, too. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
936 (Lisp_Object thoroughly) |
35843
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
937 { |
c032770ba567
(Fclear_face_cache): Rename the `thorougly' argument
Eli Zaretskii <eliz@gnu.org>
parents:
35443
diff
changeset
|
938 clear_face_cache (!NILP (thoroughly)); |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
939 ++face_change_count; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
940 ++windows_or_buffers_changed; |
24995 | 941 return Qnil; |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
942 } |
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
943 |
24995 | 944 |
945 /*********************************************************************** | |
946 X Pixmaps | |
947 ***********************************************************************/ | |
948 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
949 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 950 |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
951 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
|
952 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
|
953 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
|
954 \(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
|
955 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
|
956 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
|
957 \(WIDTH + 7)/8 bytes. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
958 (Lisp_Object object) |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
959 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
960 int pixmap_p = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
961 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
962 if (STRINGP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
963 /* 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
|
964 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
965 else if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
966 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
967 /* 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
|
968 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
|
969 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
|
970 Lisp_Object width, height, data; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
971 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
972 height = width = data = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
973 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
974 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
975 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
976 width = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
977 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
978 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
979 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
980 height = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
981 object = XCDR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
982 if (CONSP (object)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
983 data = XCAR (object); |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
984 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
985 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
986 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
987 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data)) |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
988 { |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
989 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
|
990 / 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
|
991 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
|
992 pixmap_p = 1; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
993 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
994 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
995 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
996 return pixmap_p ? Qt : Qnil; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
997 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
998 |
24995 | 999 |
1000 /* Load a bitmap according to NAME (which is either a file name or a | |
1001 pixmap spec) for use on frame F. Value is the bitmap_id (see | |
1002 xfns.c). If NAME is nil, return with a bitmap id of zero. If | |
1003 bitmap cannot be loaded, display a message saying so, and return | |
1004 zero. Store the bitmap width in *W_PTR and its height in *H_PTR, | |
1005 if these pointers are not null. */ | |
1006 | |
1007 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1008 load_pixmap (FRAME_PTR f, Lisp_Object name, unsigned int *w_ptr, unsigned int *h_ptr) |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1009 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1010 int bitmap_id; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1011 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1012 if (NILP (name)) |
24995 | 1013 return 0; |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1014 |
71845
085d9056841a
(load_pixmap): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71576
diff
changeset
|
1015 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
|
1016 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1017 BLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1018 if (CONSP (name)) |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1019 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1020 /* Decode a bitmap spec into a bitmap. */ |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1021 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1022 int h, w; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1023 Lisp_Object bits; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1024 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1025 w = XINT (Fcar (name)); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1026 h = XINT (Fcar (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1027 bits = Fcar (Fcdr (Fcdr (name))); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1028 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1029 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
|
1030 w, h); |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1031 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1032 else |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1033 { |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1034 /* 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
|
1035 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
|
1036 } |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1037 UNBLOCK_INPUT; |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1038 |
9902
32ed712a45a3
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
9671
diff
changeset
|
1039 if (bitmap_id < 0) |
24995 | 1040 { |
72446
44f03dd44abf
(load_pixmap): Add quotes in error message.
Richard M. Stallman <rms@gnu.org>
parents:
72170
diff
changeset
|
1041 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil); |
24995 | 1042 bitmap_id = 0; |
1043 | |
1044 if (w_ptr) | |
1045 *w_ptr = 0; | |
1046 if (h_ptr) | |
1047 *h_ptr = 0; | |
1048 } | |
1049 else | |
1050 { | |
1051 #if GLYPH_DEBUG | |
1052 ++npixmaps_allocated; | |
1053 #endif | |
1054 if (w_ptr) | |
1055 *w_ptr = x_bitmap_width (f, bitmap_id); | |
1056 | |
1057 if (h_ptr) | |
1058 *h_ptr = x_bitmap_height (f, bitmap_id); | |
1059 } | |
9564
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1060 |
1bfb920ab23e
(intern_face): Set the fill_style.
Richard M. Stallman <rms@gnu.org>
parents:
9529
diff
changeset
|
1061 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
|
1062 } |
9572 | 1063 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1064 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1065 |
9572 | 1066 |
2336 | 1067 |
24995 | 1068 /*********************************************************************** |
1069 X Colors | |
1070 ***********************************************************************/ | |
1071 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1072 /* 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
|
1073 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
|
1074 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
|
1075 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1076 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1077 parse_rgb_list (Lisp_Object rgb_list, XColor *color) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1078 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1079 #define PARSE_RGB_LIST_FIELD(field) \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1080 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
|
1081 { \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1082 color->field = XINT (XCAR (rgb_list)); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1083 rgb_list = XCDR (rgb_list); \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1084 } \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1085 else \ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1086 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1087 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1088 PARSE_RGB_LIST_FIELD (red); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1089 PARSE_RGB_LIST_FIELD (green); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1090 PARSE_RGB_LIST_FIELD (blue); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1091 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1092 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1093 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1094 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1095 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1096 /* 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
|
1097 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
|
1098 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
|
1099 returned in it. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1100 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1101 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1102 tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, XColor *std_color) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1103 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1104 Lisp_Object frame, color_desc; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1105 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1106 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
|
1107 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1108 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1109 XSETFRAME (frame, f); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1110 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1111 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
|
1112 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
|
1113 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1114 Lisp_Object rgb; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1115 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1116 if (! INTEGERP (XCAR (XCDR (color_desc)))) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1117 return 0; |
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 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
|
1120 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1121 rgb = XCDR (XCDR (color_desc)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1122 if (! parse_rgb_list (rgb, tty_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1123 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1124 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1125 /* Should we fill in STD_COLOR too? */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1126 if (std_color) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1127 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1128 /* 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
|
1129 *std_color = *tty_color; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1130 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1131 /* 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
|
1132 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
|
1133 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
|
1134 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
|
1135 if ((!STRINGP (XCAR (color_desc)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1136 || 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
|
1137 && !NILP (Ffboundp (Qtty_color_standard_values))) |
45718
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 /* Look up STD_COLOR separately. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1140 rgb = call1 (Qtty_color_standard_values, color); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1141 if (! parse_rgb_list (rgb, std_color)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1142 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1143 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1144 } |
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 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1147 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1148 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
|
1149 /* 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
|
1150 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
|
1151 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
|
1152 load color" messages in the *Messages* buffer. */ |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1153 return 1; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1154 else |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1155 /* 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
|
1156 return 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1157 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1158 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1159 /* 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
|
1160 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1161 int |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
1162 tty_defined_color (struct frame *f, const char *color_name, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
1163 XColor *color_def, int alloc) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1164 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1165 int status = 1; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1166 |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1167 /* Defaults. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
1168 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
|
1169 color_def->red = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1170 color_def->blue = 0; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1171 color_def->green = 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 if (*color_name) |
89554
15da46f6f0ac
(face_numeric_value): Declare dim size_t.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1174 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
|
1175 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1176 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
|
1177 { |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26875
diff
changeset
|
1178 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
|
1179 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
|
1180 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
|
1181 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
|
1182 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1183 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
1184 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
|
1185 status = 1; |
2e020ab026b8
(tty_defined_color): Don't return faulire indication
Eli Zaretskii <eliz@gnu.org>
parents:
27695
diff
changeset
|
1186 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1187 return status; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1188 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1189 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1190 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1191 /* 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
|
1192 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
|
1193 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
|
1194 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1195 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
|
1196 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1197 int |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
1198 defined_color (struct frame *f, const char *color_name, XColor *color_def, int alloc) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1199 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1200 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
|
1201 return tty_defined_color (f, color_name, color_def, alloc); |
24995 | 1202 #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
|
1203 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
|
1204 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
|
1205 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1206 #ifdef WINDOWSNT |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1207 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
|
1208 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
|
1209 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1210 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1211 else if (FRAME_NS_P (f)) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1212 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
|
1213 #endif |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1214 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1215 abort (); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1216 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1217 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1218 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1219 /* 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
|
1220 Lisp string. */ |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1221 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1222 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1223 tty_color_name (struct frame *f, int idx) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1224 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1225 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
|
1226 { |
27088
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1227 Lisp_Object frame; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1228 Lisp_Object coldesc; |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1229 |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1230 XSETFRAME (frame, f); |
23bd823f11f4
(tty_defined_color): Pass frame to tty-color-desc. The
Eli Zaretskii <eliz@gnu.org>
parents:
26976
diff
changeset
|
1231 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
|
1232 |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1233 if (!NILP (coldesc)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1234 return XCAR (coldesc); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1235 } |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1236 #ifdef MSDOS |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1237 /* 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
|
1238 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
|
1239 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
|
1240 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
|
1241 #endif |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1242 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1243 if (idx == FACE_TTY_DEFAULT_FG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1244 return build_string (unspecified_fg); |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1245 if (idx == FACE_TTY_DEFAULT_BG_COLOR) |
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1246 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
|
1247 |
27114
4efa5e54e9a9
(Qunspecified_fg, Qunspecified_bg): Remove.
Eli Zaretskii <eliz@gnu.org>
parents:
27100
diff
changeset
|
1248 return Qunspecified; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1249 } |
24995 | 1250 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1251 |
24995 | 1252 /* 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
|
1253 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
|
1254 |
d9e5cd5bce05
(face_color_gray_p): Colors close to black count as gray.
Richard M. Stallman <rms@gnu.org>
parents:
65713
diff
changeset
|
1255 The criterion implemented here is not a terribly sophisticated one. */ |
24995 | 1256 |
1257 static int | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
1258 face_color_gray_p (struct frame *f, const char *color_name) |
24995 | 1259 { |
1260 XColor color; | |
1261 int gray_p; | |
1262 | |
1263 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
|
1264 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
|
1265 (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
|
1266 || |
85262 | 1267 ((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
|
1268 < max (color.red, color.green) / 20) |
85262 | 1269 && (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
|
1270 < max (color.green, color.blue) / 20) |
85262 | 1271 && (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
|
1272 < max (color.blue, color.red) / 20))); |
24995 | 1273 else |
1274 gray_p = 0; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1275 |
24995 | 1276 return gray_p; |
1277 } | |
1278 | |
1279 | |
1280 /* Return non-zero if color COLOR_NAME can be displayed on frame F. | |
1281 BACKGROUND_P non-zero means the color will be used as background | |
1282 color. */ | |
1283 | |
1284 static int | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109494
diff
changeset
|
1285 face_color_supported_p (struct frame *f, const char *color_name, int background_p) |
24995 | 1286 { |
1287 Lisp_Object frame; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1288 XColor not_used; |
24995 | 1289 |
1290 XSETFRAME (frame, f); | |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1291 return |
59924
3590dd3050ba
(face_color_supported_p): Use HAVE_WINDOW_SYSTEM
Eli Zaretskii <eliz@gnu.org>
parents:
59905
diff
changeset
|
1292 #ifdef HAVE_WINDOW_SYSTEM |
54766
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1293 FRAME_WINDOW_P (f) |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1294 ? (!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
|
1295 || xstrcasecmp (color_name, "black") == 0 |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
1296 || 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
|
1297 || (background_p |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1298 && 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
|
1299 || (!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
|
1300 && 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
|
1301 : |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1302 #endif |
b87089cc7e4c
(face_color_supported_p): Fix compilation without X11.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53901
diff
changeset
|
1303 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
|
1304 } |
24995 | 1305 |
1306 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1307 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
|
1308 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
|
1309 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
|
1310 If FRAME is nil or omitted, use the selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1311 (Lisp_Object color, Lisp_Object frame) |
24995 | 1312 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1313 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1314 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1315 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1316 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1317 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1318 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1319 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1320 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
|
1321 return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; |
24995 | 1322 } |
1323 | |
1324 | |
27100
9a0d8503806e
(Fcolor_gray_p): Renamed from face-color-gray-p.
Eli Zaretskii <eliz@gnu.org>
parents:
27088
diff
changeset
|
1325 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
|
1326 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
|
1327 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
|
1328 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
|
1329 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
|
1330 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
|
1331 COLOR must be a valid color name. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1332 (Lisp_Object color, Lisp_Object frame, Lisp_Object background_p) |
24995 | 1333 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1334 struct frame *f; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1335 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1336 CHECK_STRING (color); |
53267
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1337 if (NILP (frame)) |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1338 frame = selected_frame; |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1339 else |
bec1d17789a6
(Fcolor_gray_p): Fix omission bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
1340 CHECK_FRAME (frame); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1341 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
|
1342 if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) |
24995 | 1343 return Qt; |
1344 return Qnil; | |
1345 } | |
1346 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1347 |
24995 | 1348 /* Load color with name NAME for use by face FACE on frame F. |
1349 TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, | |
1350 LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, | |
1351 LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the | |
1352 pixel color. If color cannot be loaded, display a message, and | |
1353 return the foreground, background or underline color of F, but | |
1354 record that fact in flags of the face so that we don't try to free | |
1355 these colors. */ | |
1356 | |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
1357 unsigned long |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1358 load_color (struct frame *f, struct face *face, Lisp_Object name, enum lface_attribute_index target_index) |
24995 | 1359 { |
1360 XColor color; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1361 |
24995 | 1362 xassert (STRINGP (name)); |
1363 xassert (target_index == LFACE_FOREGROUND_INDEX | |
1364 || target_index == LFACE_BACKGROUND_INDEX | |
1365 || target_index == LFACE_UNDERLINE_INDEX | |
1366 || target_index == LFACE_OVERLINE_INDEX | |
1367 || target_index == LFACE_STRIKE_THROUGH_INDEX | |
1368 || target_index == LFACE_BOX_INDEX); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1369 |
24995 | 1370 /* if the color map is full, defined_color will return a best match |
1371 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
|
1372 if (!defined_color (f, SDATA (name), &color, 1)) |
24995 | 1373 { |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
1374 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
|
1375 |
24995 | 1376 switch (target_index) |
1377 { | |
1378 case LFACE_FOREGROUND_INDEX: | |
1379 face->foreground_defaulted_p = 1; | |
1380 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1381 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1382 |
24995 | 1383 case LFACE_BACKGROUND_INDEX: |
1384 face->background_defaulted_p = 1; | |
1385 color.pixel = FRAME_BACKGROUND_PIXEL (f); | |
1386 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1387 |
24995 | 1388 case LFACE_UNDERLINE_INDEX: |
1389 face->underline_defaulted_p = 1; | |
1390 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1391 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1392 |
24995 | 1393 case LFACE_OVERLINE_INDEX: |
1394 face->overline_color_defaulted_p = 1; | |
1395 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1396 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1397 |
24995 | 1398 case LFACE_STRIKE_THROUGH_INDEX: |
1399 face->strike_through_color_defaulted_p = 1; | |
1400 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1401 break; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1402 |
24995 | 1403 case LFACE_BOX_INDEX: |
1404 face->box_color_defaulted_p = 1; | |
1405 color.pixel = FRAME_FOREGROUND_PIXEL (f); | |
1406 break; | |
1407 | |
1408 default: | |
1409 abort (); | |
1410 } | |
1411 } | |
1412 #if GLYPH_DEBUG | |
1413 else | |
1414 ++ncolors_allocated; | |
1415 #endif | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1416 |
24995 | 1417 return color.pixel; |
1418 } | |
1419 | |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1420 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1421 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1422 |
1423 /* Load colors for face FACE which is used on frame F. Colors are | |
1424 specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX | |
1425 of ATTRS. If the background color specified is not supported on F, | |
1426 try to emulate gray colors with a stipple from Vface_default_stipple. */ | |
1427 | |
1428 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1429 load_face_colors (struct frame *f, struct face *face, Lisp_Object *attrs) |
24995 | 1430 { |
1431 Lisp_Object fg, bg; | |
1432 | |
1433 bg = attrs[LFACE_BACKGROUND_INDEX]; | |
1434 fg = attrs[LFACE_FOREGROUND_INDEX]; | |
1435 | |
1436 /* Swap colors if face is inverse-video. */ | |
1437 if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) | |
1438 { | |
1439 Lisp_Object tmp; | |
1440 tmp = fg; | |
1441 fg = bg; | |
1442 bg = tmp; | |
1443 } | |
1444 | |
1445 /* Check for support for foreground, not for background because | |
1446 face_color_supported_p is smart enough to know that grays are | |
1447 "supported" as background because we are supposed to use stipple | |
1448 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
|
1449 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
|
1450 && !NILP (Fbitmap_spec_p (Vface_default_stipple))) |
24995 | 1451 { |
1452 x_destroy_bitmap (f, face->stipple); | |
1453 face->stipple = load_pixmap (f, Vface_default_stipple, | |
1454 &face->pixmap_w, &face->pixmap_h); | |
1455 } | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1456 |
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
1457 face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); |
24995 | 1458 face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); |
1459 } | |
1460 | |
1461 | |
1462 /* Free color PIXEL on frame F. */ | |
1463 | |
1464 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1465 unload_color (struct frame *f, long unsigned int pixel) |
24995 | 1466 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1467 #ifdef HAVE_X_WINDOWS |
38346
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1468 if (pixel != -1) |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1469 { |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1470 BLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1471 x_free_colors (f, &pixel, 1); |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1472 UNBLOCK_INPUT; |
a86234ceb517
(unload_color): Do nothing if PIXEL is -1.
Gerd Moellmann <gerd@gnu.org>
parents:
37798
diff
changeset
|
1473 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1474 #endif |
24995 | 1475 } |
1476 | |
1477 | |
1478 /* Free colors allocated for FACE. */ | |
1479 | |
1480 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1481 free_face_colors (struct frame *f, struct face *face) |
3074
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
1482 { |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
1483 /* 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
|
1484 #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
|
1485 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
|
1486 return; |
dfc4450c2329
(realize_x_face): If C is not a single-byte character,
Gerd Moellmann <gerd@gnu.org>
parents:
40532
diff
changeset
|
1487 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1488 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1489 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1490 if (!face->foreground_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1491 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1492 x_free_colors (f, &face->foreground, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1493 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1494 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1495 |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1496 if (!face->background_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1497 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1498 x_free_colors (f, &face->background, 1); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1499 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1500 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1501 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1502 if (face->underline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1503 && !face->underline_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1504 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1505 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
|
1506 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1507 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1508 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1509 if (face->overline_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1510 && !face->overline_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1511 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1512 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
|
1513 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1514 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1515 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1516 if (face->strike_through_p |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1517 && !face->strike_through_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1518 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1519 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
|
1520 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1521 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1522 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1523 if (face->box != FACE_NO_BOX |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1524 && !face->box_color_defaulted_p) |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1525 { |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1526 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
|
1527 IF_DEBUG (--ncolors_allocated); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1528 } |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1529 |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1530 UNBLOCK_INPUT; |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1531 #endif /* HAVE_X_WINDOWS */ |
24995 | 1532 } |
29599
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
1533 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1534 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1535 |
1536 | |
1537 | |
1538 /*********************************************************************** | |
1539 XLFD Font Names | |
1540 ***********************************************************************/ | |
1541 | |
1542 /* An enumerator for each field of an XLFD font name. */ | |
1543 | |
1544 enum xlfd_field | |
1545 { | |
1546 XLFD_FOUNDRY, | |
1547 XLFD_FAMILY, | |
1548 XLFD_WEIGHT, | |
1549 XLFD_SLANT, | |
1550 XLFD_SWIDTH, | |
1551 XLFD_ADSTYLE, | |
1552 XLFD_PIXEL_SIZE, | |
1553 XLFD_POINT_SIZE, | |
1554 XLFD_RESX, | |
1555 XLFD_RESY, | |
1556 XLFD_SPACING, | |
1557 XLFD_AVGWIDTH, | |
1558 XLFD_REGISTRY, | |
1559 XLFD_ENCODING, | |
1560 XLFD_LAST | |
1561 }; | |
1562 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1563 /* An enumerator for each possible slant value of a font. Taken from |
24995 | 1564 the XLFD specification. */ |
1565 | |
1566 enum xlfd_slant | |
1567 { | |
1568 XLFD_SLANT_UNKNOWN, | |
1569 XLFD_SLANT_ROMAN, | |
1570 XLFD_SLANT_ITALIC, | |
1571 XLFD_SLANT_OBLIQUE, | |
1572 XLFD_SLANT_REVERSE_ITALIC, | |
1573 XLFD_SLANT_REVERSE_OBLIQUE, | |
1574 XLFD_SLANT_OTHER | |
1575 }; | |
1576 | |
1577 /* Relative font weight according to XLFD documentation. */ | |
1578 | |
1579 enum xlfd_weight | |
1580 { | |
1581 XLFD_WEIGHT_UNKNOWN, | |
1582 XLFD_WEIGHT_ULTRA_LIGHT, /* 10 */ | |
1583 XLFD_WEIGHT_EXTRA_LIGHT, /* 20 */ | |
1584 XLFD_WEIGHT_LIGHT, /* 30 */ | |
1585 XLFD_WEIGHT_SEMI_LIGHT, /* 40: SemiLight, Book, ... */ | |
1586 XLFD_WEIGHT_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1587 XLFD_WEIGHT_SEMI_BOLD, /* 60: SemiBold, DemiBold, ... */ | |
1588 XLFD_WEIGHT_BOLD, /* 70: Bold, ... */ | |
1589 XLFD_WEIGHT_EXTRA_BOLD, /* 80: ExtraBold, Heavy, ... */ | |
1590 XLFD_WEIGHT_ULTRA_BOLD /* 90: UltraBold, Black, ... */ | |
1591 }; | |
1592 | |
1593 /* Relative proportionate width. */ | |
1594 | |
1595 enum xlfd_swidth | |
1596 { | |
1597 XLFD_SWIDTH_UNKNOWN, | |
1598 XLFD_SWIDTH_ULTRA_CONDENSED, /* 10 */ | |
1599 XLFD_SWIDTH_EXTRA_CONDENSED, /* 20 */ | |
1600 XLFD_SWIDTH_CONDENSED, /* 30: Condensed, Narrow, Compressed, ... */ | |
1601 XLFD_SWIDTH_SEMI_CONDENSED, /* 40: semicondensed */ | |
1602 XLFD_SWIDTH_MEDIUM, /* 50: Medium, Normal, Regular, ... */ | |
1603 XLFD_SWIDTH_SEMI_EXPANDED, /* 60: SemiExpanded, DemiExpanded, ... */ | |
1604 XLFD_SWIDTH_EXPANDED, /* 70: Expanded... */ | |
1605 XLFD_SWIDTH_EXTRA_EXPANDED, /* 80: ExtraExpanded, Wide... */ | |
1606 XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */ | |
1607 }; | |
1608 | |
1609 /* Order by which font selection chooses fonts. The default values | |
1610 mean `first, find a best match for the font width, then for the | |
1611 font height, then for weight, then for slant.' This variable can be | |
1612 set via set-face-font-sort-order. */ | |
1613 | |
1614 static int font_sort_order[4]; | |
1615 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1616 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 1617 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1618 static enum font_property_index font_props_for_sorting[FONT_SIZE_INDEX]; |
24995 | 1619 |
1620 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
1621 compare_fonts_by_sort_order (const void *v1, const void *v2) |
24995 | 1622 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1623 Lisp_Object font1 = *(Lisp_Object *) v1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1624 Lisp_Object font2 = *(Lisp_Object *) v2; |
24995 | 1625 int i; |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
1626 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1627 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
|
1628 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1629 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
|
1630 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
|
1631 int result; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1632 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1633 if (idx <= FONT_REGISTRY_INDEX) |
24995 | 1634 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1635 if (STRINGP (val1)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1636 result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; |
24995 | 1637 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1638 result = STRINGP (val2) ? 1 : 0; |
24995 | 1639 } |
35369
aca9ba55cfcc
(x_face_list_fonts): Call x_list_fonts with SIZE -1,
Gerd Moellmann <gerd@gnu.org>
parents:
35228
diff
changeset
|
1640 else |
24995 | 1641 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1642 if (INTEGERP (val1)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1643 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
|
1644 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1645 result = INTEGERP (val2) ? 1 : 0; |
53354
605475ba45e3
(face_font_available_p): New function.
Kenichi Handa <handa@m17n.org>
parents:
53334
diff
changeset
|
1646 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1647 if (result) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1648 return result; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1649 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1650 return 0; |
24995 | 1651 } |
1652 | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
1653 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
|
1654 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
|
1655 If FAMILY is omitted or nil, list all families. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1656 Otherwise, FAMILY must be a string, possibly containing wildcards |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1657 `?' and `*'. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1658 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
|
1659 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
|
1660 SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1661 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
|
1662 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
|
1663 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
|
1664 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
|
1665 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
|
1666 giving the registry and encoding of the font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1667 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
|
1668 the face font sort order. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1669 (Lisp_Object family, Lisp_Object frame) |
24995 | 1670 { |
106434
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1671 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
|
1672 int i, nfonts, ndrivers; |
24995 | 1673 Lisp_Object result; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1674 |
95377
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1675 if (NILP (frame)) |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1676 frame = selected_frame; |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1677 CHECK_LIVE_FRAME (frame); |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1678 |
0c4bba8ae9f2
(Fx_family_fonts): Set frame correctly.
Kenichi Handa <handa@m17n.org>
parents:
95375
diff
changeset
|
1679 font_spec = Ffont_spec (0, NULL); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
1680 if (!NILP (family)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1681 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1682 CHECK_STRING (family); |
95574
fa7d768bdd0b
(Fx_family_fonts): Use font_parse_family_registry instead of
Kenichi Handa <handa@m17n.org>
parents:
95567
diff
changeset
|
1683 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
|
1684 } |
106434
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1685 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1686 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
|
1687 if (NILP (list)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1688 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
|
1689 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1690 /* 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
|
1691 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
|
1692 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
|
1693 { |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1694 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
|
1695 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
|
1696 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
|
1697 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
|
1698 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
|
1699 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
|
1700 default: |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1701 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
|
1702 } |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1703 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
|
1704 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
|
1705 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
|
1706 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
|
1707 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1708 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
|
1709 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
|
1710 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
|
1711 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
|
1712 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
|
1713 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
|
1714 |
de4084d806f6
* xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return
Chong Yidong <cyd@stupidchicken.com>
parents:
105942
diff
changeset
|
1715 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
|
1716 compare_fonts_by_sort_order); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1717 |
24995 | 1718 result = Qnil; |
1719 for (i = nfonts - 1; i >= 0; --i) | |
1720 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1721 Lisp_Object font = AREF (vec, i); |
25270 | 1722 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
|
1723 int point; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1724 Lisp_Object spacing; |
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 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
|
1727 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
|
1728 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
|
1729 XFRAME (frame)->resy); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1730 ASET (v, 2, make_number (point)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1731 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
|
1732 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
|
1733 spacing = Ffont_get (font, QCspacing); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1734 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
|
1735 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
|
1736 ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1737 |
24995 | 1738 result = Fcons (v, result); |
1739 } | |
1740 | |
1741 return result; | |
1742 } | |
1743 | |
1744 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
|
1745 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
|
1746 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
|
1747 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
|
1748 |
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
|
1749 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
|
1750 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
|
1751 contain wildcard characters: |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1752 the * character matches any substring, and |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1753 the ? character matches any single character. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1754 PATTERN is case-insensitive. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1755 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1756 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
|
1757 `set-face-font'. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1758 |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1759 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
|
1760 even if they match PATTERN and FACE. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1761 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
|
1762 fonts to match. The first MAXIMUM fonts are reported. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
1763 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
|
1764 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
|
1765 the WIDTH times as wide as FACE on FRAME. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1766 (Lisp_Object pattern, Lisp_Object face, Lisp_Object frame, Lisp_Object maximum, Lisp_Object width) |
24995 | 1767 { |
1768 struct frame *f; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1769 int size, avgwidth; |
24995 | 1770 |
1771 check_x (); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1772 CHECK_STRING (pattern); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1773 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1774 if (! NILP (maximum)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1775 CHECK_NATNUM (maximum); |
24995 | 1776 |
1777 if (!NILP (width)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
1778 CHECK_NUMBER (width); |
24995 | 1779 |
1780 /* We can't simply call check_x_frame because this function may be | |
1781 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
|
1782 if (NILP (frame)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1783 frame = selected_frame; |
24995 | 1784 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
|
1785 if (! FRAME_WINDOW_P (f)) |
24995 | 1786 { |
1787 /* Perhaps we have not yet created any frame. */ | |
1788 f = NULL; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1789 frame = Qnil; |
24995 | 1790 face = Qnil; |
1791 } | |
1792 | |
1793 /* Determine the width standard for comparison with the fonts we find. */ | |
1794 | |
1795 if (NILP (face)) | |
1796 size = 0; | |
1797 else | |
1798 { | |
1799 /* This is of limited utility since it works with character | |
1800 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
|
1801 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
|
1802 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
|
1803 ? NULL |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1804 : 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
|
1805 |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
1806 if (face && face->font) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1807 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1808 size = face->font->pixel_size; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1809 avgwidth = face->font->average_width; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1810 } |
24995 | 1811 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1812 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1813 size = FRAME_FONT (f)->pixel_size; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1814 avgwidth = FRAME_FONT (f)->average_width; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1815 } |
24995 | 1816 if (!NILP (width)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1817 avgwidth *= XINT (width); |
24995 | 1818 } |
1819 | |
1820 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1821 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
|
1822 Lisp_Object args[2], tail; |
24995 | 1823 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1824 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
|
1825 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
|
1826 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
|
1827 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1828 if (size) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1829 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1830 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
|
1831 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
|
1832 } |
96263
9775da34ea47
(Fx_list_fonts): Call Flist_fonts with the arg PREFER.
Kenichi Handa <handa@m17n.org>
parents:
96027
diff
changeset
|
1833 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
|
1834 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
|
1835 { |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1836 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
|
1837 |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1838 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
|
1839 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
|
1840 || 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
|
1841 && ! 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
|
1842 { |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1843 /* 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
|
1844 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
|
1845 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
|
1846 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
|
1847 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
|
1848 } |
c98dbbb65bad
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
Kenichi Handa <handa@m17n.org>
parents:
102989
diff
changeset
|
1849 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
|
1850 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
1851 if (NILP (frame)) |
24995 | 1852 /* We don't have to check fontsets. */ |
1853 return args[0]; | |
1854 args[1] = list_fontsets (f, pattern, size); | |
1855 return Fnconc (2, args); | |
1856 } | |
1857 } | |
1858 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
1859 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 1860 |
1861 | |
1862 /*********************************************************************** | |
1863 Lisp Faces | |
1864 ***********************************************************************/ | |
1865 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1866 /* 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
|
1867 |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1868 #define LFACE_FAMILY(LFACE) AREF ((LFACE), LFACE_FAMILY_INDEX) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1869 #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
|
1870 #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
|
1871 #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
|
1872 #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
|
1873 #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
|
1874 #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
|
1875 #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
|
1876 #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
|
1877 #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
|
1878 #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
|
1879 #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
|
1880 #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
|
1881 #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
|
1882 #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
|
1883 #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1884 #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) |
24995 | 1885 |
1886 /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size | |
1887 LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ | |
1888 | |
1889 #define LFACEP(LFACE) \ | |
1890 (VECTORP (LFACE) \ | |
1891 && XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \ | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
1892 && EQ (AREF (LFACE, 0), Qface)) |
24995 | 1893 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
1894 |
24995 | 1895 #if GLYPH_DEBUG |
1896 | |
1897 /* Check consistency of Lisp face attribute vector ATTRS. */ | |
1898 | |
1899 static void | |
1900 check_lface_attrs (attrs) | |
1901 Lisp_Object *attrs; | |
1902 { | |
1903 xassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1904 || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX]) |
24995 | 1905 || STRINGP (attrs[LFACE_FAMILY_INDEX])); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1906 xassert (UNSPECIFIEDP (attrs[LFACE_FOUNDRY_INDEX]) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1907 || IGNORE_DEFFACE_P (attrs[LFACE_FOUNDRY_INDEX]) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
1908 || STRINGP (attrs[LFACE_FOUNDRY_INDEX])); |
24995 | 1909 xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1910 || IGNORE_DEFFACE_P (attrs[LFACE_SWIDTH_INDEX]) |
24995 | 1911 || SYMBOLP (attrs[LFACE_SWIDTH_INDEX])); |
1912 xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1913 || IGNORE_DEFFACE_P (attrs[LFACE_HEIGHT_INDEX]) |
31178 | 1914 || INTEGERP (attrs[LFACE_HEIGHT_INDEX]) |
1915 || FLOATP (attrs[LFACE_HEIGHT_INDEX]) | |
1916 || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX])); | |
24995 | 1917 xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1918 || IGNORE_DEFFACE_P (attrs[LFACE_WEIGHT_INDEX]) |
24995 | 1919 || SYMBOLP (attrs[LFACE_WEIGHT_INDEX])); |
1920 xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1921 || IGNORE_DEFFACE_P (attrs[LFACE_SLANT_INDEX]) |
24995 | 1922 || SYMBOLP (attrs[LFACE_SLANT_INDEX])); |
1923 xassert (UNSPECIFIEDP (attrs[LFACE_UNDERLINE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1924 || IGNORE_DEFFACE_P (attrs[LFACE_UNDERLINE_INDEX]) |
24995 | 1925 || SYMBOLP (attrs[LFACE_UNDERLINE_INDEX]) |
1926 || STRINGP (attrs[LFACE_UNDERLINE_INDEX])); | |
1927 xassert (UNSPECIFIEDP (attrs[LFACE_OVERLINE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1928 || IGNORE_DEFFACE_P (attrs[LFACE_OVERLINE_INDEX]) |
24995 | 1929 || SYMBOLP (attrs[LFACE_OVERLINE_INDEX]) |
1930 || STRINGP (attrs[LFACE_OVERLINE_INDEX])); | |
1931 xassert (UNSPECIFIEDP (attrs[LFACE_STRIKE_THROUGH_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1932 || IGNORE_DEFFACE_P (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
24995 | 1933 || SYMBOLP (attrs[LFACE_STRIKE_THROUGH_INDEX]) |
1934 || STRINGP (attrs[LFACE_STRIKE_THROUGH_INDEX])); | |
1935 xassert (UNSPECIFIEDP (attrs[LFACE_BOX_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1936 || IGNORE_DEFFACE_P (attrs[LFACE_BOX_INDEX]) |
24995 | 1937 || SYMBOLP (attrs[LFACE_BOX_INDEX]) |
1938 || STRINGP (attrs[LFACE_BOX_INDEX]) | |
1939 || INTEGERP (attrs[LFACE_BOX_INDEX]) | |
1940 || CONSP (attrs[LFACE_BOX_INDEX])); | |
1941 xassert (UNSPECIFIEDP (attrs[LFACE_INVERSE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1942 || IGNORE_DEFFACE_P (attrs[LFACE_INVERSE_INDEX]) |
24995 | 1943 || SYMBOLP (attrs[LFACE_INVERSE_INDEX])); |
1944 xassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1945 || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) |
24995 | 1946 || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); |
1947 xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1948 || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) |
24995 | 1949 || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); |
31178 | 1950 xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1951 || IGNORE_DEFFACE_P (attrs[LFACE_INHERIT_INDEX]) |
31178 | 1952 || NILP (attrs[LFACE_INHERIT_INDEX]) |
1953 || SYMBOLP (attrs[LFACE_INHERIT_INDEX]) | |
1954 || CONSP (attrs[LFACE_INHERIT_INDEX])); | |
24995 | 1955 #ifdef HAVE_WINDOW_SYSTEM |
1956 xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX]) | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1957 || IGNORE_DEFFACE_P (attrs[LFACE_STIPPLE_INDEX]) |
24995 | 1958 || SYMBOLP (attrs[LFACE_STIPPLE_INDEX]) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
1959 || !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
|
1960 xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX]) |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
1961 || 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
|
1962 || FONTP (attrs[LFACE_FONT_INDEX])); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1963 xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
1964 || STRINGP (attrs[LFACE_FONTSET_INDEX])); |
24995 | 1965 #endif |
1966 } | |
1967 | |
1968 | |
1969 /* Check consistency of attributes of Lisp face LFACE (a Lisp vector). */ | |
1970 | |
1971 static void | |
1972 check_lface (lface) | |
1973 Lisp_Object lface; | |
1974 { | |
1975 if (!NILP (lface)) | |
1976 { | |
1977 xassert (LFACEP (lface)); | |
1978 check_lface_attrs (XVECTOR (lface)->contents); | |
1979 } | |
1980 } | |
1981 | |
1982 #else /* GLYPH_DEBUG == 0 */ | |
1983 | |
1984 #define check_lface_attrs(attrs) (void) 0 | |
1985 #define check_lface(lface) (void) 0 | |
1986 | |
1987 #endif /* GLYPH_DEBUG == 0 */ | |
1988 | |
1989 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
1990 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
1991 /* 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
|
1992 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1993 enum named_merge_point_kind |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1994 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1995 NAMED_MERGE_POINT_NORMAL, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1996 NAMED_MERGE_POINT_REMAP |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1997 }; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
1998 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
1999 /* 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
|
2000 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
|
2001 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
|
2002 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
|
2003 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
|
2004 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
|
2005 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
|
2006 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2007 Lisp_Object face_name; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2008 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
|
2009 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
|
2010 }; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2011 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2012 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2013 /* 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
|
2014 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
|
2015 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
|
2016 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
|
2017 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2018 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
|
2019 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
|
2020 Lisp_Object face_name, |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2021 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
|
2022 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
|
2023 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2024 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
|
2025 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2026 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
|
2027 if (EQ (face_name, prev->face_name)) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2028 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2029 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
|
2030 /* A cycle, so fail. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2031 return 0; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2032 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
|
2033 /* A remap `hides ' any previous normal merge points |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2034 (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
|
2035 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
|
2036 can just assume it's OK. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2037 break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2038 } |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2039 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2040 new_named_merge_point->face_name = face_name; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2041 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
|
2042 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
|
2043 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2044 *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
|
2045 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2046 return 1; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2047 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2048 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2049 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2050 |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2051 #if 0 /* Seems to be unused. */ |
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2052 static Lisp_Object |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2053 internal_resolve_face_name (nargs, args) |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2054 int nargs; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2055 Lisp_Object *args; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2056 { |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2057 return Fget (args[0], args[1]); |
83287
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2058 } |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2059 |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2060 static Lisp_Object |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2061 resolve_face_name_error (ignore) |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2062 Lisp_Object ignore; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2063 { |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2064 return Qnil; |
b4b67a7fcbe0
Resolve crashes related to face aliases.
Karoly Lorentey <lorentey@elte.hu>
parents:
83276
diff
changeset
|
2065 } |
83761
7ea6f31ba76e
(internal_resolve_face_name): Return a value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
2066 #endif |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2067 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
2068 /* 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
|
2069 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
|
2070 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
|
2071 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2072 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
|
2073 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2074 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2075 resolve_face_name (Lisp_Object face_name, int signal_p) |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2076 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2077 Lisp_Object orig_face; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2078 Lisp_Object tortoise, hare; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2079 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2080 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
|
2081 face_name = intern (SDATA (face_name)); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2082 |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2083 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
|
2084 return face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2085 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2086 orig_face = face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2087 tortoise = hare = face_name; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2088 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2089 while (1) |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2090 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2091 face_name = hare; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2092 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
|
2093 if (NILP (hare) || !SYMBOLP (hare)) |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2094 break; |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2095 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2096 face_name = hare; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2097 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
|
2098 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
|
2099 break; |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2100 |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2101 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
|
2102 if (EQ (hare, tortoise)) |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2103 { |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2104 if (signal_p) |
71992
760807463226
* xfaces.c (signal_error): Move to eval.c.
Kim F. Storm <storm@cua.dk>
parents:
71845
diff
changeset
|
2105 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
|
2106 return Qdefault; |
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2107 } |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2108 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2109 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2110 return face_name; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2111 } |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2112 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2113 |
24995 | 2114 /* 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
|
2115 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
|
2116 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
|
2117 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
|
2118 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
|
2119 is zero, value is nil if FACE_NAME is not a valid face name. */ |
24995 | 2120 static INLINE Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2121 lface_from_face_name_no_resolve (struct frame *f, Lisp_Object face_name, int signal_p) |
24995 | 2122 { |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2123 Lisp_Object lface; |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2124 |
24995 | 2125 if (f) |
2126 lface = assq_no_quit (face_name, f->face_alist); | |
2127 else | |
2128 lface = assq_no_quit (face_name, Vface_new_frame_defaults); | |
2129 | |
2130 if (CONSP (lface)) | |
2131 lface = XCDR (lface); | |
2132 else if (signal_p) | |
2133 signal_error ("Invalid face", face_name); | |
2134 | |
2135 check_lface (lface); | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2136 |
24995 | 2137 return lface; |
2138 } | |
2139 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2140 /* 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
|
2141 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
|
2142 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
|
2143 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
|
2144 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
|
2145 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
|
2146 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
|
2147 name. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2148 static INLINE Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2149 lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2150 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2151 face_name = resolve_face_name (face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2152 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
|
2153 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2154 |
24995 | 2155 |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2156 /* 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
|
2157 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
|
2158 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
|
2159 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
|
2160 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
|
2161 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2162 static INLINE int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2163 get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int 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
|
2164 { |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2165 Lisp_Object lface; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2166 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2167 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
|
2168 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2169 if (! NILP (lface)) |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
2170 memcpy (attrs, XVECTOR (lface)->contents, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
2171 LFACE_VECTOR_SIZE * sizeof *attrs); |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2172 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2173 return !NILP (lface); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2174 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2175 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2176 /* 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
|
2177 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
|
2178 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
|
2179 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
|
2180 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
|
2181 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
|
2182 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2183 static INLINE int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2184 get_lface_attributes (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p, struct named_merge_point *named_merge_points) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2185 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2186 Lisp_Object face_remapping; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2187 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2188 face_name = resolve_face_name (face_name, signal_p); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2189 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2190 /* 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
|
2191 is done buffer-locally). */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2192 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
|
2193 if (CONSP (face_remapping)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2194 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2195 struct named_merge_point named_merge_point; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2196 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2197 if (push_named_merge_point (&named_merge_point, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2198 face_name, NAMED_MERGE_POINT_REMAP, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2199 &named_merge_points)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2200 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2201 int i; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2202 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2203 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2204 attrs[i] = Qunspecified; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2205 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2206 return merge_face_ref (f, XCDR (face_remapping), attrs, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2207 signal_p, named_merge_points); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2208 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2209 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2210 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2211 /* Default case, no remapping. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2212 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
|
2213 } |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2214 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2215 |
24995 | 2216 /* Non-zero if all attributes in face attribute vector ATTRS are |
2217 specified, i.e. are non-nil. */ | |
2218 | |
2219 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2220 lface_fully_specified_p (Lisp_Object *attrs) |
24995 | 2221 { |
2222 int i; | |
2223 | |
2224 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
|
2225 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
|
2226 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
|
2227 break; |
24995 | 2228 |
2229 return i == LFACE_VECTOR_SIZE; | |
2230 } | |
2231 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2232 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 2233 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2234 /* 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
|
2235 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
|
2236 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
|
2237 of FORCE_P. */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2238 |
24995 | 2239 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2240 set_lface_from_font (struct frame *f, Lisp_Object lface, Lisp_Object font_object, int force_p) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2241 { |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2242 Lisp_Object val; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2243 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
|
2244 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2245 /* 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
|
2246 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
|
2247 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
|
2248 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2249 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
|
2250 { |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2251 Lisp_Object family = AREF (font_object, FONT_FAMILY_INDEX); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2252 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2253 LFACE_FAMILY (lface) = SYMBOL_NAME (family); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2254 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2255 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2256 if (force_p || UNSPECIFIEDP (LFACE_FOUNDRY (lface))) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2257 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2258 Lisp_Object foundry = AREF (font_object, FONT_FOUNDRY_INDEX); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2259 |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2260 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
|
2261 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2262 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2263 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
|
2264 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2265 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
|
2266 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2267 xassert (pt > 0); |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2268 LFACE_HEIGHT (lface) = make_number (pt); |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2269 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2270 |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2271 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
|
2272 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2273 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
|
2274 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
|
2275 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2276 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
|
2277 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2278 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
|
2279 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
|
2280 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2281 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
|
2282 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2283 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
|
2284 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
|
2285 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2286 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2287 LFACE_FONT (lface) = font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2288 return 1; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2289 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
2290 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
2291 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 2292 |
2293 | |
31178 | 2294 /* Merges the face height FROM with the face height TO, and returns the |
2295 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
|
2296 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
|
2297 `relative' heights; the returned value is always an absolute height |
100817
9ea6227529f4
Remove obsolete comment.
Chong Yidong <cyd@stupidchicken.com>
parents:
100816
diff
changeset
|
2298 unless both FROM and TO are relative. */ |
31178 | 2299 |
2300 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2301 merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid) |
31178 | 2302 { |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2303 Lisp_Object result = invalid; |
31178 | 2304 |
2305 if (INTEGERP (from)) | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2306 /* 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
|
2307 result = from; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2308 else if (FLOATP (from)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2309 /* 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
|
2310 { |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2311 if (INTEGERP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2312 /* relative X absolute => absolute */ |
41518
ee7c1fe5feaf
(merge_face_heights): Coerce back to int explicitly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41129
diff
changeset
|
2313 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
|
2314 else if (FLOATP (to)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2315 /* relative X relative => relative */ |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2316 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
|
2317 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
|
2318 result = from; |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2319 } |
31178 | 2320 else if (FUNCTIONP (from)) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2321 /* FROM is a function, which use to adjust TO. */ |
31178 | 2322 { |
2323 /* Call function with current height as argument. | |
2324 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
|
2325 Lisp_Object args[2]; |
31178 | 2326 |
2327 args[0] = from; | |
2328 args[1] = to; | |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2329 result = safe_call (2, args); |
31178 | 2330 |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2331 /* 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
|
2332 if (INTEGERP (to) && !INTEGERP (result)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2333 result = invalid; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2334 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2335 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
2336 return result; |
31178 | 2337 } |
2338 | |
2339 | |
2340 /* 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
|
2341 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
|
2342 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
|
2343 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
|
2344 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
|
2345 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
|
2346 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
|
2347 other places. */ |
24995 | 2348 |
2349 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2350 merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to, struct named_merge_point *named_merge_points) |
24995 | 2351 { |
2352 int i; | |
31178 | 2353 |
2354 /* If FROM inherits from some other faces, merge their attributes into | |
2355 TO before merging FROM's direct attributes. Note that an :inherit | |
2356 attribute of `unspecified' is the same as one of nil; we never | |
2357 merge :inherit attributes, so nil is more correct, but lots of | |
2358 other code uses `unspecified' as a generic value for face attributes. */ | |
2359 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]) | |
2360 && !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
|
2361 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points); |
31178 | 2362 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2363 i = LFACE_FONT_INDEX; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2364 if (!UNSPECIFIEDP (from[i])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2365 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2366 if (!UNSPECIFIEDP (to[i])) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2367 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
|
2368 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2369 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
|
2370 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
|
2371 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
|
2372 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
|
2373 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
|
2374 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
|
2375 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
|
2376 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
|
2377 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
|
2378 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
|
2379 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
|
2380 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
|
2381 } |
31221 | 2382 |
24995 | 2383 for (i = 1; i < LFACE_VECTOR_SIZE; ++i) |
2384 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
|
2385 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2386 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
|
2387 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2388 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
|
2389 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
|
2390 } |
102989
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2391 else if (i != LFACE_FONT_INDEX |
42574e6202e2
(merge_face_vectors): Reflect font properties in
Kenichi Handa <handa@m17n.org>
parents:
102232
diff
changeset
|
2392 && ! EQ (to[i], from[i])) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2393 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2394 to[i] = from[i]; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2395 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
|
2396 font_clear_prop (to, |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2397 (i == LFACE_FAMILY_INDEX ? FONT_FAMILY_INDEX |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2398 : 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
|
2399 : 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
|
2400 : 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
|
2401 : 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
|
2402 : FONT_SLANT_INDEX)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2403 } |
40838
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2404 } |
31178 | 2405 |
2406 /* TO is always an absolute face, which should inherit from nothing. | |
2407 We blindly copy the :inherit attribute above and fix it up here. */ | |
2408 to[LFACE_INHERIT_INDEX] = Qnil; | |
2409 } | |
2410 | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2411 /* 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
|
2412 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
|
2413 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
|
2414 merging succeeded. */ |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2415 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2416 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2417 merge_named_face (struct frame *f, Lisp_Object face_name, Lisp_Object *to, struct named_merge_point *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
|
2418 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2419 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
|
2420 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2421 if (push_named_merge_point (&named_merge_point, |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2422 face_name, NAMED_MERGE_POINT_NORMAL, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2423 &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
|
2424 { |
57997
7a44d300ed6f
(merge_named_face): GCPRO the face_name in the
Richard M. Stallman <rms@gnu.org>
parents:
57107
diff
changeset
|
2425 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
|
2426 Lisp_Object from[LFACE_VECTOR_SIZE]; |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
2427 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
|
2428 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2429 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
|
2430 { |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2431 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
|
2432 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
|
2433 UNGCPRO; |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2434 } |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2435 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
2436 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
|
2437 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2438 else |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2439 return 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2440 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2441 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2442 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2443 /* 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
|
2444 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
|
2445 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
|
2446 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
|
2447 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
|
2448 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
|
2449 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2450 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
|
2451 specifications. Each face specification can be: |
24995 | 2452 |
2453 1. A symbol or string naming a Lisp face. | |
2454 | |
2455 2. A property list of the form (KEYWORD VALUE ...) where each | |
2456 KEYWORD is a face attribute name, and value is an appropriate value | |
2457 for that attribute. | |
2458 | |
2459 3. Conses or the form (FOREGROUND-COLOR . COLOR) or | |
2460 (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is | |
2461 for compatibility with 20.2. | |
2462 | |
2463 Face specifications earlier in lists take precedence over later | |
2464 specifications. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2465 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2466 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
2467 merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to, int err_msgs, struct named_merge_point *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
|
2468 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2469 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
|
2470 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2471 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
|
2472 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2473 Lisp_Object first = XCAR (face_ref); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2474 |
24995 | 2475 if (EQ (first, Qforeground_color) |
2476 || EQ (first, Qbackground_color)) | |
2477 { | |
2478 /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR | |
2479 . 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
|
2480 Lisp_Object color_name = XCDR (face_ref); |
24995 | 2481 Lisp_Object color = first; |
2482 | |
2483 if (STRINGP (color_name)) | |
2484 { | |
2485 if (EQ (color, Qforeground_color)) | |
2486 to[LFACE_FOREGROUND_INDEX] = color_name; | |
2487 else | |
2488 to[LFACE_BACKGROUND_INDEX] = color_name; | |
2489 } | |
2490 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2491 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2492 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
|
2493 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
|
2494 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2495 } |
24995 | 2496 } |
2497 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
|
2498 && *SDATA (SYMBOL_NAME (first)) == ':') |
24995 | 2499 { |
2500 /* 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
|
2501 while (CONSP (face_ref) && CONSP (XCDR (face_ref))) |
24995 | 2502 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2503 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
|
2504 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
|
2505 int err = 0; |
24995 | 2506 |
56694
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2507 /* 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
|
2508 if (EQ (value, Qunspecified)) |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2509 ; |
d5801cbd92f5
(merge_face_ref): Specifying `unspecified' is a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
56518
diff
changeset
|
2510 else if (EQ (keyword, QCfamily)) |
24995 | 2511 { |
2512 if (STRINGP (value)) | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2513 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2514 to[LFACE_FAMILY_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2515 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
|
2516 } |
24995 | 2517 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2518 err = 1; |
24995 | 2519 } |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2520 else if (EQ (keyword, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2521 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2522 if (STRINGP (value)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2523 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2524 to[LFACE_FOUNDRY_INDEX] = value; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2525 font_clear_prop (to, FONT_FOUNDRY_INDEX); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2526 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2527 else |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2528 err = 1; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2529 } |
24995 | 2530 else if (EQ (keyword, QCheight)) |
2531 { | |
31178 | 2532 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
|
2533 merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil); |
31178 | 2534 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2535 if (! NILP (new_height)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2536 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2537 to[LFACE_HEIGHT_INDEX] = new_height; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2538 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
|
2539 } |
24995 | 2540 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2541 err = 1; |
24995 | 2542 } |
2543 else if (EQ (keyword, QCweight)) | |
2544 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2545 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
|
2546 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2547 to[LFACE_WEIGHT_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2548 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
|
2549 } |
24995 | 2550 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2551 err = 1; |
24995 | 2552 } |
2553 else if (EQ (keyword, QCslant)) | |
2554 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2555 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
|
2556 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2557 to[LFACE_SLANT_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2558 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
|
2559 } |
24995 | 2560 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2561 err = 1; |
24995 | 2562 } |
2563 else if (EQ (keyword, QCunderline)) | |
2564 { | |
2565 if (EQ (value, Qt) | |
2566 || NILP (value) | |
2567 || STRINGP (value)) | |
2568 to[LFACE_UNDERLINE_INDEX] = value; | |
2569 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2570 err = 1; |
24995 | 2571 } |
2572 else if (EQ (keyword, QCoverline)) | |
2573 { | |
2574 if (EQ (value, Qt) | |
2575 || NILP (value) | |
2576 || STRINGP (value)) | |
2577 to[LFACE_OVERLINE_INDEX] = value; | |
2578 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2579 err = 1; |
24995 | 2580 } |
2581 else if (EQ (keyword, QCstrike_through)) | |
2582 { | |
2583 if (EQ (value, Qt) | |
2584 || NILP (value) | |
2585 || STRINGP (value)) | |
2586 to[LFACE_STRIKE_THROUGH_INDEX] = value; | |
2587 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2588 err = 1; |
24995 | 2589 } |
2590 else if (EQ (keyword, QCbox)) | |
2591 { | |
2592 if (EQ (value, Qt)) | |
2593 value = make_number (1); | |
2594 if (INTEGERP (value) | |
2595 || STRINGP (value) | |
2596 || CONSP (value) | |
2597 || NILP (value)) | |
2598 to[LFACE_BOX_INDEX] = value; | |
2599 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2600 err = 1; |
24995 | 2601 } |
2602 else if (EQ (keyword, QCinverse_video) | |
2603 || EQ (keyword, QCreverse_video)) | |
2604 { | |
2605 if (EQ (value, Qt) || NILP (value)) | |
2606 to[LFACE_INVERSE_INDEX] = value; | |
2607 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2608 err = 1; |
24995 | 2609 } |
2610 else if (EQ (keyword, QCforeground)) | |
2611 { | |
2612 if (STRINGP (value)) | |
2613 to[LFACE_FOREGROUND_INDEX] = value; | |
2614 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2615 err = 1; |
24995 | 2616 } |
2617 else if (EQ (keyword, QCbackground)) | |
2618 { | |
2619 if (STRINGP (value)) | |
2620 to[LFACE_BACKGROUND_INDEX] = value; | |
2621 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2622 err = 1; |
24995 | 2623 } |
2624 else if (EQ (keyword, QCstipple)) | |
2625 { | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
2626 #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
|
2627 Lisp_Object pixmap_p = Fbitmap_spec_p (value); |
24995 | 2628 if (!NILP (pixmap_p)) |
2629 to[LFACE_STIPPLE_INDEX] = value; | |
2630 else | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2631 err = 1; |
24995 | 2632 #endif |
2633 } | |
2634 else if (EQ (keyword, QCwidth)) | |
2635 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2636 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
|
2637 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2638 to[LFACE_SWIDTH_INDEX] = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2639 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
|
2640 } |
24995 | 2641 else |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2642 err = 1; |
24995 | 2643 } |
31178 | 2644 else if (EQ (keyword, QCinherit)) |
2645 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2646 /* 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
|
2647 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
|
2648 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
|
2649 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
|
2650 err = 1; |
31178 | 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; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2654 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2655 if (err) |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2656 { |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2657 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
|
2658 ok = 0; |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2659 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2660 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2661 face_ref = XCDR (XCDR (face_ref)); |
24995 | 2662 } |
2663 } | |
2664 else | |
2665 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2666 /* 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
|
2667 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
|
2668 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
|
2669 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
|
2670 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2671 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
|
2672 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
|
2673 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2674 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
|
2675 ok = 0; |
24995 | 2676 } |
2677 } | |
2678 else | |
2679 { | |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2680 /* 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
|
2681 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
|
2682 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
|
2683 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
|
2684 } |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2685 |
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
2686 return ok; |
24995 | 2687 } |
2688 | |
2689 | |
2690 DEFUN ("internal-make-lisp-face", Finternal_make_lisp_face, | |
2691 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
|
2692 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
|
2693 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
|
2694 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
|
2695 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
|
2696 Value is a vector of face attributes. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2697 (Lisp_Object face, Lisp_Object frame) |
24995 | 2698 { |
2699 Lisp_Object global_lface, lface; | |
2700 struct frame *f; | |
2701 int i; | |
2702 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2703 CHECK_SYMBOL (face); |
24995 | 2704 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
|
2705 |
24995 | 2706 if (!NILP (frame)) |
2707 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2708 CHECK_LIVE_FRAME (frame); |
24995 | 2709 f = XFRAME (frame); |
2710 lface = lface_from_face_name (f, face, 0); | |
2711 } | |
2712 else | |
2713 f = NULL, lface = Qnil; | |
2714 | |
2715 /* Add a global definition if there is none. */ | |
2716 if (NILP (global_lface)) | |
2717 { | |
2718 global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
2719 Qunspecified); | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2720 ASET (global_lface, 0, Qface); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2721 Vface_new_frame_defaults = Fcons (Fcons (face, global_lface), |
24995 | 2722 Vface_new_frame_defaults); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2723 |
24995 | 2724 /* Assign the new Lisp face a unique ID. The mapping from Lisp |
2725 face id to Lisp face is given by the vector lface_id_to_name. | |
2726 The mapping from Lisp face to Lisp face id is given by the | |
2727 property `face' of the Lisp face name. */ | |
2728 if (next_lface_id == lface_id_to_name_size) | |
2729 { | |
2730 int new_size = max (50, 2 * lface_id_to_name_size); | |
2731 int sz = new_size * sizeof *lface_id_to_name; | |
2732 lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz); | |
2733 lface_id_to_name_size = new_size; | |
2734 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2735 |
24995 | 2736 lface_id_to_name[next_lface_id] = face; |
2737 Fput (face, Qface, make_number (next_lface_id)); | |
2738 ++next_lface_id; | |
2739 } | |
2740 else if (f == NULL) | |
2741 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
|
2742 ASET (global_lface, i, Qunspecified); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2743 |
24995 | 2744 /* Add a frame-local definition. */ |
2745 if (f) | |
2746 { | |
2747 if (NILP (lface)) | |
2748 { | |
2749 lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE), | |
2750 Qunspecified); | |
91671
7d8392863f85
* xfaces.c (Finternal_make_lisp_face): Use ASET.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91531
diff
changeset
|
2751 ASET (lface, 0, Qface); |
24995 | 2752 f->face_alist = Fcons (Fcons (face, lface), f->face_alist); |
2753 } | |
2754 else | |
2755 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
|
2756 ASET (lface, i, Qunspecified); |
24995 | 2757 } |
2758 else | |
2759 lface = global_lface; | |
2760 | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2761 /* 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
|
2762 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
|
2763 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
|
2764 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
|
2765 init_iterator will then free realized faces. */ |
57107 | 2766 if (NILP (Fget (face, Qface_no_inherit))) |
2767 { | |
2768 ++face_change_count; | |
2769 ++windows_or_buffers_changed; | |
2770 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2771 |
24995 | 2772 xassert (LFACEP (lface)); |
2773 check_lface (lface); | |
2774 return lface; | |
2775 } | |
2776 | |
2777 | |
2778 DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p, | |
2779 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
|
2780 doc: /* Return non-nil if FACE names a face. |
106436 | 2781 FACE should be a symbol or string. |
64578
91757d0e430d
(Finternal_lisp_face_p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64426
diff
changeset
|
2782 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
|
2783 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
|
2784 Otherwise check for the existence of a global face. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2785 (Lisp_Object face, Lisp_Object frame) |
24995 | 2786 { |
2787 Lisp_Object lface; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2788 |
81146
8f50479e40d1
(Finternal_lisp_face_p): Signal error for face alias loops.
Juanma Barranquero <lekktu@gmail.com>
parents:
77903
diff
changeset
|
2789 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
|
2790 |
24995 | 2791 if (!NILP (frame)) |
2792 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2793 CHECK_LIVE_FRAME (frame); |
24995 | 2794 lface = lface_from_face_name (XFRAME (frame), face, 0); |
2795 } | |
2796 else | |
2797 lface = lface_from_face_name (NULL, face, 0); | |
2798 | |
2799 return lface; | |
2800 } | |
2801 | |
2802 | |
2803 DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |
2804 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
|
2805 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
|
2806 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
|
2807 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
|
2808 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
|
2809 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
|
2810 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
|
2811 |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2812 The value is TO. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2813 (Lisp_Object from, Lisp_Object to, Lisp_Object frame, Lisp_Object new_frame) |
24995 | 2814 { |
2815 Lisp_Object lface, copy; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2816 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2817 CHECK_SYMBOL (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2818 CHECK_SYMBOL (to); |
24995 | 2819 |
2820 if (EQ (frame, Qt)) | |
2821 { | |
2822 /* Copy global definition of FROM. We don't make copies of | |
2823 strings etc. because 20.2 didn't do it either. */ | |
2824 lface = lface_from_face_name (NULL, from, 1); | |
2825 copy = Finternal_make_lisp_face (to, Qnil); | |
2826 } | |
2827 else | |
2828 { | |
2829 /* 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
|
2830 if (NILP (new_frame)) |
21c659556daa
(Finternal_copy_lisp_face): Small cleanup; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56063
diff
changeset
|
2831 new_frame = frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2832 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2833 CHECK_LIVE_FRAME (new_frame); |
24995 | 2834 lface = lface_from_face_name (XFRAME (frame), from, 1); |
2835 copy = Finternal_make_lisp_face (to, new_frame); | |
2836 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2837 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
2838 memcpy (XVECTOR (copy)->contents, XVECTOR (lface)->contents, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
2839 LFACE_VECTOR_SIZE * sizeof (Lisp_Object)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2840 |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2841 /* 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
|
2842 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
|
2843 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
|
2844 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
|
2845 init_iterator will then free realized faces. */ |
57107 | 2846 if (NILP (Fget (to, Qface_no_inherit))) |
2847 { | |
2848 ++face_change_count; | |
2849 ++windows_or_buffers_changed; | |
2850 } | |
43270
935816913346
(Finternal_make_lisp_face, Finternal_copy_lisp_face)
Richard M. Stallman <rms@gnu.org>
parents:
43203
diff
changeset
|
2851 |
24995 | 2852 return to; |
2853 } | |
2854 | |
2855 | |
2856 DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, | |
2857 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
|
2858 doc: /* Set attribute ATTR of FACE to VALUE. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2859 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
|
2860 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
|
2861 FRAME t means change the default for new frames. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
2862 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
|
2863 for new frames. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2864 (Lisp_Object face, Lisp_Object attr, Lisp_Object value, Lisp_Object frame) |
6784
d41c216ccd27
(frame_update_line_height): Check param_faces[i] not null.
Richard M. Stallman <rms@gnu.org>
parents:
6768
diff
changeset
|
2865 { |
24995 | 2866 Lisp_Object lface; |
2867 Lisp_Object old_value = Qnil; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2868 /* 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
|
2869 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
|
2870 enum font_property_index prop_index = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2871 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2872 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2873 CHECK_SYMBOL (attr); |
24995 | 2874 |
61914
f658c441541a
(resolve_face_name): Add arg SIGNAL_P. Calls changed.
Kim F. Storm <storm@cua.dk>
parents:
61726
diff
changeset
|
2875 face = resolve_face_name (face, 1); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
2876 |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2877 /* 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
|
2878 default for new frames. */ |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2879 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
|
2880 { |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2881 Lisp_Object tail; |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
2882 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
|
2883 FOR_EACH_FRAME (tail, frame) |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2884 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
|
2885 return face; |
31440
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2886 } |
67f5b4186ed2
(Finternal_set_lisp_face_attribute): If FRAME is 0,
Gerd Moellmann <gerd@gnu.org>
parents:
31292
diff
changeset
|
2887 |
24995 | 2888 /* Set lface to the Lisp attribute vector of FACE. */ |
2889 if (EQ (frame, Qt)) | |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
2890 { |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
2891 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
|
2892 |
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
2893 /* 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
|
2894 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
|
2895 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
|
2896 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
|
2897 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
|
2898 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
|
2899 if (UNSPECIFIEDP (value)) |
67056
3ce17ff4a61f
(merge_face_vectors): Don't do :ignore-defface overwriting here.
Chong Yidong <cyd@stupidchicken.com>
parents:
67046
diff
changeset
|
2900 value = Qignore_defface; |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
2901 } |
24995 | 2902 else |
2903 { | |
2904 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
2905 frame = selected_frame; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
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); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2909 |
24995 | 2910 /* If a frame-local face doesn't exist yet, create one. */ |
2911 if (NILP (lface)) | |
2912 lface = Finternal_make_lisp_face (face, frame); | |
2913 } | |
2914 | |
2915 if (EQ (attr, QCfamily)) | |
2916 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2917 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 2918 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2919 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
|
2920 if (SCHARS (value) == 0) |
24995 | 2921 signal_error ("Invalid face family", value); |
2922 } | |
2923 old_value = LFACE_FAMILY (lface); | |
2924 LFACE_FAMILY (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2925 prop_index = FONT_FAMILY_INDEX; |
24995 | 2926 } |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2927 else if (EQ (attr, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2928 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2929 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2930 { |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2931 CHECK_STRING (value); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2932 if (SCHARS (value) == 0) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2933 signal_error ("Invalid face foundry", value); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2934 } |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2935 old_value = LFACE_FOUNDRY (lface); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2936 LFACE_FOUNDRY (lface) = value; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2937 prop_index = FONT_FOUNDRY_INDEX; |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
2938 } |
24995 | 2939 else if (EQ (attr, QCheight)) |
2940 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2941 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 2942 { |
100816
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2943 if (EQ (face, Qdefault)) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2944 { |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2945 /* 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
|
2946 if (!INTEGERP (value) || XINT (value) <= 0) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2947 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
|
2948 } |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2949 else |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2950 { |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2951 /* 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
|
2952 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
|
2953 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
|
2954 make_number (10), |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2955 Qnil); |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2956 if (!INTEGERP (test) || XINT (test) <= 0) |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2957 signal_error ("Invalid face height", value); |
b6d603864354
(Finternal_set_lisp_face_attribute): Improve error message.
Chong Yidong <cyd@stupidchicken.com>
parents:
100666
diff
changeset
|
2958 } |
24995 | 2959 } |
31178 | 2960 |
24995 | 2961 old_value = LFACE_HEIGHT (lface); |
2962 LFACE_HEIGHT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2963 prop_index = FONT_SIZE_INDEX; |
24995 | 2964 } |
2965 else if (EQ (attr, QCweight)) | |
2966 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2967 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 2968 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2969 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2970 if (FONT_WEIGHT_NAME_NUMERIC (value) < 0) |
24995 | 2971 signal_error ("Invalid face weight", value); |
2972 } | |
2973 old_value = LFACE_WEIGHT (lface); | |
2974 LFACE_WEIGHT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2975 prop_index = FONT_WEIGHT_INDEX; |
24995 | 2976 } |
2977 else if (EQ (attr, QCslant)) | |
2978 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2979 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 2980 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
2981 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2982 if (FONT_SLANT_NAME_NUMERIC (value) < 0) |
24995 | 2983 signal_error ("Invalid face slant", value); |
2984 } | |
2985 old_value = LFACE_SLANT (lface); | |
2986 LFACE_SLANT (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
2987 prop_index = FONT_SLANT_INDEX; |
24995 | 2988 } |
2989 else if (EQ (attr, QCunderline)) | |
2990 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
2991 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 2992 if ((SYMBOLP (value) |
2993 && !EQ (value, Qt) | |
2994 && !EQ (value, Qnil)) | |
2995 /* Underline color. */ | |
2996 || (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
|
2997 && SCHARS (value) == 0)) |
24995 | 2998 signal_error ("Invalid face underline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
2999 |
24995 | 3000 old_value = LFACE_UNDERLINE (lface); |
3001 LFACE_UNDERLINE (lface) = value; | |
3002 } | |
3003 else if (EQ (attr, QCoverline)) | |
3004 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3005 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3006 if ((SYMBOLP (value) |
3007 && !EQ (value, Qt) | |
3008 && !EQ (value, Qnil)) | |
3009 /* Overline color. */ | |
3010 || (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
|
3011 && SCHARS (value) == 0)) |
24995 | 3012 signal_error ("Invalid face overline", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3013 |
24995 | 3014 old_value = LFACE_OVERLINE (lface); |
3015 LFACE_OVERLINE (lface) = value; | |
3016 } | |
3017 else if (EQ (attr, QCstrike_through)) | |
3018 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3019 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3020 if ((SYMBOLP (value) |
3021 && !EQ (value, Qt) | |
3022 && !EQ (value, Qnil)) | |
3023 /* Strike-through color. */ | |
3024 || (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
|
3025 && SCHARS (value) == 0)) |
24995 | 3026 signal_error ("Invalid face strike-through", value); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3027 |
24995 | 3028 old_value = LFACE_STRIKE_THROUGH (lface); |
3029 LFACE_STRIKE_THROUGH (lface) = value; | |
3030 } | |
3031 else if (EQ (attr, QCbox)) | |
3032 { | |
3033 int valid_p; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3034 |
24995 | 3035 /* Allow t meaning a simple box of width 1 in foreground color |
3036 of the face. */ | |
3037 if (EQ (value, Qt)) | |
3038 value = make_number (1); | |
3039 | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3040 if (UNSPECIFIEDP (value) || IGNORE_DEFFACE_P (value)) |
24995 | 3041 valid_p = 1; |
3042 else if (NILP (value)) | |
3043 valid_p = 1; | |
3044 else if (INTEGERP (value)) | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3045 valid_p = XINT (value) != 0; |
24995 | 3046 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
|
3047 valid_p = SCHARS (value) > 0; |
24995 | 3048 else if (CONSP (value)) |
3049 { | |
3050 Lisp_Object tem; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3051 |
24995 | 3052 tem = value; |
3053 while (CONSP (tem)) | |
3054 { | |
3055 Lisp_Object k, v; | |
3056 | |
3057 k = XCAR (tem); | |
3058 tem = XCDR (tem); | |
3059 if (!CONSP (tem)) | |
3060 break; | |
3061 v = XCAR (tem); | |
3062 tem = XCDR (tem); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3063 |
24995 | 3064 if (EQ (k, QCline_width)) |
3065 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
3066 if (!INTEGERP (v) || XINT (v) == 0) |
24995 | 3067 break; |
3068 } | |
3069 else if (EQ (k, QCcolor)) | |
3070 { | |
60150
ffb5cb773521
(Finternal_set_lisp_face_attribute): Allow :color property
Kim F. Storm <storm@cua.dk>
parents:
59924
diff
changeset
|
3071 if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
24995 | 3072 break; |
3073 } | |
3074 else if (EQ (k, QCstyle)) | |
3075 { | |
3076 if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button)) | |
3077 break; | |
3078 } | |
3079 else | |
3080 break; | |
3081 } | |
3082 | |
3083 valid_p = NILP (tem); | |
3084 } | |
3085 else | |
3086 valid_p = 0; | |
3087 | |
3088 if (!valid_p) | |
3089 signal_error ("Invalid face box", value); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3090 |
24995 | 3091 old_value = LFACE_BOX (lface); |
3092 LFACE_BOX (lface) = value; | |
3093 } | |
3094 else if (EQ (attr, QCinverse_video) | |
3095 || EQ (attr, QCreverse_video)) | |
3096 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3097 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3098 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3099 CHECK_SYMBOL (value); |
24995 | 3100 if (!EQ (value, Qt) && !NILP (value)) |
3101 signal_error ("Invalid inverse-video face attribute value", value); | |
3102 } | |
3103 old_value = LFACE_INVERSE (lface); | |
3104 LFACE_INVERSE (lface) = value; | |
3105 } | |
3106 else if (EQ (attr, QCforeground)) | |
3107 { | |
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3108 /* Compatibility with 20.x. */ |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3109 if (NILP (value)) |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3110 value = Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3111 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3112 { |
3113 /* Don't check for valid color names here because it depends | |
3114 on the frame (display) whether the color will be valid | |
3115 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
|
3116 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
|
3117 if (SCHARS (value) == 0) |
24995 | 3118 signal_error ("Empty foreground color value", value); |
3119 } | |
3120 old_value = LFACE_FOREGROUND (lface); | |
3121 LFACE_FOREGROUND (lface) = value; | |
3122 } | |
3123 else if (EQ (attr, QCbackground)) | |
3124 { | |
98780
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3125 /* Compatibility with 20.x. */ |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3126 if (NILP (value)) |
96300bdd6164
(Finternal_set_lisp_face_attribute): Make null values of :foreground
Chong Yidong <cyd@stupidchicken.com>
parents:
98715
diff
changeset
|
3127 value = Qunspecified; |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3128 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3129 { |
3130 /* Don't check for valid color names here because it depends | |
3131 on the frame (display) whether the color will be valid | |
3132 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
|
3133 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
|
3134 if (SCHARS (value) == 0) |
24995 | 3135 signal_error ("Empty background color value", value); |
3136 } | |
3137 old_value = LFACE_BACKGROUND (lface); | |
3138 LFACE_BACKGROUND (lface) = value; | |
3139 } | |
3140 else if (EQ (attr, QCstipple)) | |
3141 { | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3142 #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
|
3143 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
24995 | 3144 && !NILP (value) |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
3145 && NILP (Fbitmap_spec_p (value))) |
24995 | 3146 signal_error ("Invalid stipple attribute", value); |
3147 old_value = LFACE_STIPPLE (lface); | |
3148 LFACE_STIPPLE (lface) = value; | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96551
diff
changeset
|
3149 #endif /* HAVE_X_WINDOWS || HAVE_NS */ |
24995 | 3150 } |
3151 else if (EQ (attr, QCwidth)) | |
3152 { | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3153 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) |
24995 | 3154 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3155 CHECK_SYMBOL (value); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3156 if (FONT_WIDTH_NAME_NUMERIC (value) < 0) |
24995 | 3157 signal_error ("Invalid face width", value); |
3158 } | |
3159 old_value = LFACE_SWIDTH (lface); | |
3160 LFACE_SWIDTH (lface) = value; | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3161 prop_index = FONT_WIDTH_INDEX; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3162 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3163 else if (EQ (attr, QCfont)) |
24995 | 3164 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3165 #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
|
3166 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
|
3167 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3168 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
|
3169 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3170 FRAME_PTR f; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3171 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3172 old_value = LFACE_FONT (lface); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3173 if (! FONTP (value)) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3174 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3175 if (STRINGP (value)) |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3176 { |
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
|
3177 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
|
3178 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
|
3179 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 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
|
3185 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3186 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3187 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
|
3188 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3189 if (EQ (frame, Qt)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3190 f = XFRAME (selected_frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3191 else |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3192 f = XFRAME (frame); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3193 if (! FONT_OBJECT_P (value)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3194 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3195 Lisp_Object *attrs = XVECTOR (lface)->contents; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3196 Lisp_Object font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3197 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3198 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
|
3199 if (NILP (font_object)) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3200 signal_error ("Font not available", value); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3201 value = font_object; |
90463
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3202 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3203 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
|
3204 } |
1d40cee6b4dc
(check_lface_attrs) [USE_FONT_BACKEND]: Accept font
Kenichi Handa <handa@m17n.org>
parents:
90444
diff
changeset
|
3205 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3206 LFACE_FONT (lface) = value; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3207 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3208 #endif /* HAVE_WINDOW_SYSTEM */ |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3209 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3210 else if (EQ (attr, QCfontset)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3211 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3212 #ifdef HAVE_WINDOW_SYSTEM |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3213 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
|
3214 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3215 Lisp_Object tmp; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3216 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3217 old_value = LFACE_FONTSET (lface); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3218 tmp = Fquery_fontset (value, Qnil); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3219 if (NILP (tmp)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3220 signal_error ("Invalid fontset name", value); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3221 LFACE_FONTSET (lface) = value = tmp; |
40224
12dcadf8cb59
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
40023
diff
changeset
|
3222 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3223 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3224 } |
31178 | 3225 else if (EQ (attr, QCinherit)) |
3226 { | |
3227 Lisp_Object tail; | |
3228 if (SYMBOLP (value)) | |
3229 tail = Qnil; | |
3230 else | |
3231 for (tail = value; CONSP (tail); tail = XCDR (tail)) | |
3232 if (!SYMBOLP (XCAR (tail))) | |
3233 break; | |
3234 if (NILP (tail)) | |
3235 LFACE_INHERIT (lface) = value; | |
3236 else | |
31202
1733db535955
(lface_fully_specified_p): Handle :inherit.
Gerd Moellmann <gerd@gnu.org>
parents:
31178
diff
changeset
|
3237 signal_error ("Invalid face inheritance", value); |
31178 | 3238 } |
24995 | 3239 else if (EQ (attr, QCbold)) |
3240 { | |
3241 old_value = LFACE_WEIGHT (lface); | |
3242 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
|
3243 prop_index = FONT_WEIGHT_INDEX; |
24995 | 3244 } |
3245 else if (EQ (attr, QCitalic)) | |
3246 { | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3247 attr = QCslant; |
24995 | 3248 old_value = LFACE_SLANT (lface); |
3249 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
|
3250 prop_index = FONT_SLANT_INDEX; |
24995 | 3251 } |
3252 else | |
3253 signal_error ("Invalid face attribute name", attr); | |
3254 | |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3255 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
|
3256 { |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3257 /* 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
|
3258 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
|
3259 (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
|
3260 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
|
3261 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
|
3262 width. */ |
ef67b2d51a4d
(Finternal_set_lisp_face_attribute): If the font is to be updated,
Chong Yidong <cyd@stupidchicken.com>
parents:
97930
diff
changeset
|
3263 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
|
3264 } |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3265 |
24995 | 3266 /* Changing a named face means that all realized faces depending on |
3267 that face are invalid. Since we cannot tell which realized faces | |
3268 depend on the face, make sure they are all removed. This is done | |
3269 by incrementing face_change_count. The next call to | |
3270 init_iterator will then free realized faces. */ | |
3271 if (!EQ (frame, Qt) | |
57107 | 3272 && 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
|
3273 && NILP (Fequal (old_value, value))) |
24995 | 3274 { |
3275 ++face_change_count; | |
3276 ++windows_or_buffers_changed; | |
3277 } | |
3278 | |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
3279 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) |
24995 | 3280 && NILP (Fequal (old_value, value))) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3281 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3282 Lisp_Object param; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3283 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3284 param = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3285 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3286 if (EQ (face, Qdefault)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3287 { |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3288 #ifdef HAVE_WINDOW_SYSTEM |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3289 /* 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
|
3290 reflected in changed `font' frame parameters. */ |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3291 if (FRAMEP (frame) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3292 && (prop_index || EQ (attr, QCfont)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3293 && lface_fully_specified_p (XVECTOR (lface)->contents)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3294 set_font_frame_param (frame, lface); |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3295 else |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3296 #endif /* HAVE_WINDOW_SYSTEM */ |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3297 |
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3298 if (EQ (attr, QCforeground)) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3299 param = Qforeground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3300 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3301 param = Qbackground_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3302 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3303 #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
|
3304 #ifndef WINDOWSNT |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3305 else if (EQ (face, Qscroll_bar)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3306 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3307 /* 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
|
3308 `scroll-bar-foreground' and `scroll-bar-background'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3309 if (EQ (attr, QCforeground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3310 param = Qscroll_bar_foreground; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3311 else if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3312 param = Qscroll_bar_background; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3313 } |
31570
9eeff4863080
Remove conditional compilation on SCALABLE_FONTS.
Gerd Moellmann <gerd@gnu.org>
parents:
31522
diff
changeset
|
3314 #endif /* not WINDOWSNT */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3315 else if (EQ (face, Qborder)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3316 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3317 /* Changing background color of `border' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3318 `border-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3319 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3320 param = Qborder_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3321 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3322 else if (EQ (face, Qcursor)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3323 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3324 /* Changing background color of `cursor' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3325 `cursor-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3326 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3327 param = Qcursor_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3328 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3329 else if (EQ (face, Qmouse)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3330 { |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3331 /* Changing background color of `mouse' sets frame parameter |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3332 `mouse-color'. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3333 if (EQ (attr, QCbackground)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3334 param = Qmouse_color; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3335 } |
36481
8456d3257f81
(Finternal_set_lisp_face_attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
36066
diff
changeset
|
3336 #endif /* HAVE_WINDOW_SYSTEM */ |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
3337 else if (EQ (face, Qmenu)) |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3338 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3339 /* 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
|
3340 realizing faces on FRAME. FRAME t change the |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3341 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
|
3342 setting the flag in new face caches */ |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3343 if (FRAMEP (frame)) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3344 { |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3345 struct frame *f = XFRAME (frame); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3346 if (FRAME_FACE_CACHE (f) == NULL) |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3347 FRAME_FACE_CACHE (f) = make_face_cache (f); |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3348 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
|
3349 } |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3350 else |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3351 menu_face_changed_default = 1; |
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
3352 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3353 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3354 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
|
3355 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3356 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
|
3357 /* 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
|
3358 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3359 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
|
3360 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3361 else |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3362 /* 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
|
3363 { |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3364 Lisp_Object cons; |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3365 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
|
3366 XSETCAR (cons, param); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3367 XSETCDR (cons, value); |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3368 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
|
3369 } |
bf08eafda9a3
(merge_face_vectors): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
3370 } |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3371 } |
24995 | 3372 |
3373 return face; | |
3374 } | |
3375 | |
3376 | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3377 /* 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
|
3378 has been assigned the value NEW_VALUE. */ |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3379 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3380 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
3381 update_face_from_frame_parameter (struct frame *f, Lisp_Object param, Lisp_Object new_value) |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3382 { |
57107 | 3383 Lisp_Object face = Qnil; |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3384 Lisp_Object lface; |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3385 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3386 /* 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
|
3387 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
|
3388 face-set-after-frame-defaults. */ |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3389 if (NILP (f->face_alist)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3390 return; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3391 |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3392 if (EQ (param, Qforeground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3393 { |
57107 | 3394 face = Qdefault; |
3395 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
|
3396 LFACE_FOREGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3397 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3398 realize_basic_faces (f); |
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 else if (EQ (param, Qbackground_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3401 { |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3402 Lisp_Object frame; |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3403 |
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
3404 /* 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
|
3405 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
|
3406 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
|
3407 XSETFRAME (frame, f); |
63642
cb0d171c8273
Rename obsolete function Qframe_update_face_colors to
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
3408 call1 (Qframe_set_background_mode, frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3409 |
57107 | 3410 face = Qdefault; |
3411 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
|
3412 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3413 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3414 realize_basic_faces (f); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3415 } |
109118
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3416 #ifdef HAVE_WINDOW_SYSTEM |
57107 | 3417 else if (EQ (param, Qborder_color)) |
3418 { | |
3419 face = Qborder; | |
3420 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
|
3421 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3422 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3423 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3424 else if (EQ (param, Qcursor_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3425 { |
57107 | 3426 face = Qcursor; |
3427 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
|
3428 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3429 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3430 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3431 else if (EQ (param, Qmouse_color)) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3432 { |
57107 | 3433 face = Qmouse; |
3434 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
|
3435 LFACE_BACKGROUND (lface) = (STRINGP (new_value) |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3436 ? new_value : Qunspecified); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3437 } |
109118
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3438 #endif |
57107 | 3439 |
3440 /* Changing a named face means that all realized faces depending on | |
3441 that face are invalid. Since we cannot tell which realized faces | |
3442 depend on the face, make sure they are all removed. This is done | |
3443 by incrementing face_change_count. The next call to | |
3444 init_iterator will then free realized faces. */ | |
3445 if (!NILP (face) | |
3446 && NILP (Fget (face, Qface_no_inherit))) | |
3447 { | |
3448 ++face_change_count; | |
3449 ++windows_or_buffers_changed; | |
3450 } | |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3451 } |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3452 |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3453 |
109118
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3454 #ifdef HAVE_WINDOW_SYSTEM |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3455 |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3456 /* Set the `font' frame parameter of FRAME determined from the |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3457 font-object set in `default' face attributes LFACE. */ |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3458 |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3459 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
3460 set_font_frame_param (Lisp_Object frame, Lisp_Object lface) |
109118
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3461 { |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3462 struct frame *f = XFRAME (frame); |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3463 Lisp_Object font; |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3464 |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3465 if (FRAME_WINDOW_P (f) |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3466 /* Don't do anything if the font is `unspecified'. This can |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3467 happen during frame creation. */ |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3468 && (font = LFACE_FONT (lface), |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3469 ! UNSPECIFIEDP (font))) |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3470 { |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3471 if (FONT_SPEC_P (font)) |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3472 { |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3473 font = font_load_for_lface (f, XVECTOR (lface)->contents, font); |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3474 if (NILP (font)) |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3475 return; |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3476 LFACE_FONT (lface) = font; |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3477 } |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3478 f->default_face_done_p = 0; |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3479 Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3480 } |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3481 } |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3482 |
254d81c0e750
Fix setting colors on MS-DOS frames.
Eli Zaretskii <eliz@gnu.org>
parents:
109100
diff
changeset
|
3483 |
24995 | 3484 /* Get the value of X resource RESOURCE, class CLASS for the display |
3485 of frame FRAME. This is here because ordinary `x-get-resource' | |
3486 doesn't take a frame argument. */ | |
3487 | |
3488 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
|
3489 Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3490 (Lisp_Object resource, Lisp_Object class, Lisp_Object frame) |
24995 | 3491 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3492 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
|
3493 CHECK_STRING (resource); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3494 CHECK_STRING (class); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3495 CHECK_LIVE_FRAME (frame); |
24995 | 3496 BLOCK_INPUT; |
3497 value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)), | |
3498 resource, class, Qnil, Qnil); | |
3499 UNBLOCK_INPUT; | |
3500 return value; | |
3501 } | |
3502 | |
3503 | |
3504 /* Return resource string VALUE as a boolean value, i.e. nil, or t. | |
3505 If VALUE is "on" or "true", return t. If VALUE is "off" or | |
3506 "false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an | |
3507 error; if SIGNAL_P is zero, return 0. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3508 |
24995 | 3509 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
3510 face_boolean_x_resource_value (Lisp_Object value, int signal_p) |
24995 | 3511 { |
3512 Lisp_Object result = make_number (0); | |
3513 | |
3514 xassert (STRINGP (value)); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3515 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3516 if (xstrcasecmp (SDATA (value), "on") == 0 |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3517 || xstrcasecmp (SDATA (value), "true") == 0) |
24995 | 3518 result = Qt; |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3519 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
|
3520 || xstrcasecmp (SDATA (value), "false") == 0) |
24995 | 3521 result = Qnil; |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3522 else if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
24995 | 3523 result = Qunspecified; |
3524 else if (signal_p) | |
3525 signal_error ("Invalid face attribute value from X resource", value); | |
3526 | |
3527 return result; | |
3528 } | |
3529 | |
3530 | |
3531 DEFUN ("internal-set-lisp-face-attribute-from-resource", | |
3532 Finternal_set_lisp_face_attribute_from_resource, | |
3533 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
|
3534 3, 4, 0, doc: /* */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3535 (Lisp_Object face, Lisp_Object attr, Lisp_Object value, Lisp_Object frame) |
24995 | 3536 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3537 CHECK_SYMBOL (face); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3538 CHECK_SYMBOL (attr); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3539 CHECK_STRING (value); |
24995 | 3540 |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
3541 if (xstrcasecmp (SDATA (value), "unspecified") == 0) |
24995 | 3542 value = Qunspecified; |
3543 else if (EQ (attr, QCheight)) | |
3544 { | |
3545 value = Fstring_to_number (value, make_number (10)); | |
3546 if (XINT (value) <= 0) | |
3547 signal_error ("Invalid face height from X resource", value); | |
3548 } | |
3549 else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) | |
3550 value = face_boolean_x_resource_value (value, 1); | |
3551 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
|
3552 value = intern (SDATA (value)); |
24995 | 3553 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) |
3554 value = face_boolean_x_resource_value (value, 1); | |
3555 else if (EQ (attr, QCunderline) | |
3556 || EQ (attr, QCoverline) | |
40603
e8ff19a0b76e
(Finternal_set_lisp_face_attribute_from_resource):
Gerd Moellmann <gerd@gnu.org>
parents:
40598
diff
changeset
|
3557 || EQ (attr, QCstrike_through)) |
24995 | 3558 { |
3559 Lisp_Object boolean_value; | |
3560 | |
3561 /* If the result of face_boolean_x_resource_value is t or nil, | |
3562 VALUE does NOT specify a color. */ | |
3563 boolean_value = face_boolean_x_resource_value (value, 0); | |
3564 if (SYMBOLP (boolean_value)) | |
3565 value = boolean_value; | |
3566 } | |
67130
c5ff1098b0b8
(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
Eli Zaretskii <eliz@gnu.org>
parents:
67056
diff
changeset
|
3567 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
|
3568 value = Fcar (Fread_from_string (value, Qnil, Qnil)); |
24995 | 3569 |
3570 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
|
3571 } |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
3572 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
3573 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 3574 |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3575 |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3576 /*********************************************************************** |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3577 Menu face |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3578 ***********************************************************************/ |
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
3579 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3580 #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
|
3581 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3582 /* 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
|
3583 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3584 static void |
109372
dd04c65fb401
Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109364
diff
changeset
|
3585 x_update_menu_appearance (struct frame *f) |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3586 { |
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3587 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
|
3588 XrmDatabase rdb; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3589 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3590 if (dpyinfo |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3591 && (rdb = XrmGetDatabase (FRAME_X_DISPLAY (f)), |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3592 rdb != NULL)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3593 { |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3594 char line[512]; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3595 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
|
3596 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
|
3597 const char *myname = SDATA (Vx_resource_name); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3598 int changed_p = 0; |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3599 #ifdef USE_MOTIF |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3600 const char *popup_path = "popup_menu"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3601 #else |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3602 const char *popup_path = "menu.popup"; |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3603 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3604 |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3605 if (STRINGP (LFACE_FOREGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3606 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3607 sprintf (line, "%s.%s*foreground: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3608 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
|
3609 SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3610 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3611 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
|
3612 myname, SDATA (LFACE_FOREGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3613 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3614 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3615 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3616 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3617 if (STRINGP (LFACE_BACKGROUND (lface))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3618 { |
36956
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3619 sprintf (line, "%s.%s*background: %s", |
22c5aa03d4aa
(x_update_menu_appearance): Use a different path
Gerd Moellmann <gerd@gnu.org>
parents:
36946
diff
changeset
|
3620 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
|
3621 SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3622 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3623 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
|
3624 myname, SDATA (LFACE_BACKGROUND (lface))); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3625 XrmPutLineResource (&rdb, line); |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3626 changed_p = 1; |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3627 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3628 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3629 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
|
3630 /* 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
|
3631 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
|
3632 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
|
3633 && FONTP (LFACE_FONT (lface)) |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3634 && (!UNSPECIFIEDP (LFACE_FAMILY (lface)) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3635 || !UNSPECIFIEDP (LFACE_FOUNDRY (lface)) |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3636 || !UNSPECIFIEDP (LFACE_SWIDTH (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3637 || !UNSPECIFIEDP (LFACE_WEIGHT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3638 || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3639 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3640 { |
95189
70380eb2fa9d
(x_update_menu_appearance): Call Ffont_xlfd_name with
Kenichi Handa <handa@m17n.org>
parents:
95178
diff
changeset
|
3641 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
|
3642 #ifdef USE_MOTIF |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3643 const char *suffix = "List"; |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3644 Bool motif = True; |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3645 #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
|
3646 #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
|
3647 |
7325563a1148
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Jan Djärv <jan.h.d@swipnet.se>
parents:
64084
diff
changeset
|
3648 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
|
3649 #else |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3650 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
|
3651 #endif |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3652 Bool motif = False; |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3653 #endif |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3654 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3655 if (! NILP (xlfd)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3656 { |
60699
11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60669
diff
changeset
|
3657 #if defined HAVE_X_I18N |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3658 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
|
3659 #else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3660 char *fontsetname = (char *) SDATA (xlfd); |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
3661 #endif |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3662 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
|
3663 myname, suffix, fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3664 XrmPutLineResource (&rdb, line); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3665 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
|
3666 myname, popup_path, suffix, fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3667 XrmPutLineResource (&rdb, line); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3668 changed_p = 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3669 if (fontsetname != (char *) SDATA (xlfd)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3670 xfree (fontsetname); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3671 } |
36936
bda3649d35fd
(x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Gerd Moellmann <gerd@gnu.org>
parents:
36932
diff
changeset
|
3672 } |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3673 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3674 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
|
3675 free_frame_menubar (f); |
36942
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3676 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3677 } |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3678 |
98755810fe71
(x_update_menu_appearance): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
36936
diff
changeset
|
3679 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
24995 | 3680 |
3681 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
3682 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
|
3683 Sface_attribute_relative_p, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3684 2, 2, 0, |
71576
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3685 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
|
3686 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
|
3687 with the value VALUE is relative. |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3688 |
b8678c550150
(Fface_attribute_relative_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70834
diff
changeset
|
3689 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
|
3690 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
|
3691 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
|
3692 However, for :height, floating point values are also relative. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3693 (Lisp_Object attribute, Lisp_Object value) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3694 { |
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3695 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
|
3696 return Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3697 else if (EQ (attribute, QCheight)) |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3698 return INTEGERP (value) ? Qnil : Qt; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3699 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3700 return Qnil; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3701 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3702 |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3703 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
|
3704 3, 3, 0, |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3705 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
|
3706 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
|
3707 the result will be absolute, otherwise it will be relative. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3708 (Lisp_Object attribute, Lisp_Object value1, Lisp_Object value2) |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3709 { |
66983
79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Chong Yidong <cyd@stupidchicken.com>
parents:
66974
diff
changeset
|
3710 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
|
3711 return value2; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3712 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
|
3713 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
|
3714 else |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3715 return value1; |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3716 } |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
3717 |
24995 | 3718 |
3719 DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |
3720 Sinternal_get_lisp_face_attribute, | |
3721 2, 3, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3722 doc: /* Return face attribute KEYWORD of face SYMBOL. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
3723 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
|
3724 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
|
3725 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
|
3726 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
|
3727 frames). If FRAME is omitted or nil, use the selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3728 (Lisp_Object symbol, Lisp_Object keyword, Lisp_Object frame) |
24995 | 3729 { |
3730 Lisp_Object lface, value = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3731 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3732 CHECK_SYMBOL (symbol); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3733 CHECK_SYMBOL (keyword); |
24995 | 3734 |
3735 if (EQ (frame, Qt)) | |
3736 lface = lface_from_face_name (NULL, symbol, 1); | |
3737 else | |
3738 { | |
3739 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
3740 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3741 CHECK_LIVE_FRAME (frame); |
24995 | 3742 lface = lface_from_face_name (XFRAME (frame), symbol, 1); |
3743 } | |
3744 | |
3745 if (EQ (keyword, QCfamily)) | |
3746 value = LFACE_FAMILY (lface); | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3747 else if (EQ (keyword, QCfoundry)) |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
3748 value = LFACE_FOUNDRY (lface); |
24995 | 3749 else if (EQ (keyword, QCheight)) |
3750 value = LFACE_HEIGHT (lface); | |
3751 else if (EQ (keyword, QCweight)) | |
3752 value = LFACE_WEIGHT (lface); | |
3753 else if (EQ (keyword, QCslant)) | |
3754 value = LFACE_SLANT (lface); | |
3755 else if (EQ (keyword, QCunderline)) | |
3756 value = LFACE_UNDERLINE (lface); | |
3757 else if (EQ (keyword, QCoverline)) | |
3758 value = LFACE_OVERLINE (lface); | |
3759 else if (EQ (keyword, QCstrike_through)) | |
3760 value = LFACE_STRIKE_THROUGH (lface); | |
3761 else if (EQ (keyword, QCbox)) | |
3762 value = LFACE_BOX (lface); | |
3763 else if (EQ (keyword, QCinverse_video) | |
3764 || EQ (keyword, QCreverse_video)) | |
3765 value = LFACE_INVERSE (lface); | |
3766 else if (EQ (keyword, QCforeground)) | |
3767 value = LFACE_FOREGROUND (lface); | |
3768 else if (EQ (keyword, QCbackground)) | |
3769 value = LFACE_BACKGROUND (lface); | |
3770 else if (EQ (keyword, QCstipple)) | |
3771 value = LFACE_STIPPLE (lface); | |
3772 else if (EQ (keyword, QCwidth)) | |
3773 value = LFACE_SWIDTH (lface); | |
31178 | 3774 else if (EQ (keyword, QCinherit)) |
3775 value = LFACE_INHERIT (lface); | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3776 else if (EQ (keyword, QCfont)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
3777 value = LFACE_FONT (lface); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3778 else if (EQ (keyword, QCfontset)) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
3779 value = LFACE_FONTSET (lface); |
24995 | 3780 else |
3781 signal_error ("Invalid face attribute name", keyword); | |
3782 | |
67046
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3783 if (IGNORE_DEFFACE_P (value)) |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3784 return Qunspecified; |
095993a59ddd
* xfaces.c (Finternal_set_lisp_face_attribute): Use
Chong Yidong <cyd@stupidchicken.com>
parents:
66983
diff
changeset
|
3785 |
24995 | 3786 return value; |
3787 } | |
3788 | |
3789 | |
3790 DEFUN ("internal-lisp-face-attribute-values", | |
3791 Finternal_lisp_face_attribute_values, | |
3792 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
|
3793 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
|
3794 Value is nil if ATTR doesn't have a discrete set of valid values. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3795 (Lisp_Object attr) |
24995 | 3796 { |
3797 Lisp_Object result = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3798 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3799 CHECK_SYMBOL (attr); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3800 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3801 if (EQ (attr, QCunderline)) |
24995 | 3802 result = Fcons (Qt, Fcons (Qnil, Qnil)); |
3803 else if (EQ (attr, QCoverline)) | |
3804 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3805 else if (EQ (attr, QCstrike_through)) | |
3806 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3807 else if (EQ (attr, QCinverse_video) || EQ (attr, QCreverse_video)) | |
3808 result = Fcons (Qt, Fcons (Qnil, Qnil)); | |
3809 | |
3810 return result; | |
3811 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3812 |
24995 | 3813 |
3814 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
|
3815 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
|
3816 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
|
3817 Default face attributes override any local face attributes. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3818 (Lisp_Object face, Lisp_Object frame) |
24995 | 3819 { |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3820 int i; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3821 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
|
3822 struct frame *f = XFRAME (frame); |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3823 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
3824 CHECK_LIVE_FRAME (frame); |
24995 | 3825 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
|
3826 local_lface = lface_from_face_name (f, face, 0); |
24995 | 3827 if (NILP (local_lface)) |
3828 local_lface = Finternal_make_lisp_face (face, frame); | |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3829 |
31519
5a14247e8e26
(Finternal_set_lisp_face_attribute): Minor thinko.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31518
diff
changeset
|
3830 /* 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
|
3831 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
|
3832 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
|
3833 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
|
3834 "global before local" priority. */ |
31483
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3835 lvec = XVECTOR (local_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3836 gvec = XVECTOR (global_lface)->contents; |
5ef4cd475781
(default_face_vector): Function removed.
Miles Bader <miles@gnu.org>
parents:
31463
diff
changeset
|
3837 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
|
3838 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
|
3839 lvec[i] = Qunspecified; |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3840 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
|
3841 lvec[i] = gvec[i]; |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3842 |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3843 /* 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
|
3844 `font' frame parameter. */ |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3845 if (EQ (face, Qdefault)) |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3846 { |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3847 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
|
3848 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
|
3849 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
|
3850 |
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3851 /* 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
|
3852 if (oldface) |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3853 { |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3854 /* 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
|
3855 the previously-cached vector. */ |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
3856 memcpy (attrs, oldface->lface, sizeof attrs); |
96529
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3857 merge_face_vectors (f, lvec, attrs, 0); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
3858 memcpy (lvec, attrs, sizeof attrs); |
96551
be8753b44809
(Finternal_merge_in_global_face): Save merged attributes for the
Chong Yidong <cyd@stupidchicken.com>
parents:
96532
diff
changeset
|
3859 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
|
3860 |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3861 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
|
3862 || ! 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
|
3863 || ! 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
|
3864 || ! 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
|
3865 || ! 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
|
3866 || ! 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
|
3867 || ! 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
|
3868 && newface->font) |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3869 { |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3870 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
|
3871 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
|
3872 Qnil)); |
7ac98f33f18c
(Finternal_merge_in_global_face): Don't realize default face if it
Chong Yidong <cyd@stupidchicken.com>
parents:
96428
diff
changeset
|
3873 } |
96427
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3874 } |
1544b1dca916
(Finternal_merge_in_global_face): If default face was modified,
Chong Yidong <cyd@stupidchicken.com>
parents:
96263
diff
changeset
|
3875 } |
31507
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3876 |
ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
Gerd Moellmann <gerd@gnu.org>
parents:
31483
diff
changeset
|
3877 return Qnil; |
24995 | 3878 } |
3879 | |
3880 | |
3881 /* The following function is implemented for compatibility with 20.2. | |
3882 The function is used in x-resolve-fonts when it is asked to | |
3883 return fonts with the same size as the font of a face. This is | |
3884 done in fontset.el. */ | |
3885 | |
89835
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3886 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
|
3887 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
|
3888 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
|
3889 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
|
3890 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
|
3891 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
|
3892 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
|
3893 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
|
3894 if the optional third argument CHARACTER is given, |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3895 return the font name used for CHARACTER. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3896 (Lisp_Object face, Lisp_Object frame, Lisp_Object character) |
24995 | 3897 { |
3898 if (EQ (frame, Qt)) | |
3899 { | |
3900 Lisp_Object result = Qnil; | |
3901 Lisp_Object lface = lface_from_face_name (NULL, face, 1); | |
3902 | |
3903 if (!UNSPECIFIEDP (LFACE_WEIGHT (lface)) | |
3904 && !EQ (LFACE_WEIGHT (lface), Qnormal)) | |
3905 result = Fcons (Qbold, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3906 |
40441
024f6efc3f87
(Fface_font): Use UNSPECIFIEDP instead of NILP for
Gerd Moellmann <gerd@gnu.org>
parents:
40398
diff
changeset
|
3907 if (!UNSPECIFIEDP (LFACE_SLANT (lface)) |
24995 | 3908 && !EQ (LFACE_SLANT (lface), Qnormal)) |
3909 result = Fcons (Qitalic, result); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
3910 |
24995 | 3911 return result; |
3912 } | |
3913 else | |
3914 { | |
3915 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
|
3916 int face_id = lookup_named_face (f, face, 1); |
24995 | 3917 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
|
3918 |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3919 if (! face) |
4a7ac88259e1
(Fface_font): New optional arg CHARACTER.
Kenichi Handa <handa@m17n.org>
parents:
89701
diff
changeset
|
3920 return Qnil; |
89947
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
3921 #ifdef HAVE_WINDOW_SYSTEM |
89948
e94e49dc760e
(Fface_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89947
diff
changeset
|
3922 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
|
3923 { |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
3924 CHECK_CHARACTER (character); |
62d04caf8fb9
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
3925 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
|
3926 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
|
3927 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3928 return (face->font |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3929 ? face->font->props[FONT_NAME_INDEX] |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
3930 : Qnil); |
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3931 #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
|
3932 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
|
3933 ? "ms-dos" |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3934 : 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
|
3935 :"tty"); |
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94983
diff
changeset
|
3936 #endif |
24995 | 3937 } |
3938 } | |
3939 | |
3940 | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3941 /* 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
|
3942 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
|
3943 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
|
3944 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3945 static INLINE int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
3946 face_attr_equal_p (Lisp_Object v1, Lisp_Object v2) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3947 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3948 /* 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
|
3949 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
|
3950 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
|
3951 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3952 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3953 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
|
3954 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3955 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3956 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
|
3957 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3958 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
|
3959 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
|
3960 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3961 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
3962 return memcmp (SDATA (v1), SDATA (v2), SBYTES (v1)) == 0; |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3963 |
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
|
3964 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
|
3965 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
|
3966 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3967 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3968 default: |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3969 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
|
3970 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3971 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3972 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
3973 |
24995 | 3974 /* Compare face vectors V1 and V2 for equality. Value is non-zero if |
3975 all attributes are `equal'. Tries to be fast because this function | |
3976 is called quite often. */ | |
3977 | |
3978 static INLINE int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
3979 lface_equal_p (Lisp_Object *v1, Lisp_Object *v2) |
24995 | 3980 { |
3981 int i, equal_p = 1; | |
3982 | |
3983 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
|
3984 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
|
3985 |
24995 | 3986 return equal_p; |
3987 } | |
3988 | |
3989 | |
3990 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | |
3991 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
|
3992 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
|
3993 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
|
3994 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
|
3995 If FRAME is omitted or nil, use the selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3996 (Lisp_Object face1, Lisp_Object face2, Lisp_Object frame) |
24995 | 3997 { |
3998 int equal_p; | |
3999 struct frame *f; | |
4000 Lisp_Object lface1, lface2; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4001 |
24995 | 4002 if (EQ (frame, Qt)) |
4003 f = NULL; | |
4004 else | |
4005 /* Don't use check_x_frame here because this function is called | |
4006 before X frames exist. At that time, if FRAME is nil, | |
4007 selected_frame will be used which is the frame dumped with | |
4008 Emacs. That frame is not an X frame. */ | |
4009 f = frame_or_selected_frame (frame, 2); | |
4010 | |
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
|
4011 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
|
4012 lface2 = lface_from_face_name (f, face2, 1); |
24995 | 4013 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
4014 XVECTOR (lface2)->contents); | |
4015 return equal_p ? Qt : Qnil; | |
4016 } | |
4017 | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4018 |
24995 | 4019 DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p, |
4020 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
|
4021 doc: /* True if FACE has no attribute specified. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
4022 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
|
4023 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
|
4024 If FRAME is omitted or nil, use the selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
4025 (Lisp_Object face, Lisp_Object frame) |
24995 | 4026 { |
4027 struct frame *f; | |
4028 Lisp_Object lface; | |
4029 int i; | |
4030 | |
4031 if (NILP (frame)) | |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4032 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
4033 CHECK_LIVE_FRAME (frame); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
4034 f = XFRAME (frame); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4035 |
24995 | 4036 if (EQ (frame, Qt)) |
4037 lface = lface_from_face_name (NULL, face, 1); | |
4038 else | |
4039 lface = lface_from_face_name (f, face, 1); | |
4040 | |
4041 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
|
4042 if (!UNSPECIFIEDP (AREF (lface, i))) |
24995 | 4043 break; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4044 |
24995 | 4045 return i == LFACE_VECTOR_SIZE ? Qt : Qnil; |
4046 } | |
4047 | |
4048 | |
4049 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
|
4050 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
4051 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
|
4052 For internal use only. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
4053 (Lisp_Object frame) |
24995 | 4054 { |
4055 struct frame *f = frame_or_selected_frame (frame, 0); | |
4056 return f->face_alist; | |
4057 } | |
4058 | |
4059 | |
4060 /* Return a hash code for Lisp string STRING with case ignored. Used | |
4061 below in computing a hash value for a Lisp face. */ | |
4062 | |
4063 static INLINE unsigned | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4064 hash_string_case_insensitive (Lisp_Object string) |
24995 | 4065 { |
46556
71e205b50a3e
(may_use_scalable_font_p): Argument now points to
Ken Raeburn <raeburn@raeburn.org>
parents:
46478
diff
changeset
|
4066 const unsigned char *s; |
24995 | 4067 unsigned hash = 0; |
4068 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
|
4069 for (s = SDATA (string); *s; ++s) |
24995 | 4070 hash = (hash << 1) ^ tolower (*s); |
4071 return hash; | |
4072 } | |
4073 | |
4074 | |
4075 /* Return a hash code for face attribute vector V. */ | |
4076 | |
4077 static INLINE unsigned | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4078 lface_hash (Lisp_Object *v) |
24995 | 4079 { |
4080 return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4081 ^ hash_string_case_insensitive (v[LFACE_FOUNDRY_INDEX]) |
24995 | 4082 ^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX]) |
4083 ^ 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
|
4084 ^ XHASH (v[LFACE_WEIGHT_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4085 ^ XHASH (v[LFACE_SLANT_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4086 ^ XHASH (v[LFACE_SWIDTH_INDEX]) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
4087 ^ XHASH (v[LFACE_HEIGHT_INDEX])); |
24995 | 4088 } |
4089 | |
4090 | |
4091 /* Return non-zero if LFACE1 and LFACE2 specify the same font (without | |
4092 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
|
4093 family, point size, weight, width, slant, and font. Both |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4094 LFACE1 and LFACE2 must be fully-specified. */ |
24995 | 4095 |
4096 static INLINE int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4097 lface_same_font_attributes_p (Lisp_Object *lface1, Lisp_Object *lface2) |
24995 | 4098 { |
4099 xassert (lface_fully_specified_p (lface1) | |
4100 && lface_fully_specified_p (lface2)); | |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4101 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
|
4102 SDATA (lface2[LFACE_FAMILY_INDEX])) == 0 |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4103 && xstrcasecmp (SDATA (lface1[LFACE_FOUNDRY_INDEX]), |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4104 SDATA (lface2[LFACE_FOUNDRY_INDEX])) == 0 |
31178 | 4105 && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX]) |
24995 | 4106 && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX]) |
4107 && 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
|
4108 && 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
|
4109 && EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX]) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4110 && (EQ (lface1[LFACE_FONTSET_INDEX], lface2[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4111 || (STRINGP (lface1[LFACE_FONTSET_INDEX]) |
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4112 && STRINGP (lface2[LFACE_FONTSET_INDEX]) |
95220
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4113 && ! xstrcasecmp (SDATA (lface1[LFACE_FONTSET_INDEX]), |
010bd4373364
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95189
diff
changeset
|
4114 SDATA (lface2[LFACE_FONTSET_INDEX])))) |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
4115 ); |
24995 | 4116 } |
4117 | |
4118 | |
4119 | |
4120 /*********************************************************************** | |
4121 Realized Faces | |
4122 ***********************************************************************/ | |
4123 | |
4124 /* 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
|
4125 vector ATTR. */ |
24995 | 4126 |
4127 static struct face * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4128 make_realized_face (Lisp_Object *attr) |
24995 | 4129 { |
4130 struct face *face = (struct face *) xmalloc (sizeof *face); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4131 memset (face, 0, sizeof *face); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4132 face->ascii_face = face; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4133 memcpy (face->lface, attr, sizeof face->lface); |
24995 | 4134 return face; |
4135 } | |
4136 | |
4137 | |
4138 /* Free realized face FACE, including its X resources. FACE may | |
4139 be null. */ | |
4140 | |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4141 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4142 free_realized_face (struct frame *f, struct face *face) |
24995 | 4143 { |
4144 if (face) | |
4145 { | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4146 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4147 if (FRAME_WINDOW_P (f)) |
24995 | 4148 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4149 /* 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
|
4150 if (face->fontset >= 0 && face == face->ascii_face) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4151 free_face_fontset (f, face); |
24995 | 4152 if (face->gc) |
4153 { | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4154 BLOCK_INPUT; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4155 if (face->font) |
90414 | 4156 font_done_for_face (f, face); |
24995 | 4157 x_free_gc (f, face->gc); |
4158 face->gc = 0; | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4159 UNBLOCK_INPUT; |
24995 | 4160 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4161 |
24995 | 4162 free_face_colors (f, face); |
4163 x_destroy_bitmap (f, face->stipple); | |
4164 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4165 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4166 |
4167 xfree (face); | |
4168 } | |
4169 } | |
4170 | |
4171 | |
4172 /* Prepare face FACE for subsequent display on frame F. This | |
4173 allocated GCs if they haven't been allocated yet or have been freed | |
4174 by clearing the face cache. */ | |
4175 | |
4176 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4177 prepare_face_for_display (struct frame *f, struct face *face) |
24995 | 4178 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4179 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4180 xassert (FRAME_WINDOW_P (f)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4181 |
24995 | 4182 if (face->gc == 0) |
4183 { | |
4184 XGCValues xgcv; | |
4185 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; | |
4186 | |
4187 xgcv.foreground = face->foreground; | |
4188 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
|
4189 #ifdef HAVE_X_WINDOWS |
24995 | 4190 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
|
4191 #endif |
24995 | 4192 |
4193 BLOCK_INPUT; | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4194 #ifdef HAVE_X_WINDOWS |
24995 | 4195 if (face->stipple) |
4196 { | |
25092
79a5a567bdb0
(prepare_face_for_display): Use FillOpaqueStippled instead of
Gerd Moellmann <gerd@gnu.org>
parents:
25062
diff
changeset
|
4197 xgcv.fill_style = FillOpaqueStippled; |
24995 | 4198 xgcv.stipple = x_bitmap_pixmap (f, face->stipple); |
4199 mask |= GCFillStyle | GCStipple; | |
4200 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4201 #endif |
24995 | 4202 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
|
4203 if (face->font) |
90414 | 4204 font_prepare_for_face (f, face); |
24995 | 4205 UNBLOCK_INPUT; |
4206 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4207 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4208 } |
4209 | |
4210 | |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4211 /* 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
|
4212 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4213 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4214 color_distance (XColor *x, XColor *y) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4215 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4216 /* 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
|
4217 Quoting from that paper: |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4218 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4219 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
|
4220 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
|
4221 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
|
4222 gives far from optimal results. |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4223 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4224 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
|
4225 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4226 long r = (x->red - y->red) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4227 long g = (x->green - y->green) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4228 long b = (x->blue - y->blue) >> 8; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4229 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
|
4230 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4231 return |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4232 (((512 + r_mean) * r * r) >> 8) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4233 + 4 * g * g |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4234 + (((767 - r_mean) * b * b) >> 8); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4235 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4236 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4237 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4238 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
|
4239 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
|
4240 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
|
4241 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
|
4242 If FRAME is unspecified or nil, the current frame is used. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
4243 (Lisp_Object color1, Lisp_Object color2, Lisp_Object frame) |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4244 { |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4245 struct frame *f; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4246 XColor cdef1, cdef2; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4247 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4248 if (NILP (frame)) |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4249 frame = selected_frame; |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4250 CHECK_LIVE_FRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4251 f = XFRAME (frame); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4252 |
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
|
4253 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
|
4254 && !(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
|
4255 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
|
4256 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
|
4257 && !(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
|
4258 signal_error ("Invalid color", color2); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4259 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4260 return make_number (color_distance (&cdef1, &cdef2)); |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4261 } |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4262 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4263 |
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
4264 /*********************************************************************** |
24995 | 4265 Face Cache |
4266 ***********************************************************************/ | |
4267 | |
4268 /* Return a new face cache for frame F. */ | |
4269 | |
4270 static struct face_cache * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4271 make_face_cache (struct frame *f) |
24995 | 4272 { |
4273 struct face_cache *c; | |
4274 int size; | |
4275 | |
4276 c = (struct face_cache *) xmalloc (sizeof *c); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4277 memset (c, 0, sizeof *c); |
24995 | 4278 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; |
4279 c->buckets = (struct face **) xmalloc (size); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4280 memset (c->buckets, 0, size); |
24995 | 4281 c->size = 50; |
4282 c->faces_by_id = (struct face **) xmalloc (c->size * sizeof *c->faces_by_id); | |
4283 c->f = f; | |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
4284 c->menu_face_changed_p = menu_face_changed_default; |
24995 | 4285 return c; |
4286 } | |
4287 | |
4288 | |
4289 /* Clear out all graphics contexts for all realized faces, except for | |
4290 the basic faces. This should be done from time to time just to avoid | |
4291 keeping too many graphics contexts that are no longer needed. */ | |
4292 | |
4293 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4294 clear_face_gcs (struct face_cache *c) |
24995 | 4295 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4296 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
|
4297 { |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4298 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4299 int i; |
4300 for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i) | |
4301 { | |
4302 struct face *face = c->faces_by_id[i]; | |
4303 if (face && face->gc) | |
4304 { | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4305 BLOCK_INPUT; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4306 if (face->font) |
90414 | 4307 font_done_for_face (c->f, face); |
24995 | 4308 x_free_gc (c->f, face->gc); |
4309 face->gc = 0; | |
84976
372151e622f3
(load_face_font, free_realized_face, clear_face_gcs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84801
diff
changeset
|
4310 UNBLOCK_INPUT; |
24995 | 4311 } |
4312 } | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4313 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4314 } |
4315 } | |
4316 | |
4317 | |
55560
f262795a9004
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
Juanma Barranquero <lekktu@gmail.com>
parents:
55142
diff
changeset
|
4318 /* 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
|
4319 C may be null. If faces are freed, make sure the frame's current |
24995 | 4320 matrix is marked invalid, so that a display caused by an expose |
4321 event doesn't try to use faces we destroyed. */ | |
4322 | |
4323 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4324 free_realized_faces (struct face_cache *c) |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4325 { |
24995 | 4326 if (c && c->used) |
4327 { | |
4328 int i, size; | |
4329 struct frame *f = c->f; | |
4330 | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4331 /* 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
|
4332 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
|
4333 current matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4334 BLOCK_INPUT; |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4335 |
24995 | 4336 for (i = 0; i < c->used; ++i) |
4337 { | |
4338 free_realized_face (f, c->faces_by_id[i]); | |
4339 c->faces_by_id[i] = NULL; | |
4340 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4341 |
24995 | 4342 c->used = 0; |
4343 size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4344 memset (c->buckets, 0, size); |
24995 | 4345 |
4346 /* Must do a thorough redisplay the next time. Mark current | |
4347 matrices as invalid because they will reference faces freed | |
4348 above. This function is also called when a frame is | |
4349 destroyed. In this case, the root window of F is nil. */ | |
4350 if (WINDOWP (f->root_window)) | |
4351 { | |
4352 clear_current_matrices (f); | |
4353 ++windows_or_buffers_changed; | |
4354 } | |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4355 |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4356 UNBLOCK_INPUT; |
24995 | 4357 } |
4358 } | |
4359 | |
4360 | |
88394
b954eee715da
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43270
diff
changeset
|
4361 /* 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
|
4362 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4363 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4364 free_realized_faces_for_fontset (struct frame *f, int fontset) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4365 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4366 struct face_cache *cache = FRAME_FACE_CACHE (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4367 struct face *face; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4368 int i; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4369 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4370 /* 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
|
4371 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
|
4372 matrix still references freed faces. */ |
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4373 BLOCK_INPUT; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4374 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4375 for (i = 0; i < cache->used; i++) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4376 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4377 face = cache->faces_by_id[i]; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4378 if (face |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4379 && face->fontset == fontset) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4380 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4381 uncache_face (cache, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4382 free_realized_face (f, face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4383 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4384 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4385 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4386 /* 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
|
4387 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
|
4388 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
|
4389 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
|
4390 if (WINDOWP (f->root_window)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4391 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4392 clear_current_matrices (f); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4393 ++windows_or_buffers_changed; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4394 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4395 |
29284
d458dee20518
(free_realized_faces): Block/unblock input.
Gerd Moellmann <gerd@gnu.org>
parents:
28753
diff
changeset
|
4396 UNBLOCK_INPUT; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4397 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4398 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4399 |
24995 | 4400 /* Free all realized faces on FRAME or on all frames if FRAME is nil. |
4401 This is done after attributes of a named face have been changed, | |
4402 because we can't tell which realized faces depend on that face. */ | |
4403 | |
4404 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4405 free_all_realized_faces (Lisp_Object frame) |
24995 | 4406 { |
4407 if (NILP (frame)) | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4408 { |
24995 | 4409 Lisp_Object rest; |
4410 FOR_EACH_FRAME (rest, frame) | |
4411 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
4412 } | |
4413 else | |
4414 free_realized_faces (FRAME_FACE_CACHE (XFRAME (frame))); | |
4415 } | |
4416 | |
4417 | |
4418 /* Free face cache C and faces in it, including their X resources. */ | |
4419 | |
4420 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4421 free_face_cache (struct face_cache *c) |
24995 | 4422 { |
4423 if (c) | |
4424 { | |
4425 free_realized_faces (c); | |
4426 xfree (c->buckets); | |
4427 xfree (c->faces_by_id); | |
4428 xfree (c); | |
4429 } | |
4430 } | |
4431 | |
4432 | |
4433 /* Cache realized face FACE in face cache C. HASH is the hash value | |
88907 | 4434 of FACE. If FACE is for ASCII characters (i.e. FACE->ascii_face == |
4435 FACE), insert the new face to the beginning of the collision list | |
4436 of the face hash table of C. Otherwise, add the new face to the | |
4437 end of the collision list. This way, lookup_face can quickly find | |
4438 that a requested face is not cached. */ | |
24995 | 4439 |
4440 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4441 cache_face (struct face_cache *c, struct face *face, unsigned int hash) |
24995 | 4442 { |
4443 int i = hash % FACE_CACHE_BUCKETS_SIZE; | |
4444 | |
4445 face->hash = hash; | |
4446 | |
88907 | 4447 if (face->ascii_face != face) |
24995 | 4448 { |
4449 struct face *last = c->buckets[i]; | |
4450 if (last) | |
4451 { | |
4452 while (last->next) | |
4453 last = last->next; | |
4454 last->next = face; | |
4455 face->prev = last; | |
4456 face->next = NULL; | |
4457 } | |
4458 else | |
4459 { | |
4460 c->buckets[i] = face; | |
4461 face->prev = face->next = NULL; | |
4462 } | |
4463 } | |
4464 else | |
4465 { | |
4466 face->prev = NULL; | |
4467 face->next = c->buckets[i]; | |
4468 if (face->next) | |
4469 face->next->prev = face; | |
4470 c->buckets[i] = face; | |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4471 } |
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4472 |
24995 | 4473 /* Find a free slot in C->faces_by_id and use the index of the free |
4474 slot as FACE->id. */ | |
4475 for (i = 0; i < c->used; ++i) | |
4476 if (c->faces_by_id[i] == NULL) | |
4477 break; | |
4478 face->id = i; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4479 |
24995 | 4480 /* 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
|
4481 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
|
4482 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4483 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
|
4484 { |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4485 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
|
4486 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
|
4487 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
|
4488 abort (); /* Alternatives? ++kfs */ |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4489 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
|
4490 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
|
4491 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
|
4492 } |
0432020d46a7
(cache_face): Abort if c->size exceeds MAX_FACE_ID.
Kim F. Storm <storm@cua.dk>
parents:
53274
diff
changeset
|
4493 c->used++; |
24995 | 4494 } |
4495 | |
4496 #if GLYPH_DEBUG | |
4497 /* Check that FACE got a unique id. */ | |
4498 { | |
4499 int j, n; | |
4500 struct face *face; | |
4501 | |
4502 for (j = n = 0; j < FACE_CACHE_BUCKETS_SIZE; ++j) | |
4503 for (face = c->buckets[j]; face; face = face->next) | |
4504 if (face->id == i) | |
4505 ++n; | |
4506 | |
4507 xassert (n == 1); | |
4508 } | |
4509 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4510 |
24995 | 4511 c->faces_by_id[i] = face; |
4512 } | |
4513 | |
4514 | |
4515 /* Remove face FACE from cache C. */ | |
4516 | |
4517 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4518 uncache_face (struct face_cache *c, struct face *face) |
24995 | 4519 { |
4520 int i = face->hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4521 |
24995 | 4522 if (face->prev) |
4523 face->prev->next = face->next; | |
4524 else | |
4525 c->buckets[i] = face->next; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4526 |
24995 | 4527 if (face->next) |
4528 face->next->prev = face->prev; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4529 |
24995 | 4530 c->faces_by_id[face->id] = NULL; |
4531 if (face->id == c->used) | |
4532 --c->used; | |
4533 } | |
4534 | |
4535 | |
4536 /* Look up a realized face with face attributes ATTR in the face cache | |
88907 | 4537 of frame F. The face will be used to display ASCII characters. |
4538 Value is the ID of the face found. If no suitable face is found, | |
4539 realize a new one. */ | |
24995 | 4540 |
4541 INLINE int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4542 lookup_face (struct frame *f, Lisp_Object *attr) |
24995 | 4543 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4544 struct face_cache *cache = FRAME_FACE_CACHE (f); |
24995 | 4545 unsigned hash; |
4546 int i; | |
4547 struct face *face; | |
4548 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4549 xassert (cache != NULL); |
24995 | 4550 check_lface_attrs (attr); |
4551 | |
4552 /* Look up ATTR in the face cache. */ | |
4553 hash = lface_hash (attr); | |
4554 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4555 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4556 for (face = cache->buckets[i]; face; face = face->next) |
88907 | 4557 { |
4558 if (face->ascii_face != face) | |
4559 { | |
4560 /* There's no more ASCII face. */ | |
4561 face = NULL; | |
4562 break; | |
4563 } | |
4564 if (face->hash == hash | |
4565 && lface_equal_p (face->lface, attr)) | |
4566 break; | |
4567 } | |
24995 | 4568 |
4569 /* If not found, realize a new face. */ | |
4570 if (face == NULL) | |
88907 | 4571 face = realize_face (cache, attr, -1); |
24995 | 4572 |
4573 #if GLYPH_DEBUG | |
4574 xassert (face == FACE_FROM_ID (f, face->id)); | |
4575 #endif /* GLYPH_DEBUG */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4576 |
24995 | 4577 return face->id; |
8472
0d0b32e78a5b
(compute_glyph_face_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8119
diff
changeset
|
4578 } |
24995 | 4579 |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4580 #ifdef HAVE_WINDOW_SYSTEM |
88907 | 4581 /* 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
|
4582 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
|
4583 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
|
4584 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
|
4585 suitable face is found, realize a new one. */ |
24995 | 4586 |
4587 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4588 face_for_font (struct frame *f, Lisp_Object font_object, struct face *base_face) |
88907 | 4589 { |
4590 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
4591 unsigned hash; | |
4592 int i; | |
4593 struct face *face; | |
4594 | |
4595 xassert (cache != NULL); | |
4596 base_face = base_face->ascii_face; | |
4597 hash = lface_hash (base_face->lface); | |
4598 i = hash % FACE_CACHE_BUCKETS_SIZE; | |
4599 | |
4600 for (face = cache->buckets[i]; face; face = face->next) | |
4601 { | |
4602 if (face->ascii_face == face) | |
4603 continue; | |
4604 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
|
4605 && face->font == (NILP (font_object) ? NULL |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4606 : XFONT_OBJECT (font_object)) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4607 && lface_equal_p (face->lface, base_face->lface)) |
90414 | 4608 return face->id; |
4609 } | |
4610 | |
4611 /* 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
|
4612 face = realize_non_ascii_face (f, font_object, base_face); |
90414 | 4613 return face->id; |
4614 } | |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
4615 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 4616 |
4617 /* Return the face id of the realized face for named face SYMBOL on | |
88907 | 4618 frame F suitable for displaying ASCII characters. Value is -1 if |
4619 the face couldn't be determined, which might happen if the default | |
4620 face isn't realized and cannot be realized. */ | |
24995 | 4621 |
4622 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4623 lookup_named_face (struct frame *f, Lisp_Object symbol, int signal_p) |
24995 | 4624 { |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4625 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
|
4626 Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE]; |
24995 | 4627 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
4628 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4629 if (default_face == NULL) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4630 { |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4631 if (!realize_basic_faces (f)) |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4632 return -1; |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4633 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
|
4634 if (default_face == NULL) |
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
4635 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
|
4636 } |
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4637 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4638 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
|
4639 return -1; |
b1e7465ce5fc
(lookup_named_face): Add signal_p arg. Return -1 if
Kim F. Storm <storm@cua.dk>
parents:
57997
diff
changeset
|
4640 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4641 memcpy (attrs, default_face->lface, 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
|
4642 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
|
4643 |
88907 | 4644 return lookup_face (f, attrs); |
24995 | 4645 } |
4646 | |
4647 | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4648 /* 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
|
4649 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
|
4650 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
|
4651 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
|
4652 rather than signal an error. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4653 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4654 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4655 lookup_basic_face (struct frame *f, int face_id) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4656 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4657 Lisp_Object name, mapping; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4658 int remapped_face_id; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4659 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4660 if (NILP (Vface_remapping_alist)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4661 return face_id; /* Nothing to do. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4662 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4663 switch (face_id) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4664 { |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4665 case DEFAULT_FACE_ID: name = Qdefault; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4666 case MODE_LINE_FACE_ID: name = Qmode_line; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4667 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
|
4668 case HEADER_LINE_FACE_ID: name = Qheader_line; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4669 case TOOL_BAR_FACE_ID: name = Qtool_bar; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4670 case FRINGE_FACE_ID: name = Qfringe; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4671 case SCROLL_BAR_FACE_ID: name = Qscroll_bar; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4672 case BORDER_FACE_ID: name = Qborder; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4673 case CURSOR_FACE_ID: name = Qcursor; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4674 case MOUSE_FACE_ID: name = Qmouse; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4675 case MENU_FACE_ID: name = Qmenu; break; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4676 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4677 default: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4678 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
|
4679 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4680 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4681 /* 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
|
4682 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
|
4683 for the very common no-remapping case. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4684 mapping = assq_no_quit (name, Vface_remapping_alist); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4685 if (NILP (mapping)) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4686 return face_id; /* Give up. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4687 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4688 /* 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
|
4689 handle the remapping too. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4690 remapped_face_id = lookup_named_face (f, name, 0); |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4691 if (remapped_face_id < 0) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4692 return face_id; /* Give up. */ |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4693 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4694 return remapped_face_id; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4695 } |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4696 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
4697 |
24995 | 4698 /* Return the ID of the realized ASCII face of Lisp face with ID |
4699 LFACE_ID on frame F. Value is -1 if LFACE_ID isn't valid. */ | |
4700 | |
4701 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4702 ascii_face_of_lisp_face (struct frame *f, int lface_id) |
24995 | 4703 { |
4704 int face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4705 |
24995 | 4706 if (lface_id >= 0 && lface_id < lface_id_to_name_size) |
4707 { | |
4708 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
|
4709 face_id = lookup_named_face (f, face_name, 1); |
24995 | 4710 } |
4711 else | |
4712 face_id = -1; | |
4713 | |
4714 return face_id; | |
4715 } | |
4716 | |
4717 | |
4718 /* Return a face for charset ASCII that is like the face with id | |
4719 FACE_ID on frame F, but has a font that is STEPS steps smaller. | |
4720 STEPS < 0 means larger. Value is the id of the face. */ | |
4721 | |
4722 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4723 smaller_face (struct frame *f, int face_id, int steps) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
4724 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4725 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4726 struct face *face; |
4727 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
4728 int pt, last_pt, last_height; | |
4729 int delta; | |
4730 int new_face_id; | |
4731 struct face *new_face; | |
4732 | |
4733 /* If not called for an X frame, just return the original face. */ | |
4734 if (FRAME_TERMCAP_P (f)) | |
4735 return face_id; | |
4736 | |
4737 /* Try in increments of 1/2 pt. */ | |
4738 delta = steps < 0 ? 5 : -5; | |
85262 | 4739 steps = eabs (steps); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4740 |
24995 | 4741 face = FACE_FROM_ID (f, face_id); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4742 memcpy (attrs, face->lface, sizeof attrs); |
24995 | 4743 pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]); |
4744 new_face_id = face_id; | |
4745 last_height = FONT_HEIGHT (face->font); | |
4746 | |
4747 while (steps | |
4748 && pt + delta > 0 | |
4749 /* Give up if we cannot find a font within 10pt. */ | |
85262 | 4750 && eabs (last_pt - pt) < 100) |
24995 | 4751 { |
4752 /* Look up a face for a slightly smaller/larger font. */ | |
4753 pt += delta; | |
4754 attrs[LFACE_HEIGHT_INDEX] = make_number (pt); | |
88907 | 4755 new_face_id = lookup_face (f, attrs); |
24995 | 4756 new_face = FACE_FROM_ID (f, new_face_id); |
4757 | |
4758 /* 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
|
4759 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
|
4760 || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height)) |
24995 | 4761 { |
4762 --steps; | |
4763 last_height = FONT_HEIGHT (new_face->font); | |
4764 last_pt = pt; | |
4765 } | |
4766 } | |
4767 | |
4768 return new_face_id; | |
4769 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4770 #else /* not HAVE_WINDOW_SYSTEM */ |
24995 | 4771 |
4772 return face_id; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4773 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4774 #endif /* not HAVE_WINDOW_SYSTEM */ |
24995 | 4775 } |
4776 | |
4777 | |
4778 /* Return a face for charset ASCII that is like the face with id | |
4779 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
|
4780 |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
4781 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4782 face_with_height (struct frame *f, int face_id, int height) |
24995 | 4783 { |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
4784 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 4785 struct face *face; |
4786 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
4787 | |
4788 if (FRAME_TERMCAP_P (f) | |
4789 || height <= 0) | |
4790 return face_id; | |
4791 | |
4792 face = FACE_FROM_ID (f, face_id); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4793 memcpy (attrs, face->lface, sizeof attrs); |
24995 | 4794 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
|
4795 font_clear_prop (attrs, FONT_SIZE_INDEX); |
88907 | 4796 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
|
4797 #endif /* HAVE_WINDOW_SYSTEM */ |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
4798 |
24995 | 4799 return face_id; |
4800 } | |
4801 | |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
4802 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4803 /* Return the face id of the realized face for named face SYMBOL on |
88907 | 4804 frame F suitable for displaying ASCII characters, and use |
4805 attributes of the face FACE_ID for attributes that aren't | |
4806 completely specified by SYMBOL. This is like lookup_named_face, | |
4807 except that the default attributes come from FACE_ID, not from the | |
4808 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
|
4809 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4810 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4811 lookup_derived_face (struct frame *f, Lisp_Object symbol, int face_id, int signal_p) |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4812 { |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
4813 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
|
4814 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
|
4815 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
|
4816 |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4817 if (!default_face) |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4818 abort (); |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4819 |
97502
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4820 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
|
4821 return -1; |
dc43c2f1d2fc
(lookup_derived_face): Properly handle possible zero
Chong Yidong <cyd@stupidchicken.com>
parents:
97217
diff
changeset
|
4822 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4823 memcpy (attrs, default_face->lface, 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
|
4824 merge_face_vectors (f, symbol_attrs, attrs, 0); |
88907 | 4825 return lookup_face (f, attrs); |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4826 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
4827 |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4828 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
|
4829 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
|
4830 doc: /* Return a vector of face attributes corresponding to PLIST. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
4831 (Lisp_Object plist) |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4832 { |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4833 Lisp_Object lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4834 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
|
4835 Qunspecified); |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4836 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
|
4837 1, 0); |
40278
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4838 return lface; |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4839 } |
6ee20fddfbc5
(Fface_attributes_as_vector): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40226
diff
changeset
|
4840 |
24995 | 4841 |
4842 | |
4843 /*********************************************************************** | |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4844 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
|
4845 ***********************************************************************/ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4846 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4847 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4848 /* 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
|
4849 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
|
4850 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
|
4851 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4852 #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
|
4853 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
4854 #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
|
4855 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4856 /* 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
|
4857 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
|
4858 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4859 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
|
4860 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
|
4861 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
|
4862 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4863 \(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
|
4864 \(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
|
4865 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4866 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4867 x_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, struct face *def_face) |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
4868 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
4869 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
|
4870 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4871 /* 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
|
4872 face. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4873 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
|
4874 && 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
|
4875 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
|
4876 || (!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
|
4877 && 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
|
4878 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
|
4879 || (!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
|
4880 && 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
|
4881 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
|
4882 || (!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
|
4883 && 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
|
4884 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
|
4885 || (!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
|
4886 && 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
|
4887 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
|
4888 || (!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
|
4889 && 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
|
4890 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
|
4891 || (!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
|
4892 && 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
|
4893 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
|
4894 || (!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
|
4895 && 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
|
4896 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
|
4897 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4898 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4899 /* 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
|
4900 "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
|
4901 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4902 || !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
|
4903 || !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
|
4904 || !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
|
4905 || !UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX]) |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4906 || !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
|
4907 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
4908 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
|
4909 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
|
4910 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
|
4911 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
|
4912 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
4913 memcpy (merged_attrs, def_attrs, sizeof merged_attrs); |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4914 |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
4915 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
|
4916 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
4917 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
|
4918 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
|
4919 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4920 if (! face) |
63705
9e649a045c18
(x_supports_face_attributes_p): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
4921 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
|
4922 |
95471
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
4923 /* 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
|
4924 supported. */ |
6c85f5f5064c
(x_supports_face_attributes_p): Check face->font before
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
4925 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
|
4926 || ! 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
|
4927 return 0; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4928 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
|
4929 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
|
4930 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4931 Lisp_Object s1, s2; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4932 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4933 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
|
4934 || face->font->driver->case_sensitive) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4935 return 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4936 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
|
4937 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
|
4938 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
|
4939 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
|
4940 return 1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4941 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
4942 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
|
4943 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4944 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4945 /* 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
|
4946 return 1; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4947 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4948 |
55903
822bab94f6a3
(x_supports_face_attributes_p): Make this function
Eli Zaretskii <eliz@gnu.org>
parents:
55901
diff
changeset
|
4949 #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
|
4950 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4951 /* 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
|
4952 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
|
4953 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4954 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
|
4955 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
|
4956 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
|
4957 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4958 \(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
|
4959 \(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
|
4960 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4961 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
|
4962 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
|
4963 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
|
4964 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
|
4965 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
|
4966 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4967 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
4968 tty_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs, 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
|
4969 { |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
4970 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
|
4971 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
|
4972 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
|
4973 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
|
4974 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
|
4975 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
|
4976 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4977 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4978 /* 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
|
4979 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
|
4980 (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
|
4981 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
|
4982 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
|
4983 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
|
4984 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
|
4985 specifies. */ |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
4986 if (!UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX]) |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
4987 || !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
|
4988 || !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
|
4989 || !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
|
4990 || !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
|
4991 || !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
|
4992 || !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
|
4993 || !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
|
4994 || !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
|
4995 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4996 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4997 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
4998 /* 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
|
4999 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5000 /* font weight (bold/dim) */ |
103228
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5001 val = attrs[LFACE_WEIGHT_INDEX]; |
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5002 if (!UNSPECIFIEDP (val) |
7300fabaa28b
* xfaces.c (tty_supports_face_attributes_p): Recognize unspecified
Chong Yidong <cyd@stupidchicken.com>
parents:
103114
diff
changeset
|
5003 && (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
|
5004 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5005 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
|
5006 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5007 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
|
5008 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5009 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
|
5010 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
|
5011 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
|
5012 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5013 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
|
5014 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5015 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
|
5016 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
|
5017 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
|
5018 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5019 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
|
5020 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
|
5021 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5022 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5023 /* underlining */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5024 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
|
5025 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
|
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 (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
|
5028 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
|
5029 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
|
5030 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
|
5031 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5032 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
|
5033 } |
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 /* inverse video */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5036 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
|
5037 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
|
5038 { |
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5039 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
|
5040 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
|
5041 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5042 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
|
5043 } |
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 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5046 /* Color testing. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5047 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5048 /* 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
|
5049 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
|
5050 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
|
5051 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
|
5052 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
|
5053 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5054 /* 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
|
5055 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
|
5056 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
|
5057 { |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5058 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
|
5059 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 > 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
|
5066 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
|
5067 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5068 /* 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
|
5069 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5070 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
|
5071 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
|
5072 && (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
|
5073 <= 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
|
5074 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5075 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5076 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5077 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5078 /* 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
|
5079 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
|
5080 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
|
5081 { |
78665
e63795496f58
(tty_supports_face_attributes_p): Use instead of LFACE_INVERSE_INDEX
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
5082 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
|
5083 |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5084 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
|
5085 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
|
5086 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
|
5087 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
|
5088 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
|
5089 > 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
|
5090 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
|
5091 else |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5092 /* 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
|
5093 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5094 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
|
5095 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
|
5096 && (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
|
5097 <= 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
|
5098 return 0; |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5099 } |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5100 } |
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 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
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5108 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
|
5109 = (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
|
5110 - 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
|
5111 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
|
5112 || 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
|
5113 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5114 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5115 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5116 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5117 /* 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
|
5118 given colors. */ |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5119 if (test_caps != 0 && |
83145 | 5120 ! 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
|
5121 return 0; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5122 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5123 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5124 /* 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
|
5125 return 1; |
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 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5128 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5129 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
|
5130 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
|
5131 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
|
5132 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
|
5133 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
|
5134 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
|
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 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
|
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 by |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5144 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
|
5145 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
|
5146 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
|
5147 face for italic. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5148 (Lisp_Object attributes, Lisp_Object display) |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5149 { |
74071
ea7f3c26d52b
(Fdisplay_supports_face_attributes_p): Initialize
Andreas Schwab <schwab@suse.de>
parents:
73509
diff
changeset
|
5150 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
|
5151 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
|
5152 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
|
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 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
|
5155 |
55949
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
diff
changeset
|
5156 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
|
5157 /* 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
|
5158 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
|
5159 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
|
5160 return Qnil; |
50599d471b66
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
55912
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 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
|
5163 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
|
5164 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
|
5165 frame = display; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5166 else |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5167 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5168 /* 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
|
5169 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
|
5170 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5171 frame = Qnil; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5172 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
|
5173 { |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5174 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
|
5175 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
|
5176 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
|
5177 display))) |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5178 break; |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5179 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5180 } |
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 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
|
5183 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
|
5184 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5185 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
|
5186 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
|
5187 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
|
5188 |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5189 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
|
5190 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
|
5191 { |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5192 if (! realize_basic_faces (f)) |
56296
075ad6932e06
(x_supports_face_attributes_p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56176
diff
changeset
|
5193 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
|
5194 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
|
5195 if (def_face == NULL) |
c594a1694d31
(lookup_named_face, Fdisplay_supports_face_attributes_p):
Richard M. Stallman <rms@gnu.org>
parents:
71992
diff
changeset
|
5196 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
|
5197 } |
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5198 |
55901
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5199 /* 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
|
5200 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
|
5201 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
|
5202 #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
|
5203 else |
55912
0b7bab25fcec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
55903
diff
changeset
|
5204 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
|
5205 #endif |
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 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
|
5208 } |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5209 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5210 |
7814348a02ec
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Miles Bader <miles@gnu.org>
parents:
55654
diff
changeset
|
5211 /*********************************************************************** |
24995 | 5212 Font selection |
5213 ***********************************************************************/ | |
5214 | |
102232
7de4f0f549a4
(Finternal_set_font_selection_order): Remove leading whitespace that
Glenn Morris <rgm@gnu.org>
parents:
101292
diff
changeset
|
5215 DEFUN ("internal-set-font-selection-order", |
24995 | 5216 Finternal_set_font_selection_order, |
5217 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
|
5218 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
|
5219 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
|
5220 `:height', `:weight', and `:slant'. Face attributes appearing |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5221 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
|
5222 `: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
|
5223 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
|
5224 Value is ORDER. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5225 (Lisp_Object order) |
24995 | 5226 { |
5227 Lisp_Object list; | |
5228 int i; | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5229 int indices[DIM (font_sort_order)]; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5230 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5231 CHECK_LIST (order); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
5232 memset (indices, 0, sizeof indices); |
24995 | 5233 i = 0; |
5234 | |
5235 for (list = order; | |
5236 CONSP (list) && i < DIM (indices); | |
5237 list = XCDR (list), ++i) | |
5238 { | |
5239 Lisp_Object attr = XCAR (list); | |
5240 int xlfd; | |
5241 | |
5242 if (EQ (attr, QCwidth)) | |
5243 xlfd = XLFD_SWIDTH; | |
5244 else if (EQ (attr, QCheight)) | |
5245 xlfd = XLFD_POINT_SIZE; | |
5246 else if (EQ (attr, QCweight)) | |
5247 xlfd = XLFD_WEIGHT; | |
5248 else if (EQ (attr, QCslant)) | |
5249 xlfd = XLFD_SLANT; | |
5250 else | |
5251 break; | |
5252 | |
5253 if (indices[i] != 0) | |
5254 break; | |
5255 indices[i] = xlfd; | |
5256 } | |
5257 | |
35913
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5258 if (!NILP (list) || i != DIM (indices)) |
24995 | 5259 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
|
5260 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
|
5261 if (indices[i] == 0) |
d3591f4747d7
(split_font_name): Compute numeric value of
Gerd Moellmann <gerd@gnu.org>
parents:
35843
diff
changeset
|
5262 signal_error ("Invalid font sort order", order); |
24995 | 5263 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
5264 if (memcmp (indices, font_sort_order, sizeof indices) != 0) |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
5265 { |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
5266 memcpy (font_sort_order, indices, sizeof font_sort_order); |
24995 | 5267 free_all_realized_faces (Qnil); |
5268 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5269 |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5270 font_update_sort_order (font_sort_order); |
90414 | 5271 |
24995 | 5272 return Qnil; |
5273 } | |
5274 | |
5275 | |
5276 DEFUN ("internal-set-alternative-font-family-alist", | |
5277 Finternal_set_alternative_font_family_alist, | |
5278 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
|
5279 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
|
5280 ALIST is an alist of (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5281 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
|
5282 be found. Value is ALIST. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5283 (Lisp_Object alist) |
24995 | 5284 { |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5285 Lisp_Object entry, tail, tail2; |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5286 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5287 CHECK_LIST (alist); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5288 alist = Fcopy_sequence (alist); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5289 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
|
5290 { |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5291 entry = XCAR (tail); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5292 CHECK_LIST (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5293 entry = Fcopy_sequence (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5294 XSETCAR (tail, entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5295 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5296 XSETCAR (tail2, Fintern (XCAR (tail2), Qnil)); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5297 } |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5298 |
24995 | 5299 Vface_alternative_font_family_alist = alist; |
5300 free_all_realized_faces (Qnil); | |
5301 return alist; | |
5302 } | |
5303 | |
5304 | |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5305 DEFUN ("internal-set-alternative-font-registry-alist", |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5306 Finternal_set_alternative_font_registry_alist, |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5307 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
|
5308 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
|
5309 ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5310 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
|
5311 be found. Value is ALIST. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5312 (Lisp_Object alist) |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5313 { |
97930
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5314 Lisp_Object entry, tail, tail2; |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5315 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
5316 CHECK_LIST (alist); |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5317 alist = Fcopy_sequence (alist); |
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5318 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
|
5319 { |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5320 entry = XCAR (tail); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5321 CHECK_LIST (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5322 entry = Fcopy_sequence (entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5323 XSETCAR (tail, entry); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5324 for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2)) |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5325 XSETCAR (tail2, Fdowncase (XCAR (tail2))); |
5c86599895c4
(Finternal_set_alternative_font_family_alist)
Chong Yidong <cyd@stupidchicken.com>
parents:
97599
diff
changeset
|
5326 } |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5327 Vface_alternative_font_registry_alist = alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5328 free_all_realized_faces (Qnil); |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5329 return alist; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5330 } |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5331 |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
5332 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5333 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 5334 |
34160
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5335 /* 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
|
5336 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5337 #define FONT_POINT_SIZE_QUANTUM 5 |
bb9ec0151423
(struct font_name): New member registry_priority.
Kenichi Handa <handa@m17n.org>
parents:
33853
diff
changeset
|
5338 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5339 /* 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
|
5340 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
|
5341 attribute of ATTRS doesn't name a fontset. */ |
24995 | 5342 |
5343 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5344 face_fontset (Lisp_Object *attrs) |
24995 | 5345 { |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5346 Lisp_Object name; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5347 |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
5348 name = attrs[LFACE_FONTSET_INDEX]; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5349 if (!STRINGP (name)) |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5350 return -1; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5351 return fs_query_fontset (name, 0); |
24995 | 5352 } |
5353 | |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5354 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5355 |
5356 | |
5357 | |
5358 /*********************************************************************** | |
5359 Face Realization | |
5360 ***********************************************************************/ | |
5361 | |
5362 /* Realize basic faces on frame F. Value is zero if frame parameters | |
5363 of F don't contain enough information needed to realize the default | |
5364 face. */ | |
5365 | |
5366 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5367 realize_basic_faces (struct frame *f) |
24995 | 5368 { |
5369 int success_p = 0; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45848
diff
changeset
|
5370 int count = SPECPDL_INDEX (); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5371 |
38802
7ca6f1c8e014
(x_update_menu_appearance): Save and restore value of
Gerd Moellmann <gerd@gnu.org>
parents:
38435
diff
changeset
|
5372 /* 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
|
5373 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
|
5374 BLOCK_INPUT; |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5375 specbind (Qscalable_fonts_allowed, Qt); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5376 |
24995 | 5377 if (realize_default_face (f)) |
5378 { | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
5379 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
|
5380 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
|
5381 realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID); |
41129 | 5382 realize_named_face (f, Qfringe, FRINGE_FACE_ID); |
25546 | 5383 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
|
5384 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
|
5385 realize_named_face (f, Qborder, BORDER_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5386 realize_named_face (f, Qcursor, CURSOR_FACE_ID); |
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
5387 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
|
5388 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
|
5389 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
|
5390 |
33275
8c453c73a11b
(lookup_named_face): If default face isn't realized,
Gerd Moellmann <gerd@gnu.org>
parents:
33082
diff
changeset
|
5391 /* 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
|
5392 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
|
5393 { |
38905
70ef1eb656a6
(menu_face_changed_default): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
38818
diff
changeset
|
5394 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
|
5395 #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
|
5396 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
|
5397 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
|
5398 #endif |
33082
5ab6f3e1f5c8
(menu_face_change_count): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33070
diff
changeset
|
5399 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5400 |
24995 | 5401 success_p = 1; |
5402 } | |
5403 | |
37394
7847d9b8bbff
(Qscalable_fonts_allowed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37206
diff
changeset
|
5404 unbind_to (count, Qnil); |
28461
b6b552188c57
(realize_basic_faces): Block input while realizing
Gerd Moellmann <gerd@gnu.org>
parents:
28412
diff
changeset
|
5405 UNBLOCK_INPUT; |
24995 | 5406 return success_p; |
5407 } | |
5408 | |
5409 | |
5410 /* Realize the default face on frame F. If the face is not fully | |
5411 specified, make it fully-specified. Attributes of the default face | |
5412 that are not explicitly specified are taken from frame parameters. */ | |
5413 | |
5414 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5415 realize_default_face (struct frame *f) |
24995 | 5416 { |
5417 struct face_cache *c = FRAME_FACE_CACHE (f); | |
5418 Lisp_Object lface; | |
5419 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
5420 struct face *face; | |
5421 | |
5422 /* If the `default' face is not yet known, create it. */ | |
5423 lface = lface_from_face_name (f, Qdefault, 0); | |
5424 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
|
5425 { |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5426 Lisp_Object frame; |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5427 XSETFRAME (frame, f); |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5428 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
|
5429 } |
7156fc3b3571
(realize_default_face): Do not abort if lface is non-existent -
Glenn Morris <rgm@gnu.org>
parents:
51237
diff
changeset
|
5430 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5431 #ifdef HAVE_WINDOW_SYSTEM |
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5432 if (FRAME_WINDOW_P (f)) |
24995 | 5433 { |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5434 Lisp_Object font_object; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5435 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5436 XSETFONT (font_object, FRAME_FONT (f)); |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5437 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
|
5438 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
|
5439 f->default_face_done_p = 1; |
24995 | 5440 } |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
5441 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5442 |
25114
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5443 if (!FRAME_WINDOW_P (f)) |
24995 | 5444 { |
5445 LFACE_FAMILY (lface) = build_string ("default"); | |
95865
99530dd346d3
(LFACE_FOUNDRY): New macro.
Kenichi Handa <handa@m17n.org>
parents:
95574
diff
changeset
|
5446 LFACE_FOUNDRY (lface) = LFACE_FAMILY (lface); |
24995 | 5447 LFACE_SWIDTH (lface) = Qnormal; |
5448 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
|
5449 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
|
5450 LFACE_WEIGHT (lface) = Qnormal; |
e1291f1c4a5b
(realize_default_face): Don't set the weight and slant
Eli Zaretskii <eliz@gnu.org>
parents:
42206
diff
changeset
|
5451 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
|
5452 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
|
5453 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
|
5454 LFACE_FONTSET (lface) = Qnil; |
24995 | 5455 } |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5456 |
24995 | 5457 if (UNSPECIFIEDP (LFACE_UNDERLINE (lface))) |
5458 LFACE_UNDERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5459 |
24995 | 5460 if (UNSPECIFIEDP (LFACE_OVERLINE (lface))) |
5461 LFACE_OVERLINE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5462 |
24995 | 5463 if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface))) |
5464 LFACE_STRIKE_THROUGH (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5465 |
24995 | 5466 if (UNSPECIFIEDP (LFACE_BOX (lface))) |
5467 LFACE_BOX (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5468 |
24995 | 5469 if (UNSPECIFIEDP (LFACE_INVERSE (lface))) |
5470 LFACE_INVERSE (lface) = Qnil; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5471 |
24995 | 5472 if (UNSPECIFIEDP (LFACE_FOREGROUND (lface))) |
5473 { | |
5474 /* This function is called so early that colors are not yet | |
5475 set in the frame parameter list. */ | |
5476 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
|
5477 |
24995 | 5478 if (CONSP (color) && STRINGP (XCDR (color))) |
5479 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
|
5480 else if (FRAME_WINDOW_P (f)) |
24995 | 5481 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5482 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
|
5483 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
|
5484 else |
24995 | 5485 abort (); |
5486 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5487 |
24995 | 5488 if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) |
5489 { | |
5490 /* This function is called so early that colors are not yet | |
5491 set in the frame parameter list. */ | |
5492 Lisp_Object color = Fassq (Qbackground_color, f->param_alist); | |
5493 if (CONSP (color) && STRINGP (XCDR (color))) | |
5494 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
|
5495 else if (FRAME_WINDOW_P (f)) |
24995 | 5496 return 0; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
5497 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
|
5498 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
|
5499 else |
24995 | 5500 abort (); |
5501 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5502 |
24995 | 5503 if (UNSPECIFIEDP (LFACE_STIPPLE (lface))) |
5504 LFACE_STIPPLE (lface) = Qnil; | |
5505 | |
5506 /* Realize the face; it must be fully-specified now. */ | |
5507 xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); | |
5508 check_lface (lface); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
5509 memcpy (attrs, XVECTOR (lface)->contents, sizeof attrs); |
88907 | 5510 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
|
5511 |
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5512 #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
|
5513 #ifdef HAVE_X_WINDOWS |
83519
717426715b03
Fix stupid crash during startup.
Karoly Lorentey <lorentey@elte.hu>
parents:
83518
diff
changeset
|
5514 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
|
5515 { |
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5516 /* 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
|
5517 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
|
5518 if (!face->font) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5519 return 0; |
95375
e743691cff9c
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
95373
diff
changeset
|
5520 |
74114
cd686b5380c4
(realize_default_face): Check if the default font name
Chong Yidong <cyd@stupidchicken.com>
parents:
74071
diff
changeset
|
5521 /* 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
|
5522 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
|
5523 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
|
5524 font. */ |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5525 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
|
5526 } |
70566
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5527 #endif /* HAVE_X_WINDOWS */ |
a0f76f946025
(realize_default_face): If the font chosen for the
Kenichi Handa <handa@m17n.org>
parents:
69968
diff
changeset
|
5528 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5529 return 1; |
5530 } | |
5531 | |
5532 | |
5533 /* Realize basic faces other than the default face in face cache C. | |
5534 SYMBOL is the face name, ID is the face id the realized face must | |
5535 have. The default face must have been realized already. */ | |
5536 | |
5537 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5538 realize_named_face (struct frame *f, Lisp_Object symbol, int id) |
24995 | 5539 { |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5540 struct face_cache *c = FRAME_FACE_CACHE (f); |
24995 | 5541 Lisp_Object lface = lface_from_face_name (f, symbol, 0); |
5542 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
|
5543 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
|
5544 struct face *new_face; |
24995 | 5545 |
5546 /* 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
|
5547 get_lface_attributes_no_remap (f, Qdefault, attrs, 1); |
24995 | 5548 check_lface_attrs (attrs); |
5549 xassert (lface_fully_specified_p (attrs)); | |
5550 | |
91531
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5551 /* If SYMBOL isn't know as a face, create it. */ |
24995 | 5552 if (NILP (lface)) |
5553 { | |
5554 Lisp_Object frame; | |
5555 XSETFRAME (frame, f); | |
5556 lface = Finternal_make_lisp_face (symbol, frame); | |
5557 } | |
5558 | |
5559 /* Merge SYMBOL's face with the default face. */ | |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
5560 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
|
5561 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
|
5562 |
24d3fbc119ce
Revert 2008-02-01 change to src/xfaces.c by cyd@stupidchicken.com
Miles Bader <miles@gnu.org>
parents:
91382
diff
changeset
|
5563 /* 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
|
5564 new_face = realize_face (c, attrs, id); |
24995 | 5565 } |
5566 | |
5567 | |
5568 /* Realize the fully-specified face with attributes ATTRS in face | |
88907 | 5569 cache CACHE for ASCII characters. If FORMER_FACE_ID is |
5570 non-negative, it is an ID of face to remove before caching the new | |
5571 face. Value is a pointer to the newly created realized face. */ | |
24995 | 5572 |
5573 static struct face * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5574 realize_face (struct face_cache *cache, Lisp_Object *attrs, int former_face_id) |
24995 | 5575 { |
5576 struct face *face; | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5577 |
24995 | 5578 /* LFACE must be fully specified. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5579 xassert (cache != NULL); |
24995 | 5580 check_lface_attrs (attrs); |
5581 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5582 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
|
5583 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5584 /* Remove the former face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5585 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
|
5586 uncache_face (cache, former_face); |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5587 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
|
5588 SET_FRAME_GARBAGED (cache->f); |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5589 } |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5590 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5591 if (FRAME_WINDOW_P (cache->f)) |
88907 | 5592 face = realize_x_face (cache, attrs); |
35443 | 5593 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f)) |
88907 | 5594 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
|
5595 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
|
5596 { |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5597 /* Create a dummy face. */ |
32bf8e7cc0c2
Fixed tty faces during combo sessions. Plus other assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
5598 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
|
5599 } |
24995 | 5600 else |
5601 abort (); | |
5602 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5603 /* Insert the new face. */ |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5604 cache_face (cache, face, lface_hash (attrs)); |
88907 | 5605 return face; |
5606 } | |
5607 | |
5608 | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5609 #ifdef HAVE_WINDOW_SYSTEM |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5610 /* 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
|
5611 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
|
5612 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
|
5613 no-font. */ |
88907 | 5614 |
5615 static struct face * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5616 realize_non_ascii_face (struct frame *f, Lisp_Object font_object, struct face *base_face) |
88907 | 5617 { |
5618 struct face_cache *cache = FRAME_FACE_CACHE (f); | |
89483 | 5619 struct face *face; |
88907 | 5620 |
5621 face = (struct face *) xmalloc (sizeof *face); | |
5622 *face = *base_face; | |
5623 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
|
5624 face->extra = NULL; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5625 face->overstrike |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5626 = (! NILP (font_object) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5627 && 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
|
5628 && FONT_WEIGHT_NUMERIC (font_object) <= 100); |
88907 | 5629 |
5630 /* Don't try to free the colors copied bitwise from BASE_FACE. */ | |
5631 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
|
5632 face->font = NILP (font_object) ? NULL : XFONT_OBJECT (font_object); |
88907 | 5633 face->gc = 0; |
5634 | |
5635 cache_face (cache, face, face->hash); | |
5636 | |
24995 | 5637 return face; |
5638 } | |
89950
ad8c5c667a14
(split_font_name_into_vector, build_font_name_from_vector)
Kenichi Handa <handa@m17n.org>
parents:
89948
diff
changeset
|
5639 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5640 |
5641 | |
5642 /* Realize the fully-specified face with attributes ATTRS in face | |
88907 | 5643 cache CACHE for ASCII characters. Do it for X frame CACHE->f. If |
5644 the new face doesn't share font with the default face, a fontname | |
5645 is allocated from the heap and set in `font_name' of the new face, | |
5646 but it is not yet loaded here. Value is a pointer to the newly | |
5647 created realized face. */ | |
24995 | 5648 |
5649 static struct face * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5650 realize_x_face (struct face_cache *cache, Lisp_Object *attrs) |
24995 | 5651 { |
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5652 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
|
5653 #ifdef HAVE_WINDOW_SYSTEM |
61628
c897778cd685
(realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
60837
diff
changeset
|
5654 struct face *default_face; |
26875
d6aa11f2a4af
(choose_face_fontset_font): Delete codes for a
Kenichi Handa <handa@m17n.org>
parents:
26759
diff
changeset
|
5655 struct frame *f; |
24995 | 5656 Lisp_Object stipple, overline, strike_through, box; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5657 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5658 xassert (FRAME_WINDOW_P (cache->f)); |
24995 | 5659 |
5660 /* Allocate a new realized face. */ | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5661 face = make_realized_face (attrs); |
88907 | 5662 face->ascii_face = face; |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5663 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5664 f = cache->f; |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5665 |
24995 | 5666 /* Determine the font to use. Most of the time, the font will be |
5667 the same as the font of the default face, so try that first. */ | |
5668 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
5669 if (default_face | |
5670 && lface_same_font_attributes_p (default_face->lface, attrs)) | |
5671 { | |
5672 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
|
5673 face->fontset |
4170d7f0d918
(realize_x_face): If the font-related face attributes
Kenichi Handa <handa@m17n.org>
parents:
95471
diff
changeset
|
5674 = make_fontset_for_ascii_face (f, default_face->fontset, face); |
24995 | 5675 } |
5676 else | |
5677 { | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5678 /* 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
|
5679 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
|
5680 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
|
5681 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
|
5682 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
|
5683 are constructed from ATTRS. */ |
8d8aa26c6884
(realize_x_face): Make fontset using the base of the
Kenichi Handa <handa@m17n.org>
parents:
30174
diff
changeset
|
5684 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
|
5685 |
88907 | 5686 /* If we are realizing the default face, ATTRS should specify a |
5687 fontset. In other words, if FONTSET is -1, we are not | |
5688 realizing the default face, thus the default face should have | |
5689 already been realized. */ | |
5690 if (fontset == -1) | |
100102
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5691 { |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5692 if (default_face) |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5693 fontset = default_face->fontset; |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5694 if (fontset == -1) |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5695 abort (); |
25295c680f6b
(realize_x_face): Make abort condition clearer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99995
diff
changeset
|
5696 } |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5697 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
|
5698 attrs[LFACE_FONT_INDEX] |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5699 = 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
|
5700 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
|
5701 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5702 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
|
5703 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
|
5704 } |
90414 | 5705 else |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5706 { |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5707 face->font = NULL; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5708 face->fontset = -1; |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5709 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5710 } |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5711 |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5712 if (face->font |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5713 && 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
|
5714 && 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
|
5715 face->overstrike = 1; |
24995 | 5716 |
5717 /* Load colors, and set remaining attributes. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5718 |
24995 | 5719 load_face_colors (f, face, attrs); |
5720 | |
5721 /* Set up box. */ | |
5722 box = attrs[LFACE_BOX_INDEX]; | |
5723 if (STRINGP (box)) | |
5724 { | |
5725 /* A simple box of line width 1 drawn in color given by | |
5726 the string. */ | |
5727 face->box_color = load_color (f, face, attrs[LFACE_BOX_INDEX], | |
5728 LFACE_BOX_INDEX); | |
5729 face->box = FACE_SIMPLE_BOX; | |
5730 face->box_line_width = 1; | |
5731 } | |
5732 else if (INTEGERP (box)) | |
5733 { | |
5734 /* Simple box of specified line width in foreground color of the | |
5735 face. */ | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5736 xassert (XINT (box) != 0); |
24995 | 5737 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
|
5738 face->box_line_width = XINT (box); |
24995 | 5739 face->box_color = face->foreground; |
5740 face->box_color_defaulted_p = 1; | |
5741 } | |
5742 else if (CONSP (box)) | |
5743 { | |
5744 /* `(:width WIDTH :color COLOR :shadow SHADOW)'. SHADOW | |
5745 being one of `raised' or `sunken'. */ | |
5746 face->box = FACE_SIMPLE_BOX; | |
5747 face->box_color = face->foreground; | |
5748 face->box_color_defaulted_p = 1; | |
5749 face->box_line_width = 1; | |
5750 | |
5751 while (CONSP (box)) | |
5752 { | |
5753 Lisp_Object keyword, value; | |
5754 | |
5755 keyword = XCAR (box); | |
5756 box = XCDR (box); | |
5757 | |
5758 if (!CONSP (box)) | |
5759 break; | |
5760 value = XCAR (box); | |
5761 box = XCDR (box); | |
5762 | |
5763 if (EQ (keyword, QCline_width)) | |
5764 { | |
36006
a9d75e8a6cb9
(Finternal_set_lisp_face_attribute): The value of :box
Kenichi Handa <handa@m17n.org>
parents:
35913
diff
changeset
|
5765 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
|
5766 face->box_line_width = XINT (value); |
24995 | 5767 } |
5768 else if (EQ (keyword, QCcolor)) | |
5769 { | |
5770 if (STRINGP (value)) | |
5771 { | |
5772 face->box_color = load_color (f, face, value, | |
5773 LFACE_BOX_INDEX); | |
5774 face->use_box_color_for_shadows_p = 1; | |
5775 } | |
5776 } | |
5777 else if (EQ (keyword, QCstyle)) | |
5778 { | |
5779 if (EQ (value, Qreleased_button)) | |
5780 face->box = FACE_RAISED_BOX; | |
5781 else if (EQ (value, Qpressed_button)) | |
5782 face->box = FACE_SUNKEN_BOX; | |
5783 } | |
5784 } | |
5785 } | |
5786 | |
5787 /* Text underline, overline, strike-through. */ | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5788 |
24995 | 5789 if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt)) |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5790 { |
24995 | 5791 /* Use default color (same as foreground color). */ |
5792 face->underline_p = 1; | |
5793 face->underline_defaulted_p = 1; | |
5794 face->underline_color = 0; | |
5795 } | |
5796 else if (STRINGP (attrs[LFACE_UNDERLINE_INDEX])) | |
5797 { | |
5798 /* Use specified color. */ | |
5799 face->underline_p = 1; | |
5800 face->underline_defaulted_p = 0; | |
5801 face->underline_color | |
5802 = load_color (f, face, attrs[LFACE_UNDERLINE_INDEX], | |
5803 LFACE_UNDERLINE_INDEX); | |
5804 } | |
5805 else if (NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
5806 { | |
5807 face->underline_p = 0; | |
5808 face->underline_defaulted_p = 0; | |
5809 face->underline_color = 0; | |
5810 } | |
5811 | |
5812 overline = attrs[LFACE_OVERLINE_INDEX]; | |
5813 if (STRINGP (overline)) | |
5814 { | |
5815 face->overline_color | |
5816 = load_color (f, face, attrs[LFACE_OVERLINE_INDEX], | |
5817 LFACE_OVERLINE_INDEX); | |
5818 face->overline_p = 1; | |
5819 } | |
5820 else if (EQ (overline, Qt)) | |
5821 { | |
5822 face->overline_color = face->foreground; | |
5823 face->overline_color_defaulted_p = 1; | |
5824 face->overline_p = 1; | |
5825 } | |
5826 | |
5827 strike_through = attrs[LFACE_STRIKE_THROUGH_INDEX]; | |
5828 if (STRINGP (strike_through)) | |
5829 { | |
5830 face->strike_through_color | |
5831 = load_color (f, face, attrs[LFACE_STRIKE_THROUGH_INDEX], | |
5832 LFACE_STRIKE_THROUGH_INDEX); | |
5833 face->strike_through_p = 1; | |
5834 } | |
5835 else if (EQ (strike_through, Qt)) | |
5836 { | |
5837 face->strike_through_color = face->foreground; | |
5838 face->strike_through_color_defaulted_p = 1; | |
5839 face->strike_through_p = 1; | |
5840 } | |
5841 | |
5842 stipple = attrs[LFACE_STIPPLE_INDEX]; | |
5843 if (!NILP (stipple)) | |
5844 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
|
5845 #endif /* HAVE_WINDOW_SYSTEM */ |
24995 | 5846 |
5847 return face; | |
5848 } | |
5849 | |
5850 | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5851 /* 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
|
5852 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
|
5853 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
|
5854 default foreground/background colors. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5855 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5856 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5857 map_tty_color (struct frame *f, struct face *face, enum lface_attribute_index idx, int *defaulted) |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5858 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5859 Lisp_Object frame, color, def; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5860 int foreground_p = idx == LFACE_FOREGROUND_INDEX; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5861 unsigned long default_pixel, default_other_pixel, pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5862 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5863 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
|
5864 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5865 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5866 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5867 pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5868 default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5869 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5870 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5871 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5872 pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5873 default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5874 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5875 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5876 XSETFRAME (frame, f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5877 color = face->lface[idx]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48384
diff
changeset
|
5878 |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5879 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
|
5880 && SCHARS (color) |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5881 && CONSP (Vtty_defined_color_alist) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5882 && (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
|
5883 CONSP (def))) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5884 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5885 /* 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
|
5886 (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
|
5887 pixel = XINT (XCAR (XCDR (def))); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5888 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5889 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5890 if (pixel == default_pixel && STRINGP (color)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5891 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5892 pixel = load_color (f, face, color, idx); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5893 |
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
5894 #ifdef MSDOS |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5895 /* 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
|
5896 use the foreground color defined by the frame. */ |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5897 if (FRAME_MSDOS_P (f)) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5898 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5899 if (pixel == default_pixel |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5900 || pixel == FACE_TTY_DEFAULT_COLOR) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5901 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5902 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5903 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5904 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5905 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5906 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5907 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5908 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5909 else if (pixel == default_other_pixel) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5910 { |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5911 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5912 pixel = FRAME_BACKGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5913 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5914 pixel = FRAME_FOREGROUND_PIXEL (f); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5915 face->lface[idx] = tty_color_name (f, pixel); |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5916 *defaulted = 1; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5917 } |
86875
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
5918 } |
51288a744d1c
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents:
85973
diff
changeset
|
5919 #endif /* MSDOS */ |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5920 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5921 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5922 if (foreground_p) |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5923 face->foreground = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5924 else |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5925 face->background = pixel; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5926 } |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5927 |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5928 |
24995 | 5929 /* Realize the fully-specified face with attributes ATTRS in face |
88907 | 5930 cache CACHE for ASCII characters. Do it for TTY frame CACHE->f. |
5931 Value is a pointer to the newly created realized face. */ | |
24995 | 5932 |
5933 static struct face * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
5934 realize_tty_face (struct face_cache *cache, Lisp_Object *attrs) |
24995 | 5935 { |
5936 struct face *face; | |
5937 int weight, slant; | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
5938 int face_colors_defaulted = 0; |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5939 struct frame *f = cache->f; |
24995 | 5940 |
5941 /* Frame must be a termcap frame. */ | |
35443 | 5942 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
|
5943 |
24995 | 5944 /* Allocate a new realized face. */ |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
5945 face = make_realized_face (attrs); |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5946 #if 0 |
35443 | 5947 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
|
5948 #endif |
24995 | 5949 |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
5950 /* Map face attributes to TTY appearances. We map slant to |
24995 | 5951 dimmed text because we want italic text to appear differently |
5952 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
|
5953 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
|
5954 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
|
5955 if (weight > 100) |
24995 | 5956 face->tty_bold_p = 1; |
94938
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
5957 if (weight < 100 || slant != 100) |
24995 | 5958 face->tty_dim_p = 1; |
5959 if (!NILP (attrs[LFACE_UNDERLINE_INDEX])) | |
5960 face->tty_underline_p = 1; | |
5961 if (!NILP (attrs[LFACE_INVERSE_INDEX])) | |
5962 face->tty_reverse_p = 1; | |
5963 | |
5964 /* Map color names to color indices. */ | |
30973
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
5965 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
|
5966 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
|
5967 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26601
diff
changeset
|
5968 /* 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
|
5969 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
|
5970 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
|
5971 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
|
5972 { |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5973 unsigned long tem = face->foreground; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5974 face->foreground = face->background; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5975 face->background = tem; |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5976 } |
be5d3e21fbd7
(load_color): Remove static from definition and remove
Eli Zaretskii <eliz@gnu.org>
parents:
25092
diff
changeset
|
5977 |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5978 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
|
5979 && face->tty_bold_p |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5980 && 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
|
5981 && 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
|
5982 face->tty_bold_p = 0; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5983 |
24995 | 5984 return face; |
5985 } | |
5986 | |
5987 | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5988 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
|
5989 Ftty_suppress_bold_inverse_default_colors, |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5990 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
|
5991 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
|
5992 SUPPRESS non-nil means suppress it. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5993 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
|
5994 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
|
5995 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
|
5996 is non-nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5997 (Lisp_Object suppress) |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5998 { |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
5999 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
|
6000 ++face_change_count; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6001 return suppress; |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6002 } |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6003 |
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6004 |
24995 | 6005 |
6006 /*********************************************************************** | |
6007 Computing Faces | |
6008 ***********************************************************************/ | |
6009 | |
6010 /* Return the ID of the face to use to display character CH with face | |
6011 property PROP on frame F in current_buffer. */ | |
6012 | |
6013 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
6014 compute_char_face (struct frame *f, int ch, Lisp_Object prop) |
24995 | 6015 { |
6016 int face_id; | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6017 |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6018 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
|
6019 ch = 0; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6020 |
24995 | 6021 if (NILP (prop)) |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6022 { |
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6023 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
|
6024 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
|
6025 } |
24995 | 6026 else |
6027 { | |
6028 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6029 struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
6030 memcpy (attrs, default_face->lface, 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
|
6031 merge_face_ref (f, prop, attrs, 1, 0); |
88907 | 6032 face_id = lookup_face (f, attrs); |
24995 | 6033 } |
6034 | |
6035 return face_id; | |
6036 } | |
6037 | |
6038 /* Return the face ID associated with buffer position POS for | |
6039 displaying ASCII characters. Return in *ENDPTR the position at | |
6040 which a different face is needed, as far as text properties and | |
6041 overlays are concerned. W is a window displaying current_buffer. | |
6042 | |
6043 REGION_BEG, REGION_END delimit the region, so it can be | |
6044 highlighted. | |
6045 | |
6046 LIMIT is a position not to scan beyond. That is to limit the time | |
6047 this function can take. | |
6048 | |
6049 If MOUSE is non-zero, use the character's mouse-face, not its face. | |
6050 | |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6051 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
|
6052 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
|
6053 |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6054 The face returned is suitable for displaying ASCII characters. */ |
24995 | 6055 |
6056 int | |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6057 face_at_buffer_position (struct window *w, EMACS_INT pos, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6058 EMACS_INT region_beg, EMACS_INT region_end, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6059 EMACS_INT *endptr, EMACS_INT limit, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6060 int mouse, int base_face_id) |
2342 | 6061 { |
24995 | 6062 struct frame *f = XFRAME (w->frame); |
6063 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
|
6064 Lisp_Object prop, position; |
24995 | 6065 int i, noverlays; |
2342 | 6066 Lisp_Object *overlay_vec; |
2391 | 6067 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
|
6068 EMACS_INT endpos; |
24995 | 6069 Lisp_Object propname = mouse ? Qmouse_face : Qface; |
6070 Lisp_Object limit1, end; | |
6071 struct face *default_face; | |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6072 |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6073 /* 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
|
6074 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
|
6075 /* xassert (XBUFFER (w->buffer) == current_buffer); */ |
2391 | 6076 |
9284
a969e0eefaf5
(compute_char_face): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9186
diff
changeset
|
6077 XSETFRAME (frame, f); |
24995 | 6078 XSETFASTINT (position, pos); |
2342 | 6079 |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6080 endpos = ZV; |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6081 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
|
6082 endpos = region_beg; |
2784
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6083 |
24995 | 6084 /* Get the `face' or `mouse_face' text property at POS, and |
6085 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
|
6086 prop = Fget_text_property (position, propname, w->buffer); |
24995 | 6087 XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); |
6088 end = Fnext_single_property_change (position, propname, w->buffer, limit1); | |
6089 if (INTEGERP (end)) | |
6090 endpos = XINT (end); | |
6091 | |
6092 /* 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
|
6093 { |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
6094 EMACS_INT next_overlay; |
55654
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6095 |
edc2b57535e5
(face_at_buffer_position): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
55560
diff
changeset
|
6096 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
|
6097 if (next_overlay < endpos) |
f8c6796b7777
* xfaces.c (compute_char_face): When merging the overlays,
Jim Blandy <jimb@redhat.com>
parents:
2767
diff
changeset
|
6098 endpos = next_overlay; |
2767
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6099 } |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6100 |
482fa0725db6
* xfaces.c (intern_frame_face): Exchange order of arguments, to
Jim Blandy <jimb@redhat.com>
parents:
2743
diff
changeset
|
6101 *endptr = endpos; |
2342 | 6102 |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103054
diff
changeset
|
6103 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
|
6104 : 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
|
6105 : lookup_basic_face (f, DEFAULT_FACE_ID)); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6106 |
24995 | 6107 /* Optimize common cases where we can use the default face. */ |
6108 if (noverlays == 0 | |
6109 && NILP (prop) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6110 && !(pos >= region_beg && pos < region_end)) |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6111 return default_face->id; |
24995 | 6112 |
6113 /* Begin with attributes from the default face. */ | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
6114 memcpy (attrs, default_face->lface, sizeof attrs); |
24995 | 6115 |
6116 /* Merge in attributes specified via text properties. */ | |
6117 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
|
6118 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 6119 |
6120 /* 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
|
6121 noverlays = sort_overlays (overlay_vec, noverlays, w); |
2342 | 6122 for (i = 0; i < noverlays; i++) |
6123 { | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6124 Lisp_Object oend; |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6125 int oendpos; |
9186
45bac5feb065
(compute_char_face): Handle list as overlay face property.
Richard M. Stallman <rms@gnu.org>
parents:
9184
diff
changeset
|
6126 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6127 prop = Foverlay_get (overlay_vec[i], propname); |
24995 | 6128 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
|
6129 merge_face_ref (f, prop, attrs, 1, 0); |
2342 | 6130 |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6131 oend = OVERLAY_END (overlay_vec[i]); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6132 oendpos = OVERLAY_POSITION (oend); |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6133 if (oendpos < endpos) |
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6134 endpos = oendpos; |
2342 | 6135 } |
6136 | |
24995 | 6137 /* 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
|
6138 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
|
6139 { |
55966
b9f354f2c61f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Miles Bader <miles@gnu.org>
parents:
55949
diff
changeset
|
6140 merge_named_face (f, Qregion, attrs, 0); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6141 |
2795
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6142 if (region_end < endpos) |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6143 endpos = region_end; |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6144 } |
e97e96fb0cb8
(compute_char_face): New args REGION_BEG, REGION_END.
Richard M. Stallman <rms@gnu.org>
parents:
2784
diff
changeset
|
6145 |
2342 | 6146 *endptr = endpos; |
6147 | |
24995 | 6148 /* 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
|
6149 or realize a new one for ASCII characters. */ |
88907 | 6150 return lookup_face (f, attrs); |
2342 | 6151 } |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6152 |
79336
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6153 /* 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
|
6154 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
|
6155 |
6c386e3cec2a
(face_for_overlay_string): Function renamed from
Richard M. Stallman <rms@gnu.org>
parents:
79327
diff
changeset
|
6156 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
|
6157 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
|
6158 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6159 int |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6160 face_for_overlay_string (struct window *w, EMACS_INT pos, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6161 EMACS_INT region_beg, EMACS_INT region_end, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6162 EMACS_INT *endptr, EMACS_INT limit, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6163 int mouse, Lisp_Object overlay) |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6164 { |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6165 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
|
6166 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
|
6167 Lisp_Object prop, position; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6168 Lisp_Object frame; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6169 int endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6170 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
|
6171 Lisp_Object limit1, end; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6172 struct face *default_face; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6173 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6174 /* 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
|
6175 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
|
6176 /* 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
|
6177 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6178 XSETFRAME (frame, f); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6179 XSETFASTINT (position, pos); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6180 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6181 endpos = ZV; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6182 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
|
6183 endpos = region_beg; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6184 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6185 /* 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
|
6186 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
|
6187 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
|
6188 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
|
6189 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
|
6190 if (INTEGERP (end)) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6191 endpos = XINT (end); |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6192 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6193 *endptr = endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6194 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6195 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
|
6196 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6197 /* 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
|
6198 if (NILP (prop) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6199 && !(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
|
6200 return DEFAULT_FACE_ID; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6201 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6202 /* Begin with attributes from the default face. */ |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
6203 memcpy (attrs, default_face->lface, sizeof attrs); |
79327
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6204 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6205 /* 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
|
6206 if (!NILP (prop)) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6207 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
|
6208 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6209 /* 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
|
6210 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
|
6211 { |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6212 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
|
6213 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6214 if (region_end < endpos) |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6215 endpos = region_end; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6216 } |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6217 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6218 *endptr = endpos; |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6219 |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6220 /* 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
|
6221 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
|
6222 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
|
6223 } |
72cdd210604a
(face_at_buffer_position_no_overlays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
78783
diff
changeset
|
6224 |
24995 | 6225 |
6226 /* 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
|
6227 window W, for ASCII characters. |
24995 | 6228 |
6229 If STRING is an overlay string, it comes from position BUFPOS in | |
6230 current_buffer, otherwise BUFPOS is zero to indicate that STRING is | |
6231 not an overlay string. W must display the current buffer. | |
6232 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
|
6233 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
|
6234 |
1bf333d1b1de
(face_at_string_position): Update function comment.
Gerd Moellmann <gerd@gnu.org>
parents:
34242
diff
changeset
|
6235 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
|
6236 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
|
6237 |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6238 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
|
6239 |
24995 | 6240 Set *ENDPTR to the next position where to check for faces in |
6241 STRING; -1 if the face is constant from POS to the end of the | |
6242 string. | |
6243 | |
6244 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
|
6245 for displaying ASCII characters. */ |
24995 | 6246 |
6247 int | |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6248 face_at_string_position (struct window *w, Lisp_Object string, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6249 EMACS_INT pos, EMACS_INT bufpos, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6250 EMACS_INT region_beg, EMACS_INT region_end, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6251 EMACS_INT *endptr, enum face_id base_face_id, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109318
diff
changeset
|
6252 int mouse_p) |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6253 { |
24995 | 6254 Lisp_Object prop, position, end, limit; |
6255 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
6256 Lisp_Object attrs[LFACE_VECTOR_SIZE]; | |
6257 struct face *base_face; | |
6258 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
|
6259 Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface; |
24995 | 6260 |
6261 /* Get the value of the face property at the current position within | |
6262 STRING. Value is nil if there is no face property. */ | |
6263 XSETFASTINT (position, pos); | |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6264 prop = Fget_text_property (position, prop_name, string); |
24995 | 6265 |
6266 /* Get the next position at which to check for faces. Value of end | |
6267 is nil if face is constant all the way to the end of the string. | |
6268 Otherwise it is a string position where to check faces next. | |
6269 Limit is the maximum position up to which to check for property | |
6270 changes in Fnext_single_property_change. Strings are usually | |
6271 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
|
6272 XSETFASTINT (limit, SCHARS (string)); |
36672
acf152adbf82
(face_at_string_position): Add parameter MOUSE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
36481
diff
changeset
|
6273 end = Fnext_single_property_change (position, prop_name, string, limit); |
24995 | 6274 if (INTEGERP (end)) |
6275 *endptr = XFASTINT (end); | |
19128
e789b647f15b
(merge_face_list): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18723
diff
changeset
|
6276 else |
24995 | 6277 *endptr = -1; |
6278 | |
6279 base_face = FACE_FROM_ID (f, base_face_id); | |
6280 xassert (base_face); | |
6281 | |
6282 /* Optimize the default case that there is no face property and we | |
6283 are not in the region. */ | |
6284 if (NILP (prop) | |
6285 && (base_face_id != DEFAULT_FACE_ID | |
6286 /* BUFPOS <= 0 means STRING is not an overlay string, so | |
6287 that the region doesn't have to be taken into account. */ | |
6288 || bufpos <= 0 | |
6289 || bufpos < region_beg | |
6290 || bufpos >= region_end) | |
6291 && (multibyte_p | |
6292 /* We can't realize faces for different charsets differently | |
6293 if we don't have fonts, so we can stop here if not working | |
6294 on a window-system frame. */ | |
6295 || !FRAME_WINDOW_P (f) | |
28230
8e330f701881
(Qx_charset_registry, Vface_default_registry):
Kenichi Handa <handa@m17n.org>
parents:
27984
diff
changeset
|
6296 || FACE_SUITABLE_FOR_CHAR_P (base_face, 0))) |
24995 | 6297 return base_face->id; |
6298 | |
6299 /* Begin with attributes from the base face. */ | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
6300 memcpy (attrs, base_face->lface, sizeof attrs); |
24995 | 6301 |
6302 /* Merge in attributes specified via text properties. */ | |
6303 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
|
6304 merge_face_ref (f, prop, attrs, 1, 0); |
24995 | 6305 |
6306 /* If in the region, merge in the region face. */ | |
6307 if (bufpos | |
6308 && bufpos >= region_beg | |
6309 && 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
|
6310 merge_named_face (f, Qregion, attrs, 0); |
24995 | 6311 |
6312 /* 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
|
6313 or realize a new one for ASCII characters. */ |
88907 | 6314 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
|
6315 } |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6316 |
96b4623fdeb3
* xterm.h: New section for declarations for xfaces.c.
Jim Blandy <jimb@redhat.com>
parents:
3065
diff
changeset
|
6317 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6318 /* 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
|
6319 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6320 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
|
6321 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6322 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
|
6323 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6324 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
|
6325 |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6326 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
|
6327 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6328 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
|
6329 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6330 Return new face id. |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6331 */ |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6332 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6333 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
6334 merge_faces (struct frame *f, Lisp_Object face_name, int face_id, int base_face_id) |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6335 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6336 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
|
6337 struct face *base_face; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6338 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6339 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
|
6340 if (!base_face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6341 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6342 |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6343 if (EQ (face_name, Qt)) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6344 { |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6345 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
|
6346 return base_face_id; |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6347 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
|
6348 /* 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
|
6349 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
|
6350 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
|
6351 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
|
6352 } |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6353 |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6354 /* Begin with attributes from the base face. */ |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109160
diff
changeset
|
6355 memcpy (attrs, base_face->lface, sizeof attrs); |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6356 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6357 if (!NILP (face_name)) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6358 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6359 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
|
6360 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6361 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6362 else |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6363 { |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6364 struct face *face; |
59458
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6365 if (face_id < 0) |
df565ffe7247
(merge_faces): Rename from merge_into_realized_face.
Kim F. Storm <storm@cua.dk>
parents:
59431
diff
changeset
|
6366 return base_face_id; |
59431
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6367 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
|
6368 if (!face) |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6369 return base_face_id; |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6370 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
|
6371 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6372 |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6373 /* 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
|
6374 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
|
6375 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
|
6376 } |
2f2c5349bc03
(merge_into_realized_face): New function. Used to
Kim F. Storm <storm@cua.dk>
parents:
59146
diff
changeset
|
6377 |
2336 | 6378 |
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
|
6379 |
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
|
6380 #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
|
6381 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
|
6382 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
|
6383 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
|
6384 |
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
|
6385 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
|
6386 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
|
6387 where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6388 (Lisp_Object filename) |
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
|
6389 { |
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
|
6390 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
|
6391 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
|
6392 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
|
6393 |
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
|
6394 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
|
6395 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
|
6396 |
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
|
6397 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
|
6398 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
|
6399 { |
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
|
6400 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
|
6401 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
|
6402 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
|
6403 |
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
|
6404 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
|
6405 |
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
|
6406 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
|
6407 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
|
6408 { |
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
|
6409 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
|
6410 num = strlen (name) - 1; |
103359
eb941fcd33b4
x-load-color-file: avoid array bounds error
Jim Meyering <jim@meyering.net>
parents:
103228
diff
changeset
|
6411 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
|
6412 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
|
6413 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
|
6414 #ifdef WINDOWSNT |
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6415 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
|
6416 #else |
97217
f0079131098b
* xfaces.c (Fx_load_color_file): Fix previous change;
Juanma Barranquero <lekktu@gmail.com>
parents:
97200
diff
changeset
|
6417 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
|
6418 #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
|
6419 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
|
6420 } |
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
|
6421 } |
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
|
6422 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
|
6423 |
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
|
6424 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
|
6425 } |
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
|
6426 |
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
|
6427 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
|
6428 } |
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
|
6429 #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
|
6430 |
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
|
6431 |
24995 | 6432 /*********************************************************************** |
6433 Tests | |
6434 ***********************************************************************/ | |
6435 | |
6436 #if GLYPH_DEBUG | |
6437 | |
6438 /* Print the contents of the realized face FACE to stderr. */ | |
6439 | |
6440 static void | |
6441 dump_realized_face (face) | |
6442 struct face *face; | |
2336 | 6443 { |
24995 | 6444 fprintf (stderr, "ID: %d\n", face->id); |
6445 #ifdef HAVE_X_WINDOWS | |
60669
cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60150
diff
changeset
|
6446 fprintf (stderr, "gc: %ld\n", (long) face->gc); |
24995 | 6447 #endif |
6448 fprintf (stderr, "foreground: 0x%lx (%s)\n", | |
6449 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
|
6450 SDATA (face->lface[LFACE_FOREGROUND_INDEX])); |
24995 | 6451 fprintf (stderr, "background: 0x%lx (%s)\n", |
6452 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
|
6453 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
|
6454 if (face->font) |
5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92237
diff
changeset
|
6455 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
|
6456 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
|
6457 SDATA (face->lface[LFACE_FAMILY_INDEX])); |
24995 | 6458 #ifdef HAVE_X_WINDOWS |
6459 fprintf (stderr, "font = %p\n", face->font); | |
6460 #endif | |
6461 fprintf (stderr, "fontset: %d\n", face->fontset); | |
6462 fprintf (stderr, "underline: %d (%s)\n", | |
6463 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
|
6464 SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))); |
24995 | 6465 fprintf (stderr, "hash: %d\n", face->hash); |
6466 } | |
6467 | |
6468 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6469 DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6470 (Lisp_Object n) |
24995 | 6471 { |
6472 if (NILP (n)) | |
2336 | 6473 { |
24995 | 6474 int i; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6475 |
24995 | 6476 fprintf (stderr, "font selection order: "); |
6477 for (i = 0; i < DIM (font_sort_order); ++i) | |
6478 fprintf (stderr, "%d ", font_sort_order[i]); | |
6479 fprintf (stderr, "\n"); | |
6480 | |
6481 fprintf (stderr, "alternative fonts: "); | |
6482 debug_print (Vface_alternative_font_family_alist); | |
6483 fprintf (stderr, "\n"); | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6484 |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6485 for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i) |
24995 | 6486 Fdump_face (make_number (i)); |
2336 | 6487 } |
24995 | 6488 else |
6489 { | |
6490 struct face *face; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40603
diff
changeset
|
6491 CHECK_NUMBER (n); |
25678
1878f7ae0df5
(frame_or_selected_frame): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25661
diff
changeset
|
6492 face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n)); |
24995 | 6493 if (face == NULL) |
6494 error ("Not a valid face"); | |
6495 dump_realized_face (face); | |
6496 } | |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6497 |
2336 | 6498 return Qnil; |
6499 } | |
6500 | |
6501 | |
24995 | 6502 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
|
6503 0, 0, 0, doc: /* */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6504 (void) |
2336 | 6505 { |
24995 | 6506 fprintf (stderr, "number of colors = %d\n", ncolors_allocated); |
6507 fprintf (stderr, "number of pixmaps = %d\n", npixmaps_allocated); | |
6508 fprintf (stderr, "number of GCs = %d\n", ngcs); | |
2336 | 6509 return Qnil; |
6510 } | |
24995 | 6511 |
6512 #endif /* GLYPH_DEBUG != 0 */ | |
6513 | |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6514 |
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6515 |
24995 | 6516 /*********************************************************************** |
6517 Initialization | |
6518 ***********************************************************************/ | |
2730
139740855fa6
* xfaces.c (Fmake_face_internal): Do nothing for non-X frames.
Jim Blandy <jimb@redhat.com>
parents:
2538
diff
changeset
|
6519 |
2336 | 6520 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109118
diff
changeset
|
6521 syms_of_xfaces (void) |
2336 | 6522 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6523 Qface = intern_c_string ("face"); |
2391 | 6524 staticpro (&Qface); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6525 Qface_no_inherit = intern_c_string ("face-no-inherit"); |
57107 | 6526 staticpro (&Qface_no_inherit); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6527 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
|
6528 staticpro (&Qbitmap_spec_p); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6529 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
|
6530 staticpro (&Qframe_set_background_mode); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6531 |
24995 | 6532 /* Lisp face attribute keywords. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6533 QCfamily = intern_c_string (":family"); |
24995 | 6534 staticpro (&QCfamily); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6535 QCheight = intern_c_string (":height"); |
24995 | 6536 staticpro (&QCheight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6537 QCweight = intern_c_string (":weight"); |
24995 | 6538 staticpro (&QCweight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6539 QCslant = intern_c_string (":slant"); |
24995 | 6540 staticpro (&QCslant); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6541 QCunderline = intern_c_string (":underline"); |
24995 | 6542 staticpro (&QCunderline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6543 QCinverse_video = intern_c_string (":inverse-video"); |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6544 staticpro (&QCinverse_video); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6545 QCreverse_video = intern_c_string (":reverse-video"); |
24995 | 6546 staticpro (&QCreverse_video); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6547 QCforeground = intern_c_string (":foreground"); |
24995 | 6548 staticpro (&QCforeground); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6549 QCbackground = intern_c_string (":background"); |
24995 | 6550 staticpro (&QCbackground); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6551 QCstipple = intern_c_string (":stipple"); |
24995 | 6552 staticpro (&QCstipple); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6553 QCwidth = intern_c_string (":width"); |
24995 | 6554 staticpro (&QCwidth); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6555 QCfont = intern_c_string (":font"); |
24995 | 6556 staticpro (&QCfont); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6557 QCfontset = intern_c_string (":fontset"); |
89047
3b6234eb229c
(QCfontset): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88939
diff
changeset
|
6558 staticpro (&QCfontset); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6559 QCbold = intern_c_string (":bold"); |
24995 | 6560 staticpro (&QCbold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6561 QCitalic = intern_c_string (":italic"); |
24995 | 6562 staticpro (&QCitalic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6563 QCoverline = intern_c_string (":overline"); |
24995 | 6564 staticpro (&QCoverline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6565 QCstrike_through = intern_c_string (":strike-through"); |
24995 | 6566 staticpro (&QCstrike_through); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6567 QCbox = intern_c_string (":box"); |
24995 | 6568 staticpro (&QCbox); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6569 QCinherit = intern_c_string (":inherit"); |
31178 | 6570 staticpro (&QCinherit); |
24995 | 6571 |
6572 /* Symbols used for Lisp face attribute values. */ | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6573 QCcolor = intern_c_string (":color"); |
24995 | 6574 staticpro (&QCcolor); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6575 QCline_width = intern_c_string (":line-width"); |
24995 | 6576 staticpro (&QCline_width); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6577 QCstyle = intern_c_string (":style"); |
24995 | 6578 staticpro (&QCstyle); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6579 Qreleased_button = intern_c_string ("released-button"); |
24995 | 6580 staticpro (&Qreleased_button); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6581 Qpressed_button = intern_c_string ("pressed-button"); |
24995 | 6582 staticpro (&Qpressed_button); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6583 Qnormal = intern_c_string ("normal"); |
24995 | 6584 staticpro (&Qnormal); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6585 Qultra_light = intern_c_string ("ultra-light"); |
24995 | 6586 staticpro (&Qultra_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6587 Qextra_light = intern_c_string ("extra-light"); |
24995 | 6588 staticpro (&Qextra_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6589 Qlight = intern_c_string ("light"); |
24995 | 6590 staticpro (&Qlight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6591 Qsemi_light = intern_c_string ("semi-light"); |
24995 | 6592 staticpro (&Qsemi_light); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6593 Qsemi_bold = intern_c_string ("semi-bold"); |
24995 | 6594 staticpro (&Qsemi_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6595 Qbold = intern_c_string ("bold"); |
24995 | 6596 staticpro (&Qbold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6597 Qextra_bold = intern_c_string ("extra-bold"); |
24995 | 6598 staticpro (&Qextra_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6599 Qultra_bold = intern_c_string ("ultra-bold"); |
24995 | 6600 staticpro (&Qultra_bold); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6601 Qoblique = intern_c_string ("oblique"); |
24995 | 6602 staticpro (&Qoblique); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6603 Qitalic = intern_c_string ("italic"); |
24995 | 6604 staticpro (&Qitalic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6605 Qreverse_oblique = intern_c_string ("reverse-oblique"); |
24995 | 6606 staticpro (&Qreverse_oblique); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6607 Qreverse_italic = intern_c_string ("reverse-italic"); |
24995 | 6608 staticpro (&Qreverse_italic); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6609 Qultra_condensed = intern_c_string ("ultra-condensed"); |
24995 | 6610 staticpro (&Qultra_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6611 Qextra_condensed = intern_c_string ("extra-condensed"); |
24995 | 6612 staticpro (&Qextra_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6613 Qcondensed = intern_c_string ("condensed"); |
24995 | 6614 staticpro (&Qcondensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6615 Qsemi_condensed = intern_c_string ("semi-condensed"); |
24995 | 6616 staticpro (&Qsemi_condensed); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6617 Qsemi_expanded = intern_c_string ("semi-expanded"); |
24995 | 6618 staticpro (&Qsemi_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6619 Qexpanded = intern_c_string ("expanded"); |
24995 | 6620 staticpro (&Qexpanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6621 Qextra_expanded = intern_c_string ("extra-expanded"); |
24995 | 6622 staticpro (&Qextra_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6623 Qultra_expanded = intern_c_string ("ultra-expanded"); |
24995 | 6624 staticpro (&Qultra_expanded); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6625 Qbackground_color = intern_c_string ("background-color"); |
24995 | 6626 staticpro (&Qbackground_color); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6627 Qforeground_color = intern_c_string ("foreground-color"); |
24995 | 6628 staticpro (&Qforeground_color); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6629 Qunspecified = intern_c_string ("unspecified"); |
24995 | 6630 staticpro (&Qunspecified); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6631 Qignore_defface = intern_c_string (":ignore-defface"); |
66974
c52c20ff739f
* xfaces.c (Qignore_defface): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
65912
diff
changeset
|
6632 staticpro (&Qignore_defface); |
24995 | 6633 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6634 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
|
6635 staticpro (&Qface_alias); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6636 Qdefault = intern_c_string ("default"); |
24995 | 6637 staticpro (&Qdefault); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6638 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
|
6639 staticpro (&Qtool_bar); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6640 Qregion = intern_c_string ("region"); |
24995 | 6641 staticpro (&Qregion); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6642 Qfringe = intern_c_string ("fringe"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6643 staticpro (&Qfringe); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6644 Qheader_line = intern_c_string ("header-line"); |
25546 | 6645 staticpro (&Qheader_line); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6646 Qscroll_bar = intern_c_string ("scroll-bar"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6647 staticpro (&Qscroll_bar); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6648 Qmenu = intern_c_string ("menu"); |
25883
2955c353186a
(toplevel) [USE_MOTIF]: Include some Motif headers.
Gerd Moellmann <gerd@gnu.org>
parents:
25799
diff
changeset
|
6649 staticpro (&Qmenu); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6650 Qcursor = intern_c_string ("cursor"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6651 staticpro (&Qcursor); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6652 Qborder = intern_c_string ("border"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6653 staticpro (&Qborder); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6654 Qmouse = intern_c_string ("mouse"); |
25592
c6be980d15a6
(recompute_basic_faces): Clear face cache.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6655 staticpro (&Qmouse); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6656 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
|
6657 staticpro (&Qmode_line_inactive); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6658 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
|
6659 staticpro (&Qvertical_border); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6660 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
|
6661 staticpro (&Qtty_color_desc); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6662 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
|
6663 staticpro (&Qtty_color_standard_values); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6664 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
|
6665 staticpro (&Qtty_color_by_index); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6666 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
|
6667 staticpro (&Qtty_color_alist); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6668 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
|
6669 staticpro (&Qscalable_fonts_allowed); |
24995 | 6670 |
31449
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6671 Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil); |
8797df6a9fa2
(Vparam_value_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31440
diff
changeset
|
6672 staticpro (&Vparam_value_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6673 Vface_alternative_font_family_alist = Qnil; |
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6674 staticpro (&Vface_alternative_font_family_alist); |
33372
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6675 Vface_alternative_font_registry_alist = Qnil; |
2a665186a9e9
(Vface_alternative_font_registry_alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
33275
diff
changeset
|
6676 staticpro (&Vface_alternative_font_registry_alist); |
30304
626d55ea66ef
(face-alternative-font-family-alist): Remove
Gerd Moellmann <gerd@gnu.org>
parents:
30235
diff
changeset
|
6677 |
24995 | 6678 defsubr (&Sinternal_make_lisp_face); |
6679 defsubr (&Sinternal_lisp_face_p); | |
6680 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
|
6681 #ifdef HAVE_WINDOW_SYSTEM |
24995 | 6682 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
|
6683 #endif |
27120
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6684 defsubr (&Scolor_gray_p); |
24a08208cf3a
(syms_of_xfaces): Change Sface_color_gray_p to
Gerd Moellmann <gerd@gnu.org>
parents:
27114
diff
changeset
|
6685 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
|
6686 #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
|
6687 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
|
6688 #endif |
40398
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6689 defsubr (&Sface_attribute_relative_p); |
560b1c474b1a
(merge_face_heights): Handle TO being relative as well.
Miles Bader <miles@gnu.org>
parents:
40278
diff
changeset
|
6690 defsubr (&Smerge_face_attribute); |
24995 | 6691 defsubr (&Sinternal_get_lisp_face_attribute); |
6692 defsubr (&Sinternal_lisp_face_attribute_values); | |
6693 defsubr (&Sinternal_lisp_face_equal_p); | |
6694 defsubr (&Sinternal_lisp_face_empty_p); | |
6695 defsubr (&Sinternal_copy_lisp_face); | |
6696 defsubr (&Sinternal_merge_in_global_face); | |
6697 defsubr (&Sface_font); | |
6698 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
|
6699 defsubr (&Sdisplay_supports_face_attributes_p); |
45718
e495189229e4
(Ftty_supports_face_attributes_p): New function.
Miles Bader <miles@gnu.org>
parents:
45412
diff
changeset
|
6700 defsubr (&Scolor_distance); |
24995 | 6701 defsubr (&Sinternal_set_font_selection_order); |
6702 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
|
6703 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
|
6704 defsubr (&Sface_attributes_as_vector); |
24995 | 6705 #if GLYPH_DEBUG |
6706 defsubr (&Sdump_face); | |
6707 defsubr (&Sshow_face_resources); | |
6708 #endif /* GLYPH_DEBUG */ | |
6709 defsubr (&Sclear_face_cache); | |
28529
b8ac36c58391
(tty_suppress_bold_inverse_default_colors_p): New
Gerd Moellmann <gerd@gnu.org>
parents:
28464
diff
changeset
|
6710 defsubr (&Stty_suppress_bold_inverse_default_colors); |
24995 | 6711 |
29711
913fab478495
(syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
Gerd Moellmann <gerd@gnu.org>
parents:
29599
diff
changeset
|
6712 #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
|
6713 defsubr (&Sdump_colors); |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6714 #endif |
8a2e32f7717e
(Fdump_colors) [DEBUG_X_COLORS]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29394
diff
changeset
|
6715 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6716 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
|
6717 doc: /* *Limit for font matching. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6718 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
|
6719 that number of fonts when searching for a matching font. */); |
25270 | 6720 Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT); |
6721 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6722 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
|
6723 doc: /* List of global face definitions (for internal use only.) */); |
24995 | 6724 Vface_new_frame_defaults = Qnil; |
30235
5a0d447b7eea
check default_face before dereferencing
Sam Steingold <sds@gnu.org>
parents:
30211
diff
changeset
|
6725 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6726 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
|
6727 doc: /* *Default stipple pattern used on monochrome displays. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6728 This stipple pattern is used on monochrome displays |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6729 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
|
6730 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
|
6731 Vface_default_stipple = make_pure_c_string ("gray3"); |
24995 | 6732 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6733 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
|
6734 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
|
6735 Vtty_defined_color_alist = Qnil; |
2f3dc355bcaf
(lface_equal_p): Compare strings differently.
Gerd Moellmann <gerd@gnu.org>
parents:
30707
diff
changeset
|
6736 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6737 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
|
6738 doc: /* Allowed scalable fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6739 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
|
6740 A value of t means allow any scalable font. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6741 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
|
6742 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
|
6743 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
|
6744 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
|
6745 Vscalable_fonts_allowed = Qnil; |
18083
c361afa561c5
Include frame.h unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
17047
diff
changeset
|
6746 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
6747 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
|
6748 doc: /* List of ignored fonts. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6749 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
|
6750 ignore. */); |
34629
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6751 Vface_ignored_fonts = Qnil; |
10675adcbf6f
(Vface_ignored_fonts): New variable.
Kenichi Handa <handa@m17n.org>
parents:
34289
diff
changeset
|
6752 |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6753 DEFVAR_LISP ("face-remapping-alist", &Vface_remapping_alist, |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6754 doc: /* Alist of face remappings. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6755 Each element is of the form: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6756 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6757 (FACE REPLACEMENT...), |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6758 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6759 which causes display of the face FACE to use REPLACEMENT... instead. |
109318
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6760 REPLACEMENT... is interpreted the same way as the value of a `face' |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6761 text property: it may be (1) A face name, (2) A list of face names, |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6762 (3) A property-list of face attribute/value pairs, or (4) A list of |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6763 face names or lists containing face attribute/value pairs. |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6764 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6765 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
|
6766 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
|
6767 over those that are later. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6768 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6769 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
|
6770 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
|
6771 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6772 (FACE EXTRA-FACE... FACE) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6773 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6774 or: |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6775 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6776 (FACE (FACE-ATTR VAL ...) FACE) |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6777 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6778 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
|
6779 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
|
6780 necessary, as every face inherits from the default face. |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6781 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6782 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
|
6783 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
|
6784 `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
|
6785 |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6786 (set (make-local-variable 'face-remapping-alist) |
109318
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6787 '((default my-mode-default)))). |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6788 |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6789 Because Emacs normally only redraws screen areas when the underlying |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6790 buffer contents change, you may need to call `redraw-display' after |
06b03915afed
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
Chong Yidong <cyd@stupidchicken.com>
parents:
109302
diff
changeset
|
6791 changing this variable for it to take effect. */); |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6792 Vface_remapping_alist = Qnil; |
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95377
diff
changeset
|
6793 |
50515
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6794 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
|
6795 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
|
6796 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
|
6797 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
|
6798 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
|
6799 \(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
|
6800 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
|
6801 Vface_font_rescale_alist = Qnil; |
98bdd2203d85
(Vface_font_rescale_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
50412
diff
changeset
|
6802 |
27982
86de01dd01eb
Change many FRAME_X... macros to FRAME_WINDOW... or other
Jason Rumney <jasonr@gnu.org>
parents:
27960
diff
changeset
|
6803 #ifdef HAVE_WINDOW_SYSTEM |
25890
b10a34d40b55
(Qbitmap_spec_p): Replaces Qpixmap_spec_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25883
diff
changeset
|
6804 defsubr (&Sbitmap_spec_p); |
24995 | 6805 defsubr (&Sx_list_fonts); |
6806 defsubr (&Sinternal_face_x_get_resource); | |
25661
a6e2ae7964fb
(Fx_family_fonts): Replaces Fx_font_list.
Gerd Moellmann <gerd@gnu.org>
parents:
25592
diff
changeset
|
6807 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
|
6808 #endif |
2336 | 6809 } |
52401 | 6810 |
6811 /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 | |
6812 (do not change this comment) */ |